4406.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

From e5a5149bdb4b11e3b32130a4c0be62b6a7a3306b Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
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;