Support arrow functions returning by reference (ref #2523)

squizlabs · Nov 7, 2019 · 96e69bb · 96e69bb
1 parent 37dda44
commit 96e69bb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 2 deletions.
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -1935,7 +1935,9 @@ public function isReference($stackPtr)
             true
         );
 
-        if ($this->tokens[$tokenBefore]['code'] === T_FUNCTION) {
+        if ($this->tokens[$tokenBefore]['code'] === T_FUNCTION
+            || $this->tokens[$tokenBefore]['code'] === T_FN
+        ) {
             // Function returns a reference.
             return true;
         }

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc
@@ -265,6 +265,8 @@ $a = $a instanceof $b;
 $a = $a  instanceof  $b;
 $a = ($a)instanceof$b;
 
+fn&($x) => $x;
+
 // phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
 $a  =  3;
 

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed
@@ -259,6 +259,8 @@ $a = $a instanceof $b;
 $a = $a instanceof $b;
 $a = ($a) instanceof $b;
 
+fn&($x) => $x;
+
 // phpcs:set Squiz.WhiteSpace.OperatorSpacing ignoreSpacingBeforeAssignments false
 $a = 3;
 

diff --git a/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php
@@ -98,7 +98,7 @@ public function getErrorList($testFile='OperatorSpacingUnitTest.inc')
                 246 => 1,
                 265 => 2,
                 266 => 2,
-                269 => 2,
+                271 => 2,
             ];
             break;
         case 'OperatorSpacingUnitTest.js':

diff --git a/tests/Core/File/IsReferenceTest.inc b/tests/Core/File/IsReferenceTest.inc
@@ -136,3 +136,6 @@ functionCall( $something , &new Foobar() );
 
 /* testUseByReference */
 $closure = function() use (&$var){};
+
+/* testArrowFunctionReturnByReference */
+fn&($x) => $x;
diff --git a/tests/Core/File/IsReferenceTest.php b/tests/Core/File/IsReferenceTest.php
@@ -224,6 +224,10 @@ public function dataIsReference()
                 '/* testUseByReference */',
                 true,
             ],
+            [
+                '/* testArrowFunctionReturnByReference */',
+                true,
+            ],
         ];
 
     }//end dataIsReference()