vim/ale
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Escape phpstan arguments, and update documentation

Browse Source
This commit is contained in:
w0rp 2019-05-07 19:38:32 +01:00
parent c10da0e390
commit 5f64f8dc57
No known key found for this signature in database
GPG Key ID: 0FC1ECAA8C81CD83
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ale_linters/php/phpstan.vim
View File

@ -9,7 +9,7 @@ let g:ale_php_phpstan_configuration = get(g:, 'ale_php_phpstan_configuration', '
function! ale_linters#php#phpstan#GetCommand(buffer, version) abort function! ale_linters#php#phpstan#GetCommand(buffer, version) abort
let l:configuration = ale#Var(a:buffer, 'php_phpstan_configuration') let l:configuration = ale#Var(a:buffer, 'php_phpstan_configuration')
let l:configuration_option = !empty(l:configuration) let l:configuration_option = !empty(l:configuration)
\ ? ' -c ' . l:configuration \ ? ' -c ' . ale#Escape(l:configuration)
\ : '' \ : ''
let l:level = ale#Var(a:buffer, 'php_phpstan_level') let l:level = ale#Var(a:buffer, 'php_phpstan_level')
@ -21,7 +21,7 @@ function! ale_linters#php#phpstan#GetCommand(buffer, version) abort
endif endif
let l:level_option = !empty(l:level) let l:level_option = !empty(l:level)
\ ? ' -l ' . l:level \ ? ' -l ' . ale#Escape(l:level)
\ : '' \ : ''
let l:error_format = ale#semver#GTE(a:version, [0, 10, 3]) let l:error_format = ale#semver#GTE(a:version, [0, 10, 3])

8
doc/ale-php.txt
View File

@ -154,11 +154,13 @@ g:ale_php_phpstan_executable *g:ale_php_phpstan_executable*
g:ale_php_phpstan_level *g:ale_php_phpstan_level* g:ale_php_phpstan_level *g:ale_php_phpstan_level*
*b:ale_php_phpstan_level* *b:ale_php_phpstan_level*
Type: |Number| Type: |String|
Default: `4` Default: `''`
This variable controls the rule levels. 0 is the loosest and 4 is the This variable controls the rule levels. 0 is the loosest and 4 is the
strictest. strictest. If this option isn't set, the rule level will be controlled by
the configuration file. If no configuration file can be detected, `'4'` will
be used instead.
g:ale_php_phpstan_configuration *g:ale_php_phpstan_configuration* g:ale_php_phpstan_configuration *g:ale_php_phpstan_configuration*

12
test/command_callback/test_phpstan_command_callbacks.vader
View File

@ -12,27 +12,27 @@ Execute(Custom executables should be used for the executable and command):
let g:ale_php_phpstan_executable = 'phpstan_test' let g:ale_php_phpstan_executable = 'phpstan_test'
AssertLinter 'phpstan_test', AssertLinter 'phpstan_test',
\ ale#Escape('phpstan_test') . ' analyze --no-progress --errorFormat raw -l 4 %s' \ ale#Escape('phpstan_test') . ' analyze --no-progress --errorFormat raw -l ' . ale#Escape('4') . ' %s'
Execute(project with level set to 3): Execute(project with level set to 3):
call ale#test#SetFilename('phpstan-test-files/foo/test.php') call ale#test#SetFilename('phpstan-test-files/foo/test.php')
let g:ale_php_phpstan_level = 3 let g:ale_php_phpstan_level = 3
AssertLinter 'phpstan', AssertLinter 'phpstan',
\ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -l 3 %s' \ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -l ' . ale#Escape('3') . ' %s'
Execute(Custom phpstan configuration file): Execute(Custom phpstan configuration file):
let g:ale_php_phpstan_configuration = 'phpstan_config' let g:ale_php_phpstan_configuration = 'phpstan_config'
AssertLinter 'phpstan', AssertLinter 'phpstan',
\ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -c phpstan_config -l 4 %s' \ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -c ' . ale#Escape('phpstan_config') . ' -l ' . ale#Escape('4') . ' %s'
Execute(Choose the right format for error format param): Execute(Choose the right format for error format param):
GivenCommandOutput ['0.10.3'] GivenCommandOutput ['0.10.3']
AssertLinter 'phpstan', [ AssertLinter 'phpstan', [
\ ale#Escape('phpstan') . ' --version', \ ale#Escape('phpstan') . ' --version',
\ ale#Escape('phpstan') . ' analyze --no-progress --error-format raw -l 4 %s' \ ale#Escape('phpstan') . ' analyze --no-progress --error-format raw -l ' . ale#Escape('4') . ' %s'
\ ] \ ]
Execute(Configuration file exists in current directory): Execute(Configuration file exists in current directory):
@ -52,7 +52,7 @@ Execute(Configuration file exists in current directory, but force phpstan level)
AssertLinter 'phpstan', [ AssertLinter 'phpstan', [
\ ale#Escape('phpstan') . ' --version', \ ale#Escape('phpstan') . ' --version',
\ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -l 7 %s' \ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -l ' . ale#Escape('7') . ' %s'
\ ] \ ]
Execute(Configuration file exists in current directory, but force phpstan configuration): Execute(Configuration file exists in current directory, but force phpstan configuration):
@ -62,5 +62,5 @@ Execute(Configuration file exists in current directory, but force phpstan config
AssertLinter 'phpstan', [ AssertLinter 'phpstan', [
\ ale#Escape('phpstan') . ' --version', \ ale#Escape('phpstan') . ' --version',
\ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -c phpstan.custom.neon %s' \ ale#Escape('phpstan') . ' analyze --no-progress --errorFormat raw -c ' . ale#Escape('phpstan.custom.neon') . ' %s'
\ ] \ ]