From 6299da7bd39790ca996516f46f09482585fb9035 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <amz@adriaan.xyz>
Date: Wed, 17 May 2017 21:19:34 +0200
Subject: [PATCH 1/2] Break up php tests so the output is easier to read

---
 test/handler/test_php_handler.vader | 37 ++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/test/handler/test_php_handler.vader b/test/handler/test_php_handler.vader
index 5dac094..c4f9944 100644
--- a/test/handler/test_php_handler.vader
+++ b/test/handler/test_php_handler.vader
@@ -1,3 +1,6 @@
+Before:
+  runtime ale_linters/php/php.vim
+
 Given (Some invalid lines of PHP):
   [foo;]
   class Foo { / }
@@ -5,9 +8,7 @@ Given (Some invalid lines of PHP):
   ['foo' 'bar']
   function count() {}
 
-Execute(The php handler should parse lines correctly):
-  runtime ale_linters/php/php.vim
-
+Execute(The php handler should calculate column numbers):
   AssertEqual
   \ [
   \   {
@@ -30,6 +31,25 @@ Execute(The php handler should parse lines correctly):
   \     'col': 8,
   \     'text': "syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']'",
   \   },
+  \ ],
+  \ ale_linters#php#php#Handle(347, [
+  \   "This line should be ignored completely",
+  \   "Parse error:  syntax error, unexpected ';', expecting ']' in - on line 1",
+  \   "Parse error:  syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST) in - on line 2",
+  \   "Parse error:  syntax error, unexpected ')' in - on line 3",
+  \   "Parse error:  syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']' in - on line 4",
+  \ ])
+
+Execute (The php handler should ignore lines starting with 'PHP Parse error'):
+  AssertEqual
+  \ [],
+  \ ale_linters#php#php#Handle(347, [
+  \   "PHP Parse error:  syntax error, This line should be ignored completely in - on line 1",
+  \ ])
+
+Execute (The php handler should parse lines without column indication):
+  AssertEqual
+  \ [
   \   {
   \     'lnum': 5,
   \     'col': 0,
@@ -47,15 +67,10 @@ Execute(The php handler should parse lines correctly):
   \   },
   \ ],
   \ ale_linters#php#php#Handle(347, [
-  \   'This line should be ignored completely',
-  \   "PHP Parse error:  syntax error, This line should be ignored completely in - on line 1",
-  \   "Parse error:  syntax error, unexpected ';', expecting ']' in - on line 1",
-  \   "Parse error:  syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST) in - on line 2",
-  \   "Parse error:  syntax error, unexpected ')' in - on line 3",
-  \   "Parse error:  syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']' in - on line 4",
+  \   "This line should be ignored completely",
   \   "Fatal error:  Cannot redeclare count() in - on line 5",
-  \   'Parse error:  syntax error, unexpected end of file in - on line 21',
-  \   'Parse error: Invalid numeric literal in - on line 47',
+  \   "Parse error:  syntax error, unexpected end of file in - on line 21",
+  \   "Parse error: Invalid numeric literal in - on line 47",
   \ ])
 
 After:

From 05970e1b28fdac59df04f11b85ccac3b65362bc7 Mon Sep 17 00:00:00 2001
From: Adriaan Zonnenberg <amz@adriaan.xyz>
Date: Wed, 17 May 2017 21:28:29 +0200
Subject: [PATCH 2/2] Add end columns on php linter #538

---
 ale_linters/php/php.vim             | 16 +++++++++++-----
 test/handler/test_php_handler.vader |  4 ++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ale_linters/php/php.vim b/ale_linters/php/php.vim
index 7c9e8c1..7158c95 100644
--- a/ale_linters/php/php.vim
+++ b/ale_linters/php/php.vim
@@ -4,17 +4,23 @@
 function! ale_linters#php#php#Handle(buffer, lines) abort
     " Matches patterns like the following:
     "
-    " PHP Parse error:  syntax error, unexpected ';', expecting ']' in - on line 15
+    " Parse error:  syntax error, unexpected ';', expecting ']' in - on line 15
     let l:pattern = '\v^%(Fatal|Parse) error:\s+(.+unexpected ''(.+)%(expecting.+)@<!''.*|.+) in - on line (\d+)'
-
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
-        call add(l:output, {
+        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': empty(l:match[2]) ? 0 : stridx(getline(l:match[3]), l:match[2]) + 1,
+        \   'col': l:col,
         \   'text': l:match[1],
-        \})
+        \}
+
+        if l:col != 0
+            let l:obj.end_col = l:col + strlen(l:match[2]) - 1
+        endif
+
+        call add(l:output, l:obj)
     endfor
 
     return l:output
diff --git a/test/handler/test_php_handler.vader b/test/handler/test_php_handler.vader
index c4f9944..0d4d427 100644
--- a/test/handler/test_php_handler.vader
+++ b/test/handler/test_php_handler.vader
@@ -14,21 +14,25 @@ Execute(The php handler should calculate column numbers):
   \   {
   \     'lnum': 1,
   \     'col': 5,
+  \     'end_col': 5,
   \     'text': "syntax error, unexpected ';', expecting ']'",
   \   },
   \   {
   \     'lnum': 2,
   \     'col': 13,
+  \     'end_col': 13,
   \     'text': "syntax error, unexpected '/', expecting function (T_FUNCTION) or const (T_CONST)",
   \   },
   \   {
   \     'lnum': 3,
   \     'col': 5,
+  \     'end_col': 5,
   \     'text': "syntax error, unexpected ')'",
   \   },
   \   {
   \     'lnum': 4,
   \     'col': 8,
+  \     'end_col': 12,
   \     'text': "syntax error, unexpected ''bar'' (T_CONSTANT_ENCAPSED_STRING), expecting ']'",
   \   },
   \ ],