Fix global constant discovery after class name tokens (#6756)

Co-authored-by: LubuSeb <187313664+LubuSeb@users.noreply.github.com>
Co-authored-by: Markus Staab <maggus.staab@googlemail.com>

Author: LubuSeb

.github/workflows/e2e-tests.yml

@@ -264,6 +264,9 @@ jobs:
               ../../bin/phpstan analyse src/usage.php
               ../../bin/phpstan clear-result-cache
               ../../bin/phpstan analyse
+          - script: |
+              cd e2e/bug-15482b
+              ../../bin/phpstan analyse
           - script: |
               cd e2e/bug-15102
               composer install

Makefile

@@ -40,6 +40,7 @@ lint:
 		--exclude tests/PHPStan/Rules/Operators/data/invalid-assign-var.php \
 		--exclude tests/PHPStan/Rules/Functions/data/arrow-function-nullsafe-by-ref.php \
 		--exclude tests/PHPStan/Levels/data/namedArguments.php \
+		--exclude tests/PHPStan/Reflection/BetterReflection/SourceLocator/data/symbol-finder/class-name-before-global-constant.php \
 		--exclude tests/PHPStan/Rules/Keywords/data/continue-break.php \
 		--exclude tests/PHPStan/Rules/Keywords/data/continue-break-property-hook.php \
 		--exclude tests/PHPStan/Rules/Keywords/data/goto-undefined-label.php \

e2e/bug-15482b/phpstan.neon

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

e2e/bug-15482b/src/a_usage.php

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

e2e/bug-15482b/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;
 						}
 					}
@@ -146,7 +147,10 @@ public function clean(string $contents, int $maxMatches): string
 				if (isset($this->typeConfig[$char])) {
 					$type = $this->typeConfig[$char];
 
-					if (substr($this->contents, $this->index, $type['length']) === $type['name']) {
+					if (
+						substr($this->contents, $this->index, $type['length']) === $type['name']
+						&& $this->match('~.\\b(?<![\\$:>])' . $type['name'] . '\\b~Ais', $match, $this->index - 1)
+					) {
 						if ($maxMatches === 1 && $this->match($type['pattern'], $match, $this->index - 1)) {
 							return $clean . $match[0];
 						}

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

@@ -13,6 +13,15 @@ final class SymbolFinderInFilesTest extends PHPStanTestCase
 	 */
 	public static function dataFindSymbols(): iterable
 	{
+		yield 'class name expressions do not hide later global constants' => [
+			__DIR__ . '/data/symbol-finder/class-name-before-global-constant.php',
+			[
+				[],
+				['symbolfinderclassname', 'classname', 'symbolfinderanonymousclass', 'symbolfindernamedargument', 'symbolfindernamedargumentcall', 'symbolfinderspacedclassconstant'],
+				['AFTER_CLASS_NAME', 'AFTER_CLASS_PREFIX', 'AFTER_ANONYMOUS_CLASS', 'AFTER_NAMED_CLASS_ARGUMENT', 'AFTER_SPACED_CLASS_CONSTANT'],
+			],
+		];
+
 		yield 'namespaced constants do not leak a class entry' => [
 			__DIR__ . '/data/symbol-finder/namespaced-constants.php',
 			[

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

@@ -0,0 +1,43 @@
+<?php declare(strict_types = 1);
+
+function symbolFinderClassName(): string
+{
+	return \stdClass::class;
+}
+
+const AFTER_CLASS_NAME = 'found';
+
+function className(): string
+{
+	return 'not a class declaration';
+}
+
+const AFTER_CLASS_PREFIX = 'still found';
+
+function symbolFinderAnonymousClass(): object
+{
+	return new class {
+		public const MEMBER = 'not global';
+	};
+}
+
+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;
 					}
 				}
@@ -448,8 +449,12 @@ inline void PhpFileCleaner::clean(zend_long maxMatches, std::string &out)
 			for (const TypeConfig &type : types) {
 				if (type.firstByte != c) continue;
 
-				if (index + type.length <= len && memcmp(contents + index, type.name, type.length) == 0) {
-					if (maxMatches == 1 && prevByteOpensKeyword(index)) {
+				if (index + type.length <= len
+					&& memcmp(contents + index, type.name, type.length) == 0
+					&& prevByteOpensKeyword(index)
+					&& (index + type.length == len || !isWordByte((unsigned char) contents[index + type.length]))
+				) {
+					if (maxMatches == 1) {
 						size_t end;
 						if (matchSpacesAndName(index + type.length, &end)) {
 							clean.append(contents + index - 1, end - (index - 1));

turbo-ext/tests/php-file-cleaner-corpus.php

@@ -88,6 +88,7 @@
 	'short echo tag' => "<?php\nclass A {}\n?>\n<?= 'class NotAClass' ?>\n<?php class B {}\n",
 	'anon class' => "<?php\n\$a = new class extends Foo implements Bar {};\nclass Real {}\n",
 	'property named class' => "<?php\nclass A { public \$class = 1; }\n\$x = Foo::class;\n\$y = \$obj->class;\n",
+	'class name before global constant' => "<?php\nfunction f() { return Foo::class; }\nconst AFTER_CLASS_NAME = 1;\nfunction className() {}\nconst AFTER_CLASS_PREFIX = 2;\n",
 	'function by reference' => "<?php\nfunction &refFn() {}\nfunction plain(): void {}\n",
 	'namespace braces' => "<?php\nnamespace A\\B { class C {} }\nnamespace D { const E = 1; }\n",
 	'no php tag' => "just text, no php at all\n",