Symbol discovery - fixed looking for functions returning references

phpstan · Feb 19, 2021 · ec26a00 · ec26a00
1 parent 0f64ca7
commit ec26a00
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php b/src/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocator.php
@@ -226,7 +226,7 @@ private function findSymbols(string $file): array
 
 		preg_match_all('{
             (?:
-                 \b(?<![\$:>])(?P<type>class|interface|trait|function) \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
+                 \b(?<![\$:>])(?P<type>class|interface|trait|function) \s++ (?P<byref>&\s*)? (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
                | \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;]
             )
         }ix', $contents, $matches);

diff --git a/...PHPStan/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorTest.php b/...PHPStan/Reflection/BetterReflection/SourceLocator/OptimizedDirectorySourceLocatorTest.php
@@ -81,6 +81,16 @@ public function dataFunctionExists(): array
 				'doBaz',
 				'b.php',
 			],
+			[
+				'get_smarty',
+				'get_smarty',
+				'b.php',
+			],
+			[
+				'get_smarty2',
+				'get_smarty2',
+				'b.php',
+			],
 		];
 	}
 

diff --git a/tests/PHPStan/Reflection/BetterReflection/SourceLocator/data/directory/b.php b/tests/PHPStan/Reflection/BetterReflection/SourceLocator/data/directory/b.php
@@ -19,3 +19,17 @@ function doBaz()
 {
 
 }
+
+function &get_smarty()
+{
+	global $smarty;
+
+	return $smarty;
+}
+
+function & get_smarty2()
+{
+	global $smarty;
+
+	return $smarty;
+}