Skip to content

Commit f02000c

Browse files
committed
bug #4406 NoSuperfluousElseifFixer - fix invalid escape sequence in character class (remicollet, SpacePossum)
This PR was merged into the 2.15 branch. Discussion ---------- NoSuperfluousElseifFixer - fix invalid escape sequence in character class Try to fix #4405 Commits ------- 14c9706 add test to show difference between paterns b8e46cb Fix escape sequence is invalid in character clas
2 parents 673969c + 14c9706 commit f02000c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/Fixer/ControlStructure/NoSuperfluousElseifFixer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private function convertElseifToIf(Tokens $tokens, $index)
8484
$whitespace = '';
8585
for ($previous = $index - 1; $previous > 0; --$previous) {
8686
$token = $tokens[$previous];
87-
if ($token->isWhitespace() && Preg::match('/(\R\V*)$/', $token->getContent(), $matches)) {
87+
if ($token->isWhitespace() && Preg::match('/(\R\N*)$/', $token->getContent(), $matches)) {
8888
$whitespace = $matches[1];
8989

9090
break;

tests/Fixer/ControlStructure/NoSuperfluousElseifFixerTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ public function provideFixCases()
131131
}
132132
'.'
133133
continue;
134+
135+
136+
134137
}
135138
if (6) {
136139
return null;
@@ -160,6 +163,9 @@ public function provideFixCases()
160163
}
161164
'.'
162165
continue;
166+
167+
168+
163169
} else if (6) {
164170
return null;
165171
} else {

0 commit comments

Comments
 (0)