OptimizedDirectorySourceLocator based only on PhpParser

build/baseline-7.4.neon

@@ -65,20 +65,6 @@ parameters:
 			count: 1
 			path: ../src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
 
-		-
-			message: "#^Class PHPStan\\\\Reflection\\\\BetterReflection\\\\SourceLocator\\\\CachingVisitor has an uninitialized property \\$classNodes\\. Give it default value or assign it in the constructor\\.$#"
-			count: 1
-			path: ../src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
-
-		-
-			message: "#^Class PHPStan\\\\Reflection\\\\BetterReflection\\\\SourceLocator\\\\CachingVisitor has an uninitialized property \\$functionNodes\\. Give it default value or assign it in the constructor\\.$#"
-			count: 1
-			path: ../src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
-
-		-
-			message: "#^Class PHPStan\\\\Reflection\\\\BetterReflection\\\\SourceLocator\\\\CachingVisitor has an uninitialized property \\$constantNodes\\. Give it default value or assign it in the constructor\\.$#"
-			count: 1
-			path: ../src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
 		-
 			message: "#^Class PHPStan\\\\Reflection\\\\ReflectionProvider\\\\SetterReflectionProviderProvider has an uninitialized property \\$reflectionProvider\\. Give it default value or assign it in the constructor\\.$#"
 			count: 1

conf/config.neon

@@ -822,6 +822,7 @@ services:
 		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorFactory
 		arguments:
 			fileFinder: @fileFinderScan
+			phpParser: @currentPhpVersionPhpParser
 
 	-
 		class: PHPStan\Reflection\BetterReflection\SourceLocator\OptimizedDirectorySourceLocatorRepository

src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php

@@ -20,13 +20,13 @@ class CachingVisitor extends NodeVisitorAbstract
 	private string $contents;
 
 	/** @var array<string, array<FetchedNode<Node\Stmt\ClassLike>>> */
-	private array $classNodes;
+	private array $classNodes = [];
 
 	/** @var array<string, array<FetchedNode<Node\Stmt\Function_>>> */
-	private array $functionNodes;
+	private array $functionNodes = [];
 
 	/** @var array<string, array<FetchedNode<Node\Stmt\Const_|Node\Expr\FuncCall>>> */
-	private array $constantNodes;
+	private array $constantNodes = [];
 
 	private ?Node\Stmt\Namespace_ $currentNamespaceNode = null;
 
@@ -146,13 +146,17 @@ public function getConstantNodes(): array
 		return $this->constantNodes;
 	}
 
-	public function reset(string $fileName, string $contents): void
+	public function prepare(string $fileName, string $contents): void
+	{
+		$this->fileName = $fileName;
+		$this->contents = $contents;
+	}
+
+	public function reset(): void
 	{
 		$this->classNodes = [];
 		$this->functionNodes = [];
 		$this->constantNodes = [];
-		$this->fileName = $fileName;
-		$this->contents = $contents;
 	}
 
 }

src/Reflection/BetterReflection/SourceLocator/FileNodesFetcher.php

@@ -11,18 +11,19 @@
 class FileNodesFetcher
 {
 
+	private NodeTraverser $nodeTraverser;
+
 	public function __construct(
 		private CachingVisitor $cachingVisitor,
 		private Parser $parser,
 	)
 	{
+		$this->nodeTraverser = new NodeTraverser();
+		$this->nodeTraverser->addVisitor($this->cachingVisitor);
 	}
 
 	public function fetchNodes(string $fileName): FetchedNodesResult
 	{
-		$nodeTraverser = new NodeTraverser();
-		$nodeTraverser->addVisitor($this->cachingVisitor);
-
 		$contents = FileReader::read($fileName);
 
 		try {
@@ -31,16 +32,17 @@ public function fetchNodes(string $fileName): FetchedNodesResult
 		} catch (ParserErrorsException) {
 			return new FetchedNodesResult([], [], []);
 		}
-		$this->cachingVisitor->reset($fileName, $contents);
-		$nodeTraverser->traverse($ast);
+
+		$this->cachingVisitor->prepare($fileName, $contents);
+		$this->nodeTraverser->traverse($ast);
 
 		$result = new FetchedNodesResult(
 			$this->cachingVisitor->getClassNodes(),
 			$this->cachingVisitor->getFunctionNodes(),
 			$this->cachingVisitor->getConstantNodes(),
 		);
 
-		$this->cachingVisitor->reset($fileName, $contents);
+		$this->cachingVisitor->reset();
 
 		return $result;
 	}