aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-11-29 16:12:17 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-11-29 16:12:17 +1300
commit2dfee62cd9cd45109c15329fcb12facee15ceeb8 (patch)
tree16184242dfde54fa72d70e9d143d2f9a4c282e1e
parentMerge branch 'release/v7.22.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-2dfee62cd9cd45109c15329fcb12facee15ceeb8.tar.gz
dotfiles-2dfee62cd9cd45109c15329fcb12facee15ceeb8.zip
Merge branch 'release/v7.23.0'v7.23.0
* release/v7.23.0: Define phpcsff(1df) as Vim 'equalprg' for PHP Prevent diagnostics from php-cs-fixer
-rw-r--r--VERSION4
-rwxr-xr-xbin/phpcsff.mi52
-rw-r--r--vim/after/ftplugin/php.vim3
3 files changed, 5 insertions, 4 deletions
diff --git a/VERSION b/VERSION
index 6a0cbc58..59ba0c65 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v7.22.0
-Fri, 29 Nov 2019 03:07:47 +0000
+tejr dotfiles v7.23.0
+Fri, 29 Nov 2019 03:12:16 +0000
diff --git a/bin/phpcsff.mi5 b/bin/phpcsff.mi5
index ea05eaaa..5e33f047 100755
--- a/bin/phpcsff.mi5
+++ b/bin/phpcsff.mi5
@@ -11,5 +11,5 @@ if ! command -v php-cs-fixer >/dev/null 2>&1 ; then
exit 1
fi
cat -- "${@:--}" > "$td"/src.php
-php-cs-fixer fix -- "$td"/src.php
+php-cs-fixer fix --quiet -- "$td"/src.php
cat -- "$td"/src.php
diff --git a/vim/after/ftplugin/php.vim b/vim/after/ftplugin/php.vim
index c7f77ece..0ce099a0 100644
--- a/vim/after/ftplugin/php.vim
+++ b/vim/after/ftplugin/php.vim
@@ -1,7 +1,8 @@
" Use PHP itself for syntax checking
compiler php
+setlocal equalprg=phpcsff
let b:undo_ftplugin .= '|unlet b:current_compiler'
- \ . '|setlocal errorformat< makeprg<'
+ \ . '|setlocal equalprg< errorformat< makeprg<'
" Set comment formats
setlocal comments=s1:/*,m:*,ex:*/,://,:#