From e08996940468ce90616a9704a439652f1ab73e31 Mon Sep 17 00:00:00 2001
From: Marcus Zanona <marcus@zanona.co>
Date: Wed, 12 Aug 2020 11:06:35 +0200
Subject: [PATCH] fix(ale_linters/phpcs): add support for multiline error
 messages

---
 ale_linters/php/phpcs.vim             |  2 +-
 test/handler/test_phpcs_handler.vader | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ale_linters/php/phpcs.vim b/ale_linters/php/phpcs.vim
index 11b81e84..c5a3faa9 100644
--- a/ale_linters/php/phpcs.vim
+++ b/ale_linters/php/phpcs.vim
@@ -23,7 +23,7 @@ function! ale_linters#php#phpcs#Handle(buffer, lines) abort
     " Matches against lines like the following:
     "
     " /path/to/some-filename.php:18:3: error - Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact)
-    let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) (\(.\+\))$'
+    let l:pattern = '^.*:\(\d\+\):\(\d\+\): \(.\+\) - \(.\+\) (\(.\+\)).*$'
     let l:output = []
 
     for l:match in ale#util#GetMatches(a:lines, l:pattern)
diff --git a/test/handler/test_phpcs_handler.vader b/test/handler/test_phpcs_handler.vader
index 18accece..26d35cb8 100644
--- a/test/handler/test_phpcs_handler.vader
+++ b/test/handler/test_phpcs_handler.vader
@@ -13,7 +13,16 @@ Execute(phpcs errors should be handled):
   \     'type': 'E',
   \     'sub_type': 'style',
   \     'text': 'Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact)',
-  \   }],
+  \   },
+  \   {
+  \     'lnum': 22,
+  \     'col': 3,
+  \     'type': 'E',
+  \     'sub_type': 'style',
+  \     'text': 'All output should be run through an escaping function (see the Security sections in the WordPress Developer Handbooks)',
+  \   },
+  \ ],
   \ ale_linters#php#phpcs#Handle(bufnr(''), [
   \ '/path/to/some-filename.php:18:3: error - Line indented incorrectly; expected 4 spaces, found 2 (Generic.WhiteSpace.ScopeIndent.IncorrectExact)',
+  \ "/path/to/some-filename.php:22:3: error - All output should be run through an escaping function (see the Security sections in the WordPress Developer Handbooks), found '\"\n'.",
   \ ])