Cover remaining global constant scan cases

Author: LubuSeb

.github/workflows/e2e-tests.yml

@@ -263,6 +263,8 @@ jobs:
               # A later full run must not reuse them, even with the result cache cleared.
               ../../bin/phpstan analyse src/usage.php
               ../../bin/phpstan clear-result-cache
+          - script: |
+              cd e2e/bug-15482
               ../../bin/phpstan analyse
           - script: |
               cd e2e/bug-15102

e2e/bug-15482/phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+	level: max
+	paths:
+		- src

e2e/bug-15482/src/a_usage.php

@@ -0,0 +1,3 @@
+<?php
+
+echo BAR;

e2e/bug-15482/src/z_functions.php

@@ -0,0 +1,8 @@
+<?php
+
+function foo(): string
+{
+	return stdClass::class;
+}
+
+const BAR = 'bar';

src/Reflection/BetterReflection/SourceLocator/PhpFileCleaner.php

@@ -97,7 +97,8 @@ public function clean(string $contents, int $maxMatches): string
 					if ($inType) {
 						$typeLevel--;
 
-						if ($typeLevel === 0) {
+						if ($typeLevel <= 0) {
+							$typeLevel = 0;
 							$inType = false;
 						}
 					}

tests/PHPStan/Reflection/BetterReflection/SourceLocator/SymbolFinderInFilesTest.php

@@ -17,8 +17,8 @@ public static function dataFindSymbols(): iterable
 			__DIR__ . '/data/symbol-finder/class-name-before-global-constant.php',
 			[
 				[],
-				['symbolfinderclassname', 'classname', 'symbolfinderanonymousclass'],
-				['AFTER_CLASS_NAME', 'AFTER_CLASS_PREFIX', 'AFTER_ANONYMOUS_CLASS'],
+				['symbolfinderclassname', 'classname', 'symbolfinderanonymousclass', 'symbolfindernamedargument', 'symbolfindernamedargumentcall', 'symbolfinderspacedclassconstant'],
+				['AFTER_CLASS_NAME', 'AFTER_CLASS_PREFIX', 'AFTER_ANONYMOUS_CLASS', 'AFTER_NAMED_CLASS_ARGUMENT', 'AFTER_SPACED_CLASS_CONSTANT'],
 			],
 		];
 

tests/PHPStan/Reflection/BetterReflection/SourceLocator/data/symbol-finder/class-name-before-global-constant.php

@@ -22,3 +22,22 @@ function symbolFinderAnonymousClass(): object
 }
 
 const AFTER_ANONYMOUS_CLASS = 'also found';
+
+function symbolFinderNamedArgument(string $class): string
+{
+	return $class;
+}
+
+function symbolFinderNamedArgumentCall(): string
+{
+	return symbolFinderNamedArgument(class: 'named argument');
+}
+
+const AFTER_NAMED_CLASS_ARGUMENT = 'found after named argument';
+
+function symbolFinderSpacedClassConstant(): string
+{
+	return \stdClass:: class;
+}
+
+const AFTER_SPACED_CLASS_CONSTANT = 'found after spaced class constant';

turbo-ext/src/SymbolScan.h

@@ -378,7 +378,8 @@ inline void PhpFileCleaner::clean(zend_long maxMatches, std::string &out)
 				if (inType) {
 					typeLevel--;
 
-					if (typeLevel == 0) {
+					if (typeLevel <= 0) {
+						typeLevel = 0;
 						inType = false;
 					}
 				}