bug #5596 NullableTypeTransformer - fix for attributes (kubawerlos, j…

…rmajor) This PR was merged into the 2.18 branch. Discussion ---------- NullableTypeTransformer - fix for attributes Fixes #5533 Commits ------- 86f5b39 Update tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php e3f0d37 add test reproducing #5533 62cceb9 Fix 58e6a4d Add failing test case
PHP-CS-Fixer · Apr 6, 2021 · f01521b · f01521b
2 parents 9bf2760 + 86f5b39
commit f01521b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/src/Tokenizer/Transformer/NullableTypeTransformer.php b/src/Tokenizer/Transformer/NullableTypeTransformer.php
@@ -62,6 +62,7 @@ public function process(Tokens $tokens, Token $token, $index)
             [CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PUBLIC],
             [CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PROTECTED],
             [CT::T_CONSTRUCTOR_PROPERTY_PROMOTION_PRIVATE],
+            [CT::T_ATTRIBUTE_CLOSE],
             [T_PRIVATE],
             [T_PROTECTED],
             [T_PUBLIC],

diff --git a/tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php b/tests/Fixer/Operator/TernaryToElvisOperatorFixerTest.php
@@ -498,4 +498,29 @@ public function provideFix70Cases()
             ],
         ];
     }
+
+    /**
+     * @param string $input
+     *
+     * @dataProvider provideDoNotFix80Cases
+     * @requires PHP 8.0
+     */
+    public function test80DoNotFix($input)
+    {
+        $this->doTest($input);
+    }
+
+    public function provideDoNotFix80Cases()
+    {
+        return [
+            ['<?php
+
+function test(#[TestAttribute] ?User $user) {}
+'],
+            ['<?php
+
+function test(#[TestAttribute] ?User $user = null) {}
+'],
+        ];
+    }
 }
diff --git a/tests/Tokenizer/Transformer/NullableTypeTransformerTest.php b/tests/Tokenizer/Transformer/NullableTypeTransformerTest.php
@@ -173,6 +173,14 @@ public function __construct(
                     41 => CT::T_NULLABLE_TYPE,
                 ],
             ],
+            [
+                '<?php
+                    function test(#[TestAttribute] ?User $user) {}
+                ',
+                [
+                    10 => CT::T_NULLABLE_TYPE,
+                ],
+            ],
         ];
     }
 }