From e3b0ee152639b4388b15b78d229107f0caa20e5a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 May 2019 11:57:39 +0200 Subject: - update to 2.15.0 - add patch for libpcre2 10.33 from https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/4406 --- 4406.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 4406.patch (limited to '4406.patch') diff --git a/4406.patch b/4406.patch new file mode 100644 index 0000000..48f04f0 --- /dev/null +++ b/4406.patch @@ -0,0 +1,22 @@ +From e5a5149bdb4b11e3b32130a4c0be62b6a7a3306b Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 6 May 2019 11:38:26 +0200 +Subject: [PATCH] Fix escape sequence is invalid in character clas + +--- + src/Fixer/ControlStructure/NoSuperfluousElseifFixer.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Fixer/ControlStructure/NoSuperfluousElseifFixer.php b/src/Fixer/ControlStructure/NoSuperfluousElseifFixer.php +index 1db72935b0..a3a24a8cb7 100644 +--- a/src/Fixer/ControlStructure/NoSuperfluousElseifFixer.php ++++ b/src/Fixer/ControlStructure/NoSuperfluousElseifFixer.php +@@ -84,7 +84,7 @@ private function convertElseifToIf(Tokens $tokens, $index) + $whitespace = ''; + for ($previous = $index - 1; $previous > 0; --$previous) { + $token = $tokens[$previous]; +- if ($token->isWhitespace() && Preg::match('/(\R[^\R]*)$/', $token->getContent(), $matches)) { ++ if ($token->isWhitespace() && Preg::match('/(\R[^\n\r]*)$/', $token->getContent(), $matches)) { + $whitespace = $matches[1]; + + break; -- cgit