File::isReference(): bug fix - closure return by reference not recogn…

…ized The `&` in a closure declared to return by reference was not recognized as a reference. Fixed now. Includes unit test.
squizlabs · May 31, 2020 · 1ae9566 · 1ae9566
1 parent 75ff420
commit 1ae9566
Show file tree

Hide file tree

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

diff --git a/tests/Core/File/IsReferenceTest.inc b/tests/Core/File/IsReferenceTest.inc
@@ -139,3 +139,6 @@ $closure = function() use (&$var){};
 
 /* testArrowFunctionReturnByReference */
 fn&($x) => $x;
+
+/* testClosureReturnByReference */
+$closure = function &($param) use ($value) {};
diff --git a/tests/Core/File/IsReferenceTest.php b/tests/Core/File/IsReferenceTest.php
@@ -228,6 +228,10 @@ public function dataIsReference()
                 '/* testArrowFunctionReturnByReference */',
                 true,
             ],
+            [
+                '/* testClosureReturnByReference */',
+                true,
+            ],
         ];
 
     }//end dataIsReference()
-Original file line number
+Diff line change
@@ Expand Up / @@ -228,6 +228,10 @@ public function dataIsReference() @@
                     '/* testArrowFunctionReturnByReference */',
                     true,
                 ],
+                [
+                    '/* testClosureReturnByReference */',
+                    true,
+                ],
             ];
         }//end dataIsReference()
@@ Expand Down @@