bug #2954 NoBreakCommentFixer - Disable case sensitivity (julienfalque)

keradus · keradus · commit 3fd0bda1c1ea · 2017-08-01T14:05:43.000+02:00
This PR was merged into the 2.4 branch. Discussion ---------- NoBreakCommentFixer - Disable case sensitivity Fixes #2948. Commits ------- fb19b7b Disable case sensitivity
diff --git a/src/Fixer/ControlStructure/NoBreakCommentFixer.php b/src/Fixer/ControlStructure/NoBreakCommentFixer.php
@@ -133,6 +133,13 @@ private function fixCase(Tokens $tokens, $casePosition)
                     if (null === $commentPosition) {
                         $this->insertCommentAt($tokens, $i);
                     } else {
+                        $text = $this->configuration['comment_text'];
+
+                        $tokens[$commentPosition] = new Token([
+                            $tokens[$commentPosition]->getId(),
+                            str_ireplace($text, $text, $tokens[$commentPosition]->getContent()),
+                        ]);
+
                         $this->ensureNewLineAt($tokens, $commentPosition);
                     }
                 } elseif (null !== $commentPosition) {
@@ -161,7 +168,7 @@ private function isNoBreakComment(Token $token)
 
         $text = $this->configuration['comment_text'];
 
-        return preg_match("~^((//|#)\s*$text\s*)|(/\*\*?\s*$text\s*\*/)$~", $token->getContent());
+        return preg_match("~^((//|#)\s*$text\s*)|(/\*\*?\s*$text\s*\*/)$~i", $token->getContent());
     }
 
     /**
diff --git a/tests/Fixer/ControlStructure/NoBreakCommentFixerTest.php b/tests/Fixer/ControlStructure/NoBreakCommentFixerTest.php
@@ -834,6 +834,24 @@ public function provideTestFixCases()
 ?>
 <?php }',
             ],
+            [
+                '<?php
+switch ($foo) {
+    case 1:
+        foo();
+        // no break
+    case 2:
+        bar();
+}',
+                '<?php
+switch ($foo) {
+    case 1:
+        foo();
+        // No break
+    case 2:
+        bar();
+}',
+            ],
         ];
     }
 
@@ -935,10 +953,17 @@ public function provideTestFixWithDifferentCommentTextCases()
     {
         $cases = $this->provideTestFixCases();
 
+        $replaceCommentText = function ($php) {
+            return strtr($php, [
+                'No break' => 'Fall-through case!',
+                'no break' => 'fall-through case!',
+            ]);
+        };
+
         foreach ($cases as &$case) {
-            $case[0] = str_replace('no break', 'fall-through case!', $case[0]);
+            $case[0] = $replaceCommentText($case[0]);
             if (isset($case[1])) {
-                $case[1] = str_replace('no break', 'fall-through case!', $case[1]);
+                $case[1] = $replaceCommentText($case[1]);
             }
         }
 
