Skip to content

Commit 8d43a49

Browse files
committed
Revert "Use phpstan-get-executable instead of mekeshift processing"
This reverts commit 859692e.
1 parent 9350e23 commit 8d43a49

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

flycheck-phpstan.el

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,20 @@
4949
(let ((enabled (phpstan-enabled)))
5050
(prog1 enabled
5151
(when (and phpstan-flycheck-auto-set-executable
52-
(null (bound-and-true-p flycheck-phpstan-executable))
52+
(not (and (boundp 'flycheck-phpstan-executable)
53+
(symbol-value 'flycheck-phpstan-executable)))
5354
(or (stringp phpstan-executable)
5455
(eq 'docker phpstan-executable)
5556
(and (eq 'root (car-safe phpstan-executable))
5657
(stringp (cdr-safe phpstan-executable)))
5758
(and (stringp (car-safe phpstan-executable))
5859
(listp (cdr-safe phpstan-executable)))
5960
(null phpstan-executable)))
60-
(setq-local flycheck-phpstan-executable (nth 0 (phpstan-get-executable)))))))
61+
(set (make-local-variable 'flycheck-phpstan-executable)
62+
(cond
63+
((eq 'docker phpstan-executable) phpstan-docker-executable)
64+
((stringp phpstan-executable) phpstan-executable)
65+
(t (car phpstan-executable))))))))
6166

6267
(flycheck-define-checker phpstan
6368
"PHP static analyzer based on PHPStan."

0 commit comments

Comments
 (0)