Skip to content

fix enabled-and-set-variable predicate #34

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 2 commits into from
Nov 22, 2020
Merged

fix enabled-and-set-variable predicate #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f775c9
fix enabled-and-set-variable predicate
conao3 Sep 11, 2020
795c172
fix get executable path method
conao3 Sep 11, 2020
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
18 changes: 11 additions & 7 deletions flycheck-phpstan.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,18 @@
(when (and phpstan-flycheck-auto-set-executable
(not (and (boundp 'flycheck-phpstan-executable)
(symbol-value 'flycheck-phpstan-executable)))
(or (eq 'docker phpstan-executable)
(and (consp phpstan-executable)
(stringp (car phpstan-executable))
(listp (cdr phpstan-executable)))))
(or (stringp phpstan-executable)
(eq 'docker phpstan-executable)
(and (eq 'root (car-safe phpstan-executable))
(stringp (cdr-safe phpstan-executable)))
(and (stirngp (car-safe phpstan-executable))
Copy link
Member

@zonuexe zonuexe Nov 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo #38

Copy link
Contributor Author

@conao3 conao3 Nov 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I have to check more.

(listp (cdr-safe phpstan-executable)))
(null phpstan-executable)))
(set (make-local-variable 'flycheck-phpstan-executable)
(if (eq 'docker phpstan-executable)
phpstan-docker-executable
(car phpstan-executable)))))))
(cond
((eq 'docker phpstan-executable) phpstan-docker-executable)
((stringp phpstan-executable) phpstan-executable)
(t (car phpstan-executable))))))))

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