Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/PhpDoc/StubSourceLocatorFactory.php

@@ -10,7 +10,6 @@
 use PHPStan\BetterReflection\SourceLocator\Type\MemoizingSourceLocator;
 use PHPStan\BetterReflection\SourceLocator\Type\PhpInternalSourceLocator;
 use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
-use PHPStan\Reflection\BetterReflection\SourceLocator\LazySourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedPsrAutoloaderLocatorFactory;
 use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
 use function dirname;
@@ -31,14 +30,10 @@ public function __construct(
 	public function create(): SourceLocator
 	{
 		$locators = [];
-		$locators[] = new LazySourceLocator(function () {
-			$locators = [];
-			foreach ($this->stubFilesProvider->getStubFiles() as $stubFile) {
-				$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);
-			}
-
-			return new AggregateSourceLocator($locators);
-		});
+		$astPhp8Locator = new Locator($this->php8Parser);
+		foreach ($this->stubFilesProvider->getStubFiles() as $stubFile) {
+			$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);
+		}
 
 		$locators[] = $this->optimizedPsrAutoloaderLocatorFactory->create(
 			Psr4Mapping::fromArrayMappings([
@@ -51,7 +46,6 @@ public function create(): SourceLocator
 			]),
 		);
 
-		$astPhp8Locator = new Locator($this->php8Parser);
 		$locators[] = new PhpInternalSourceLocator($astPhp8Locator, $this->phpStormStubsSourceStubber);
 
 		return new MemoizingSourceLocator(new AggregateSourceLocator($locators));