Merge pull request #467 from adriaanzon/php-fix-double-errors

PHP: Fix double errors and support fatal errors
This commit is contained in:
w0rp 2017-04-12 23:58:01 +01:00 committed by GitHub
commit 8afd914c6d
2 changed files with 12 additions and 2 deletions

View File

@ -1,11 +1,11 @@
" Author: Spencer Wood <https://github.com/scwood> " Author: Spencer Wood <https://github.com/scwood>, Adriaan Zonnenberg <amz@adriaan.xyz>
" Description: This file adds support for checking PHP with php-cli " Description: This file adds support for checking PHP with php-cli
function! ale_linters#php#php#Handle(buffer, lines) abort function! ale_linters#php#php#Handle(buffer, lines) abort
" Matches patterns like the following: " Matches patterns like the following:
" "
" PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 15 " PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 15
let l:pattern = '\vParse error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)' let l:pattern = '\vPHP %(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)'
let l:output = [] let l:output = []

View File

@ -3,6 +3,7 @@ Given (Some invalid lines of PHP):
class Foo { / } class Foo { / }
$foo) $foo)
['foo' 'bar'] ['foo' 'bar']
function count() {}
Execute(The php handler should parse lines correctly): Execute(The php handler should parse lines correctly):
runtime ale_linters/php/php.vim runtime ale_linters/php/php.vim
@ -39,6 +40,13 @@ Execute(The php handler should parse lines correctly):
\ }, \ },
\ { \ {
\ 'bufnr': 347, \ 'bufnr': 347,
\ 'lnum': 5,
\ 'col': 0,
\ 'text': "Cannot redeclare count()",
\ 'type': 'E',
\ },
\ {
\ 'bufnr': 347,
\ 'lnum': 21, \ 'lnum': 21,
\ 'col': 0, \ 'col': 0,
\ 'text': "syntax error, unexpected end of file", \ 'text': "syntax error, unexpected end of file",
@ -54,10 +62,12 @@ Execute(The php handler should parse lines correctly):
\ ], \ ],
\ ale_linters#php#php#Handle(347, [ \ ale_linters#php#php#Handle(347, [
\ 'This line should be ignored completely', \ 'This line should be ignored completely',
\ "Parse error: syntax error, This line should be ignored completely in - on line 1",
\ "PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 1", \ "PHP Parse error: syntax error, unexpected ';', expecting ']' in - on line 1",
\ "PHP Parse error: syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST) in - on line 2", \ "PHP Parse error: syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST) in - on line 2",
\ "PHP Parse error: syntax error, unexpected ')' in - on line 3", \ "PHP Parse error: syntax error, unexpected ')' in - on line 3",
\ "PHP Parse error: syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']' in - on line 4", \ "PHP Parse error: syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']' in - on line 4",
\ "PHP Fatal error: Cannot redeclare count() in - on line 5",
\ 'PHP Parse error: syntax error, unexpected end of file in - on line 21', \ 'PHP Parse error: syntax error, unexpected end of file in - on line 21',
\ 'PHP Parse error: Invalid numeric literal in - on line 47', \ 'PHP Parse error: Invalid numeric literal in - on line 47',
\ ]) \ ])