Merge pull request #1820 from SuRaMoN/master

Added phpcs options support as described in #257

ale_linters/php/phpcs.vim

@@ -3,6 +3,7 @@
 
 let g:ale_php_phpcs_standard = get(g:, 'ale_php_phpcs_standard', '')
 
+call ale#Set('php_phpcs_options', '')
 call ale#Set('php_phpcs_executable', 'phpcs')
 call ale#Set('php_phpcs_use_global', get(g:, 'ale_use_global_executables', 0))
 
@@ -11,8 +12,11 @@ function! ale_linters#php#phpcs#GetCommand(buffer) abort
     let l:standard_option = !empty(l:standard)
     \   ? '--standard=' . l:standard
     \   : ''
+    let l:options = ale#Var(a:buffer, 'php_phpcs_options')
 
-    return '%e -s --report=emacs --stdin-path=%s' . ale#Pad(l:standard_option)
+    return '%e -s --report=emacs --stdin-path=%s'
+    \    . ale#Pad(l:standard_option)
+    \    . ale#Pad(l:options)
 endfunction
 
 function! ale_linters#php#phpcs#Handle(buffer, lines) abort

doc/ale-php.txt

@@ -114,6 +114,13 @@ g:ale_php_phpcs_use_global                         *g:ale_php_phpcs_use_global*
   See |ale-integrations-local-executables|
 
 
+g:ale_php_phpcs_options                               *g:ale_php_phpcs_options*
+                                                      *b:ale_php_phpcs_options*
+  Type: |String|
+  Default: `''`
+
+  This variable can be set to pass additional options to php-cs
+
 ===============================================================================
 phpmd                                                           *ale-php-phpmd*
 

test/command_callback/test_phpcs_command_callback.vader

@@ -27,3 +27,9 @@ Execute(Projects without local executables should use the global one):
 
   AssertLinter 'phpcs',
   \ ale#Escape('phpcs') . ' -s --report=emacs --stdin-path=%s'
+
+Execute(User provided options are used):
+  let g:ale_php_phpcs_options = '--my-user-provided-option my-value'
+
+  AssertLinter 'phpcs',
+  \ ale#Escape('phpcs') . ' -s --report=emacs --stdin-path=%s --my-user-provided-option my-value'