Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/PhpDoc/StubSourceLocatorFactory.php

@@ -10,6 +10,7 @@
 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;
@@ -30,10 +31,14 @@ public function __construct(
 	public function create(): SourceLocator
 	{
 		$locators = [];
-		$astPhp8Locator = new Locator($this->php8Parser);
-		foreach ($this->stubFilesProvider->getStubFiles() as $stubFile) {
-			$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);
-		}
+		$locators[] = new LazySourceLocator(function () {
+			$locators = [];
+			foreach ($this->stubFilesProvider->getStubFiles() as $stubFile) {
+				$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);
+			}
+
+			return new AggregateSourceLocator($locators);
+		});
 
 		$locators[] = $this->optimizedPsrAutoloaderLocatorFactory->create(
 			Psr4Mapping::fromArrayMappings([
@@ -46,6 +51,7 @@ public function create(): SourceLocator
 			]),
 		);
 
+		$astPhp8Locator = new Locator($this->php8Parser);
 		$locators[] = new PhpInternalSourceLocator($astPhp8Locator, $this->phpStormStubsSourceStubber);
 
 		return new MemoizingSourceLocator(new AggregateSourceLocator($locators));

src/Reflection/BetterReflection/SourceLocator/LazySourceLocator.php

@@ -0,0 +1,46 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Reflection\BetterReflection\SourceLocator;
+
+use Override;
+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;
+
+final class LazySourceLocator implements SourceLocator
+{
+
+	/** @var callable(): SourceLocator */
+	private $sourceLocatorFactory;
+
+	private ?SourceLocator $actualSourceLocator = null;
+
+	/**
+	 * @param callable(): SourceLocator $sourceLocatorFactory
+	 */
+	public function __construct(callable $sourceLocatorFactory)
+	{
+		$this->sourceLocatorFactory = $sourceLocatorFactory;
+	}
+
+	#[Override]
+	public function locateIdentifier(Reflector $reflector, Identifier $identifier): ?Reflection
+	{
+		return $this->getSourceLocator()->locateIdentifier($reflector, $identifier);
+	}
+
+	#[Override]
+	public function locateIdentifiersByType(Reflector $reflector, IdentifierType $identifierType): array
+	{
+		return $this->getSourceLocator()->locateIdentifiersByType($reflector, $identifierType);
+	}
+
+	private function getSourceLocator(): SourceLocator
+	{
+		$factory = $this->sourceLocatorFactory;
+		return $this->actualSourceLocator ??= $factory();
+	}
+
+}