Skip to content

Use phpstan-get-executable instead of makeshift processing #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zonuexe merged 1 commit into from
Jun 17, 2021
Merged

Use phpstan-get-executable instead of makeshift processing #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions flycheck-phpstan.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,15 @@
(let ((enabled (phpstan-enabled)))
(prog1 enabled
(when (and phpstan-flycheck-auto-set-executable
(not (and (boundp 'flycheck-phpstan-executable)
(symbol-value 'flycheck-phpstan-executable)))
(null (bound-and-true-p flycheck-phpstan-executable))
(or (stringp phpstan-executable)
(eq 'docker phpstan-executable)
(and (eq 'root (car-safe phpstan-executable))
(stringp (cdr-safe phpstan-executable)))
(and (stringp (car-safe phpstan-executable))
(listp (cdr-safe phpstan-executable)))
(null phpstan-executable)))
(set (make-local-variable 'flycheck-phpstan-executable)
(cond
((eq 'docker phpstan-executable) phpstan-docker-executable)
((stringp phpstan-executable) phpstan-executable)
(t (car phpstan-executable))))))))
(setq-local flycheck-phpstan-executable (nth 0 (phpstan-get-executable)))))))

(flycheck-define-checker phpstan
"PHP static analyzer based on PHPStan."
Expand Down