diff --git a/e2e/bug-15375/.gitignore b/e2e/bug-15375/.gitignore new file mode 100644 index 00000000000..de4a392c331 --- /dev/null +++ b/e2e/bug-15375/.gitignore @@ -0,0 +1,2 @@ +/vendor +/composer.lock diff --git a/e2e/bug-15375/bootstrap.php b/e2e/bug-15375/bootstrap.php new file mode 100644 index 00000000000..2cc9b2bdbb6 --- /dev/null +++ b/e2e/bug-15375/bootstrap.php @@ -0,0 +1,3 @@ +&1 || true) + echo "$OUTPUT" + assert_contains 'Instantiated class Bug15375\Later not found.' "$OUTPUT" + cp later/Later.php src/Later.php + OUTPUT=$(../../bin/phpstan analyse -vvv 2>&1 || true) + echo "$OUTPUT" + assert_not_contains 'StubFilesExtension ran before bootstrapFiles.' "$OUTPUT" + assert_contains 'No errors' "$OUTPUT" + ../../bin/phpstan analyse -vvv +} diff --git a/e2e/bug-15375/composer.json b/e2e/bug-15375/composer.json new file mode 100644 index 00000000000..70a77595383 --- /dev/null +++ b/e2e/bug-15375/composer.json @@ -0,0 +1,7 @@ +{ + "autoload": { + "psr-4": { + "Bug15375\\": "extension/" + } + } +} diff --git a/e2e/bug-15375/extension/FrameworkStubFilesExtension.php b/e2e/bug-15375/extension/FrameworkStubFilesExtension.php new file mode 100644 index 00000000000..c8c5858a1c9 --- /dev/null +++ b/e2e/bug-15375/extension/FrameworkStubFilesExtension.php @@ -0,0 +1,22 @@ + + */ +class Later extends Base +{ + + use HasName; + + public string $label = 'later'; + +} diff --git a/e2e/bug-15375/phpstan.neon b/e2e/bug-15375/phpstan.neon new file mode 100644 index 00000000000..44ee73d5b7c --- /dev/null +++ b/e2e/bug-15375/phpstan.neon @@ -0,0 +1,12 @@ +parameters: + level: 8 + paths: + - src + bootstrapFiles: + - bootstrap.php + +services: + - + class: Bug15375\FrameworkStubFilesExtension + tags: + - phpstan.stubFilesExtension diff --git a/e2e/bug-15375/src/Base.php b/e2e/bug-15375/src/Base.php new file mode 100644 index 00000000000..d53a863ff89 --- /dev/null +++ b/e2e/bug-15375/src/Base.php @@ -0,0 +1,14 @@ + */ + public array $items = []; + +} diff --git a/e2e/bug-15375/src/Caller.php b/e2e/bug-15375/src/Caller.php new file mode 100644 index 00000000000..2b885da66c2 --- /dev/null +++ b/e2e/bug-15375/src/Caller.php @@ -0,0 +1,13 @@ +name(); + } + +} diff --git a/e2e/bug-15375/src/Entity.php b/e2e/bug-15375/src/Entity.php new file mode 100644 index 00000000000..58323520695 --- /dev/null +++ b/e2e/bug-15375/src/Entity.php @@ -0,0 +1,8 @@ +reflectionProvider->getClass($key); $declarations = []; - foreach ([$classReflection->getName() => $classReflection] + $classReflection->getAncestors() as $name => $declaringClass) { + $reflection = $this->reflectionProvider->getClass($key)->getNativeReflection()->getBetterReflection(); + foreach ($this->getDeclaringClasses($reflection) as $lowercaseName => $declaringClass) { // a built-in class is read from a stub, which one depends on the source locator that // reflected it first; it changes only with PHP, its extensions or PHPStan itself - $fileName = $declaringClass->isBuiltin() ? null : $declaringClass->getFileName(); - $declarations[strtolower($name)] = $fileName === null + $fileName = $declaringClass->isInternal() ? null : $declaringClass->getFileName(); + $declarations[$lowercaseName] = $fileName === null ? 'built-in' - : sprintf('%s %s', $fileName, $this->getExportedNode($fileName, $name)); + : sprintf('%s %s', $fileName, $this->getExportedNode($fileName, $declaringClass->getName())); } ksort($declarations); @@ -68,6 +70,43 @@ public function getValue(string $key): string return hash('sha256', implode("\n", $declarations)); } + /** + * The class with its parents, interfaces and traits. ClassReflection::getAncestors() would also + * resolve their generic types from the class PHPDocs, reaching StubPhpDocProvider - which runs + * the StubFilesExtensions, while the result cache is restored before the bootstrapFiles they + * can rely on. + * + * @return array lowercase name => class + */ + private function getDeclaringClasses(ReflectionClass $reflection): array + { + $classes = []; + $queue = [$reflection]; + while ($queue !== []) { + $class = array_pop($queue); + $lowercaseName = strtolower($class->getName()); + if (array_key_exists($lowercaseName, $classes)) { + continue; + } + + $classes[$lowercaseName] = $class; + foreach ($class->getImmediateInterfaces() as $interface) { + $queue[] = $interface; + } + foreach ($class->getTraits() as $trait) { + $queue[] = $trait; + } + $parentClass = $class->getParentClass(); + if ($parentClass === null) { + continue; + } + + $queue[] = $parentClass; + } + + return $classes; + } + public function keyToResultCache(string $key): string { return $key; diff --git a/tests/PHPStan/Analyser/ResultCache/BootstrapDependentStubFilesExtension.php b/tests/PHPStan/Analyser/ResultCache/BootstrapDependentStubFilesExtension.php new file mode 100644 index 00000000000..0699b4d4b32 --- /dev/null +++ b/tests/PHPStan/Analyser/ResultCache/BootstrapDependentStubFilesExtension.php @@ -0,0 +1,20 @@ +assertNotSame($value, $extension->getValue(ClassResultCacheValueExtension::createKey(DirectoryResultCacheValueExtensionTest::class))); } + public static function getAdditionalConfigFiles(): array + { + // the values are compared when the result cache is restored, before the bootstrapFiles + // have run - getValue() must not reach the StubFilesExtensions + return [ + __DIR__ . '/classResultCacheValueExtension.neon', + ]; + } + } diff --git a/tests/PHPStan/Analyser/ResultCache/classResultCacheValueExtension.neon b/tests/PHPStan/Analyser/ResultCache/classResultCacheValueExtension.neon new file mode 100644 index 00000000000..b8ebf0b3d20 --- /dev/null +++ b/tests/PHPStan/Analyser/ResultCache/classResultCacheValueExtension.neon @@ -0,0 +1,5 @@ +services: + - + class: PHPStan\Analyser\ResultCache\BootstrapDependentStubFilesExtension + tags: + - phpstan.stubFilesExtension