Skip to content

Commit 38fd6ec

Browse files
authored
Merge pull request #754 from emacs-php/remove/php-project-phan-variables
Remove Phan-specific features from php-project.el
2 parents cb7edc6 + f476123 commit 38fd6ec

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
All notable changes of the PHP Mode 1.19.1 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
44

5-
<!-- ## Unreleased -->
5+
## Unreleased
6+
7+
### Removed
8+
9+
* Removed Phan-specific features from `php-project` ([#754])
10+
11+
[#754]: https://github.com/emacs-php/php-mode/pull/754
612

713
## [1.25.0] - 2023-07-24
814

lisp/php-project.el

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
;;
4141
;; Return path to PHP executable file with the project settings overriding.
4242
;;
43-
;; ### `php-project-get-phan-executable()'
44-
;;
45-
;; Return path to Phan executable file with the project settings overriding.
46-
;; Phan is a static analyzer and LSP server implementation for PHP.
47-
;; See https://github.com/phan/phan
48-
;;
4943
;; ## `.dir-locals.el' support
5044
;;
5145
;; - `php-project-coding-style'
@@ -59,10 +53,6 @@
5953
;; - `php-project-php-executable'
6054
;; - Path to project specific PHP executable file.
6155
;; - If you want to use a file different from the system wide `php' command.
62-
;; - `php-project-phan-executable'
63-
;; - Path to project specific Phan executable file.
64-
;; - When not specified explicitly, it is automatically searched from
65-
;; Composer's dependency of the project and `exec-path'.
6656
;;
6757

6858
;;; Code:
@@ -142,10 +132,6 @@ defines constants, and sets the class loaders.")
142132
(put 'php-project-php-executable 'safe-local-variable
143133
#'(lambda (v) (and (stringp v) (file-executable-p v))))
144134

145-
(defvar-local php-project-phan-executable nil
146-
"Path to phan executable file.")
147-
(put 'php-project-phan-executable 'safe-local-variable #'php-project--eval-bootstrap-scripts)
148-
149135
(defvar-local php-project-coding-style nil
150136
"Symbol value of the coding style of the project that PHP major mode refers to.
151137
@@ -240,13 +226,6 @@ Typically it is `pear', `drupal', `wordpress', `symfony2' and `psr2'.")
240226
((boundp 'php-executable) php-executable)
241227
(t (executable-find "php"))))
242228

243-
(defun php-project-get-phan-executable ()
244-
"Return path to phan executable file."
245-
(or (car-safe (php-project--eval-bootstrap-scripts
246-
(list php-project-phan-executable
247-
(cons 'root "vendor/bin/phan"))))
248-
(executable-find "phan")))
249-
250229
(defun php-project-get-file-html-template-type (filename)
251230
"Return symbol T, NIL or `auto' by `FILENAME'."
252231
(cond

0 commit comments

Comments
 (0)