Remove Reflector from StubFilesExtensionLoader, replace with version checks

src/Stubs/Symfony/StubFilesExtensionLoader.php

@@ -4,8 +4,6 @@
 
 use Composer\InstalledVersions;
 use OutOfBoundsException;
-use PHPStan\BetterReflection\Reflector\Exception\IdentifierNotFound;
-use PHPStan\BetterReflection\Reflector\Reflector;
 use PHPStan\PhpDoc\StubFilesExtension;
 use function class_exists;
 use function dirname;
@@ -14,15 +12,6 @@
 class StubFilesExtensionLoader implements StubFilesExtension
 {
 
-	private Reflector $reflector;
-
-	public function __construct(
-		Reflector $reflector
-	)
-	{
-		$this->reflector = $reflector;
-	}
-
 	public function getFiles(): array
 	{
 		$stubsDir = dirname(dirname(dirname(__DIR__))) . '/stubs';
@@ -82,12 +71,9 @@ public function getFiles(): array
 		if ($this->isInstalledVersionBelow('symfony/http-foundation', '7.4.0.0')) {
 			$files[] = $stubsDir . '/Symfony/Component/HttpFoundation/ParameterBag.stub';
 
-			try {
-				$this->reflector->reflectClass('Symfony\Component\HttpFoundation\InputBag');
+			if (!$this->isInstalledVersionBelow('symfony/http-foundation', '5.1.0.0')) {
 				$files[] = $stubsDir . '/Symfony/Component/HttpFoundation/InputBag.stub';
 				$files[] = $stubsDir . '/Symfony/Component/HttpFoundation/Request.stub';
-			} catch (IdentifierNotFound $e) {
-				// Don't load the InputBag and the associated Request stubs for older Symfony versions that did not have InputBag yet to avoid breaking the Request.
 			}
 		}
 

tests/Stubs/Symfony/StubFilesExtensionLoaderTest.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Stubs\Symfony;
+
+use PHPStan\Testing\PHPStanTestCase;
+
+final class StubFilesExtensionLoaderTest extends PHPStanTestCase
+{
+
+	public function testGetFilesDoesNotUseSourceLocator(): void
+	{
+		$loader = self::getContainer()->getByType(StubFilesExtensionLoader::class);
+		foreach ($loader->getFiles() as $file) {
+			self::assertFileExists($file);
+		}
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [
+			__DIR__ . '/../../../extension.neon',
+			__DIR__ . '/stub-loader-test.neon',
+		];
+	}
+
+}

tests/Stubs/Symfony/ThrowingSourceLocator.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Stubs\Symfony;
+
+use PHPStan\BetterReflection\Identifier\Identifier;
+use PHPStan\BetterReflection\Identifier\IdentifierType;
+use PHPStan\BetterReflection\Reflection\Reflection;
+use PHPStan\BetterReflection\Reflector\Reflector;
+use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
+use PHPUnit\Framework\Assert;
+
+final class ThrowingSourceLocator implements SourceLocator
+{
+
+	public function locateIdentifier(Reflector $reflector, Identifier $identifier): ?Reflection
+	{
+		Assert::fail('SourceLocator::locateIdentifier must not be called during getFiles()');
+	}
+
+	public function locateIdentifiersByType(Reflector $reflector, IdentifierType $identifierType): array
+	{
+		Assert::fail('SourceLocator::locateIdentifiersByType must not be called during getFiles()');
+	}
+
+}

tests/Stubs/Symfony/stub-loader-test.neon

@@ -0,0 +1,5 @@
+services:
+	betterReflectionSourceLocator:
+		class: PHPStan\BetterReflection\SourceLocator\Type\SourceLocator
+		factory: PHPStan\Stubs\Symfony\ThrowingSourceLocator
+		autowired: false