From d004c239677fb7abe41aa16e8e1b45bfac63f773 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Sat, 20 May 2023 18:55:02 +0200
Subject: [PATCH] Stub validator - PHPStan classes are known without extra
 stubs

---
 src/PhpDoc/StubSourceLocatorFactory.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/PhpDoc/StubSourceLocatorFactory.php b/src/PhpDoc/StubSourceLocatorFactory.php
index 597b761166..754d4f7792 100644
--- a/src/PhpDoc/StubSourceLocatorFactory.php
+++ b/src/PhpDoc/StubSourceLocatorFactory.php
@@ -6,10 +6,13 @@
 use PHPStan\BetterReflection\SourceLocator\Ast\Locator;
 use PHPStan\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
 use PHPStan\BetterReflection\SourceLocator\Type\AggregateSourceLocator;
+use PHPStan\BetterReflection\SourceLocator\Type\Composer\Psr\Psr4Mapping;
 use PHPStan\BetterReflection\SourceLocator\Type\MemoizingSourceLocator;
 use PHPStan\BetterReflection\SourceLocator\Type\PhpInternalSourceLocator;
 use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
+use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedPsrAutoloaderLocatorFactory;
 use PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedSingleFileSourceLocatorRepository;
+use function dirname;
 
 class StubSourceLocatorFactory
 {
@@ -18,6 +21,7 @@ public function __construct(
 		private Parser $php8Parser,
 		private PhpStormStubsSourceStubber $phpStormStubsSourceStubber,
 		private OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository,
+		private OptimizedPsrAutoloaderLocatorFactory $optimizedPsrAutoloaderLocatorFactory,
 		private StubFilesProvider $stubFilesProvider,
 	)
 	{
@@ -31,6 +35,12 @@ public function create(): SourceLocator
 			$locators[] = $this->optimizedSingleFileSourceLocatorRepository->getOrCreate($stubFile);
 		}
 
+		$locators[] = $this->optimizedPsrAutoloaderLocatorFactory->create(
+			Psr4Mapping::fromArrayMappings([
+				'PHPStan\\' => [dirname(__DIR__) . '/'],
+			]),
+		);
+
 		$locators[] = new PhpInternalSourceLocator($astPhp8Locator, $this->phpStormStubsSourceStubber);
 
 		return new MemoizingSourceLocator(new AggregateSourceLocator($locators));