summaryrefslogtreecommitdiff
path: root/ale_linters
diff options
context:
space:
mode:
authorw0rp <w0rp@users.noreply.github.com>2017-12-17 12:41:28 +0000
committerGitHub <noreply@github.com>2017-12-17 12:41:28 +0000
commitfc151d7b301705c97a74d7193f954df4e536f84b (patch)
treed2e42f4d4d4f50d261d7dbf6929d01c20a960939 /ale_linters
parent55e09a4a2da8f14d03e69d78351089540b898528 (diff)
parent78d1f5f5dfdc3a362b3ecb304ffb07e9bb10a65c (diff)
downloadale-fc151d7b301705c97a74d7193f954df4e536f84b.zip
Merge pull request #1222 from srathbone/master
Fix PHP linter to support PHP 7.2 lint output
Diffstat (limited to 'ale_linters')
-rw-r--r--ale_linters/php/php.vim6
1 files changed, 4 insertions, 2 deletions
diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim
index b263c5f3..6470383b 100644
--- a/ale_linters/php/php.vim
+++ b/ale_linters/php/php.vim
@@ -4,12 +4,14 @@
function! ale_linters#php#php#Handle(buffer, lines) abort
" Matches patterns like the following:
"
- " Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
- let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)'
+ " PHP 7.1<= - Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
+ " PHP 7.2>= - Parse error: syntax error, unexpected ';', expecting ']' in Standard input code on line 15
+ let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in %(-|Standard input code) on line (\d+)'
let l:output = []
for l:match in ale#util#GetMatches(a:lines, l:pattern)
let l:col = empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1
+
let l:obj = {
\ 'lnum': l:match[3] + 0,
\ 'col': l:col,