Skip to content

Adding git support, adding posibility to set phpcs path #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding git support, adding posibility to set phpcs path #2

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ To use this plugin, you must have these global variables set:
or
let g:phpcs_max_output = 2000 " Output limited to 2000 line

4. Set phpcs path
This is useful in case for using phpcs from docker

let g:phpcs_path = 'docker run --rm -i --volume "$(pwd):$(pwd):rw" -w "$(pwd)" -u $(id -u):$(id -g) phpqa/phpcs phpcs'

Following command are provided:

:Phpcs " Check the current file, if not in DIFF mode.
Expand Down
21 changes: 16 additions & 5 deletions plugin/phpcs.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"
" let g:phpcs_vcs_type = 'svn'
"
" Currently only support 'svn' or 'cvs'.
" Currently only support 'svn', 'cvs' or 'git'.
"
" 3. Set the max allowed output lines.
" This is useful in case there are too many errors and memory is running out.
Expand All @@ -40,6 +40,11 @@
" or
"
" let g:phpcs_max_output = 2000 " Output limited to 2000 lines
"
" 4. Set phpcs path
" This is useful in case for using phpcs from docker
"
" let g:phpcs_path = 'docker run --rm -i --volume "$(pwd):$(pwd):rw" -w "$(pwd)" -u $(id -u):$(id -g) phpqa/phpcs phpcs'
"------------------------------------------------------------------------------
" Modification History:
" 1.1 Fixed the issue that when minibufexpl plugin enabled, the window operation is totally wrong in DIFF mode.
Expand Down Expand Up @@ -67,12 +72,18 @@ endif
" The VCS supported
let s:vcs_supported = {
\'svn' : "svn diff | grep '^Index' | cut -f2 -d' '",
\'cvs' : "cvs status 2>/dev/null | grep 'File:' |egrep 'Merge|Modified'"
\'cvs' : "cvs status 2>/dev/null | grep 'File:' |egrep 'Merge|Modified'",
\'git' : "git diff --name-only",
\}

" If VCS type not set, use 'svn' as default
" If VCS type not set, use 'git' as default
if !exists('g:phpcs_vcs_type')
let g:phpcs_vcs_type = 'svn'
let g:phpcs_vcs_type = 'git'
endif

" If phpcs path is not set we run just phpcs command line
if !exists('g:phpcs_path')
let g:phpcs_path = 'phpcs'
endif

if has_key(s:vcs_supported, g:phpcs_vcs_type)
Expand All @@ -94,7 +105,7 @@ function! s:runPhpcsCmd(std, filename, filters)
" strip all whitespace
let std = substitute(a:std, "\\s", "", "g")

let phpcs_output = system('phpcs --report=emacs --standard=' . std . ' ' . a:filename)
let phpcs_output = system(g:phpcs_path . ' --report=emacs --standard=' . std . ' ' . a:filename)
let phpcs_result = split(phpcs_output, "\n")

" run callback filters
Expand Down