bug: Prevent breaking functions returning by reference (#6487)

Prevent breaking functions returning by reference
PHP-CS-Fixer · Jul 15, 2022 · f403e7f · f403e7f
1 parent d29ea1d
commit f403e7f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/Fixer/ReturnNotation/ReturnAssignmentFixer.php b/src/Fixer/ReturnNotation/ReturnAssignmentFixer.php
@@ -73,6 +73,11 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
+            $next = $tokens->getNextMeaningfulToken($index);
+            if ($tokens[$next]->isGivenKind(CT::T_RETURN_REF)) {
+                continue;
+            }
+
             $functionOpenIndex = $tokens->getNextTokenOfKind($index, ['{', ';']);
             if ($tokens[$functionOpenIndex]->equals(';')) { // abstract function
                 $index = $functionOpenIndex - 1;

diff --git a/tests/Fixer/ReturnNotation/ReturnAssignmentFixerTest.php b/tests/Fixer/ReturnNotation/ReturnAssignmentFixerTest.php
@@ -785,6 +785,22 @@ public function __destruct()
 var_dump($a); // $a = 2 here _╯°□°╯︵┻━┻
 ',
             ],
+            'variable returned by reference in function' => [
+                '<?php
+                function &foo() {
+                    $var = 1;
+                    return $var;
+                }',
+            ],
+            'variable returned by reference in method' => [
+                '<?php
+                class Foo {
+                    public function &bar() {
+                        $var = 1;
+                        return $var;
+                    }
+                }',
+            ],
         ];
     }