Skip to content

Commit 9a6a8b1

Browse files
committed
Replaced f.el dependency with built-in functions
1 parent 207366a commit 9a6a8b1

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Eask

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@
1414
(source 'melpa)
1515
(source 'gnu)
1616

17-
(depends-on "emacs" "25.1")
18-
(depends-on "f")
17+
(depends-on "emacs" "26.1")
1918
(depends-on "php-runtime")
2019
(depends-on "composer")
2120
(depends-on "async")
2221

23-
2422
(development
2523
(depends-on "php-mode")
2624
(depends-on "buttercup"))

phpactor.el

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;; Created: 8 Apr 2018
88
;; Version: 0.1.0
99
;; Keywords: tools, php
10-
;; Package-Requires: ((emacs "26.1") (f "0.17") (php-runtime "0.2") (composer "0.2.0") (async "1.9.3"))
10+
;; Package-Requires: ((emacs "26.1") (php-runtime "0.2") (composer "0.2.0") (async "1.9.3"))
1111
;; URL: https://github.com/emacs-php/phpactor.el
1212
;; License: GPL-3.0-or-later
1313

@@ -46,7 +46,6 @@
4646

4747
;;; Code:
4848
(require 'cl-lib)
49-
(require 'f)
5049
(require 'json)
5150
(require 'php-project nil t)
5251
(require 'php-runtime)
@@ -127,7 +126,7 @@ of GitHub.")
127126

128127
(defun phpactor--find-executable ()
129128
"Return path to Phpactor executable file."
130-
(let ((vendor-executable (f-join phpactor-install-directory "vendor/bin/phpactor")))
129+
(let ((vendor-executable (expand-file-name "vendor/bin/phpactor" phpactor-install-directory)))
131130
(if (file-exists-p vendor-executable)
132131
vendor-executable
133132
(warn "Phpactor not found. Please run `phpactor-install-or-update' command")
@@ -192,7 +191,7 @@ have to ensure a compatible version of phpactor is used."
192191
((< php-version 80100) (setq directory (concat directory "/php80"))))
193192
;; Create .gitignore to prevent unnecessary files from being copied to GitHub
194193
(unless (file-exists-p (expand-file-name ".gitignore" phpactor-install-directory))
195-
(f-write-text "*\n" 'utf-8 (expand-file-name ".gitignore" phpactor-install-directory)))
194+
(write-region "*\n" nil (expand-file-name ".gitignore" phpactor-install-directory) nil :silent))
196195
(cl-loop for file in '("composer.json" "composer.lock")
197196
for code = (format "copy(%s, %s)"
198197
;; Do not use `f-join' as this string may be a URL.

0 commit comments

Comments
 (0)