File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change 48
48
(require 'cl-lib )
49
49
(require 'f )
50
50
(require 'json )
51
- (require 'php-project )
51
+ (require 'php-project nil t )
52
52
(require 'php-runtime )
53
53
(require 'ring )
54
54
(require 'subr-x )
57
57
(require 'xref )
58
58
(require 'smart-jump nil t )
59
59
60
+ (declare-function php-project-get-root-dir " ext:php-project" )
60
61
(declare-function smart-jump-register " ext:smart-jump" )
61
62
62
63
; ; Custom variables
@@ -202,7 +203,11 @@ have to ensure a compatible version of phpactor is used."
202
203
" Return working directory of Phpactor."
203
204
(directory-file-name
204
205
(expand-file-name
205
- (or (php-project-get-root-dir) default-directory))))
206
+ (or (if (fboundp 'php-project-get-root-dir )
207
+ (php-project-get-root-dir)
208
+ (or (locate-dominating-file default-directory " .phpactor.yml" )
209
+ (locate-dominating-file default-directory " composer.json" )))
210
+ default-directory))))
206
211
207
212
(defun phpactor--expand-local-file-name (name )
208
213
" Expand file name by NAME."
You can’t perform that action at this time.
0 commit comments