Skip to content

Commit

Permalink
Merge pull request #754 from emacs-php/remove/php-project-phan-variables
Browse files Browse the repository at this point in the history
Remove Phan-specific features from php-project.el
  • Loading branch information
zonuexe authored Jul 30, 2023
2 parents cb7edc6 + f476123 commit 38fd6ec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 22 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

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.

<!-- ## Unreleased -->
## Unreleased

### Removed

* Removed Phan-specific features from `php-project` ([#754])

[#754]: https://github.com/emacs-php/php-mode/pull/754

## [1.25.0] - 2023-07-24

Expand Down
21 changes: 0 additions & 21 deletions lisp/php-project.el
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
;;
;; Return path to PHP executable file with the project settings overriding.
;;
;; ### `php-project-get-phan-executable()'
;;
;; Return path to Phan executable file with the project settings overriding.
;; Phan is a static analyzer and LSP server implementation for PHP.
;; See https://github.com/phan/phan
;;
;; ## `.dir-locals.el' support
;;
;; - `php-project-coding-style'
Expand All @@ -59,10 +53,6 @@
;; - `php-project-php-executable'
;; - Path to project specific PHP executable file.
;; - If you want to use a file different from the system wide `php' command.
;; - `php-project-phan-executable'
;; - Path to project specific Phan executable file.
;; - When not specified explicitly, it is automatically searched from
;; Composer's dependency of the project and `exec-path'.
;;

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

(defvar-local php-project-phan-executable nil
"Path to phan executable file.")
(put 'php-project-phan-executable 'safe-local-variable #'php-project--eval-bootstrap-scripts)

(defvar-local php-project-coding-style nil
"Symbol value of the coding style of the project that PHP major mode refers to.
Expand Down Expand Up @@ -240,13 +226,6 @@ Typically it is `pear', `drupal', `wordpress', `symfony2' and `psr2'.")
((boundp 'php-executable) php-executable)
(t (executable-find "php"))))

(defun php-project-get-phan-executable ()
"Return path to phan executable file."
(or (car-safe (php-project--eval-bootstrap-scripts
(list php-project-phan-executable
(cons 'root "vendor/bin/phan"))))
(executable-find "phan")))

(defun php-project-get-file-html-template-type (filename)
"Return symbol T, NIL or `auto' by `FILENAME'."
(cond
Expand Down

0 comments on commit 38fd6ec

Please sign in to comment.