minor #5302 SingleLineCommentStyleFixer - do not fix possible attribu…

…tes (PHP8) (SpacePossum) This PR was merged into the 2.16 branch. Discussion ---------- SingleLineCommentStyleFixer - do not fix possible attributes (PHP8) closes #5144 Commits ------- 89d95e8 SingleLineCommentStyleFixer - do not fix possible attributes (PHP8)
PHP-CS-Fixer · Dec 4, 2020 · 91b146a · 91b146a
2 parents 694dfb7 + 89d95e8
commit 91b146a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Fixer/Comment/SingleLineCommentStyleFixer.php b/src/Fixer/Comment/SingleLineCommentStyleFixer.php
@@ -120,6 +120,10 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
             $commentContent = substr($content, 2, -2) ?: '';
 
             if ($this->hashEnabled && '#' === $content[0]) {
+                if (isset($content[1]) && '[' === $content[1]) {
+                    continue; // This might be attribute on PHP8, do not change
+                }
+
                 $tokens[$index] = new Token([$token->getId(), '//'.substr($content, 1)]);
 
                 continue;

diff --git a/tests/Fixer/Comment/SingleLineCommentStyleFixerTest.php b/tests/Fixer/Comment/SingleLineCommentStyleFixerTest.php
@@ -258,7 +258,10 @@ public function provideHashCases()
                     # test 4
                 ',
             ],
-
+            [
+                '<?php //',
+                '<?php #',
+            ],
             // Untouched cases
             [
                 '<?php
@@ -279,6 +282,11 @@ public function provideHashCases()
             [
                 '<?php /* start-end */',
             ],
+            [
+                '<?php function foo(
+    #[MyAttr([1, 2])] Type $myParam,
+) {} // foo',
+            ],
         ];
     }