Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion linter.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ class PHP(Linter):
}
regex = (
r'^(?P<error>Parse|Fatal) error:\s*'
r'(?P<message>((?:parse|syntax) error,?)?\s*(?:unexpected \'(?P<near>[^\']+)\')?.*) '
# PHP 7 quotes the token with single quotes (`unexpected 'foo'`), PHP 8
# with double quotes and a description (`unexpected token ";"`,
# `unexpected identifier "foo"`).
r'(?P<message>((?:parse|syntax) error,?)?\s*'
r'(?:unexpected (?:[a-z-]+(?: [a-z-]+)* )?(?P<quote>["\'])(?P<near>.+?)(?P=quote))?.*) '
r'(?:in - )?on line (?P<line>\d+)'
)
error_stream = util.STREAM_STDOUT
Expand Down
56 changes: 56 additions & 0 deletions tests/test_regex.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,59 @@ def test_issue_55_message_filter_only_strips_trailing_source(self):
'message': 'Cannot redeclare f() (previously declared in Standard input code:2)',
},
)

def test_issue_56_php8_quoted_tokens(self):
# PHP 8 writes `unexpected token ";"`, `unexpected identifier "bar"`, ...
self.assertMatch(
'Parse error: syntax error, unexpected token ";", expecting "]" '
'in Standard input code on line 2',
{
'error': 'Parse',
'line': 1,
'message': 'syntax error, unexpected token ";", expecting "]"',
'near': ';',
},
)

self.assertMatch(
'Parse error: syntax error, unexpected identifier "bar" in Standard input code on line 2',
{
'error': 'Parse',
'line': 1,
'message': 'syntax error, unexpected identifier "bar"',
'near': 'bar',
},
)

self.assertMatch(
'Parse error: syntax error, unexpected variable "$y" in Standard input code on line 2',
{'error': 'Parse', 'line': 1, 'near': '$y'},
)

self.assertMatch(
'Parse error: syntax error, unexpected integer "2", expecting "," or ";" '
'in Standard input code on line 2',
{'error': 'Parse', 'line': 1, 'near': '2'},
)

self.assertMatch(
'Parse error: syntax error, unexpected double-quoted string "def" '
'in Standard input code on line 2',
{'error': 'Parse', 'line': 1, 'near': 'def'},
)

self.assertMatch(
'Parse error: syntax error, unexpected double-quoted string "a\'b", '
'expecting "," or ";" in Standard input code on line 1',
{'error': 'Parse', 'line': 0, 'near': "a'b"},
)

self.assertMatch(
'Parse error: syntax error, unexpected end of file in Standard input code on line 3',
{
'error': 'Parse',
'line': 2,
'message': 'syntax error, unexpected end of file',
'near': None,
},
)
Loading