extract and re-use AnalysedFilesResolver

Author: staabm

src/Analyser/AnalysedFilesResolver.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Analyser;
+
+use function array_fill_keys;
+use function array_map;
+use function strtolower;
+use const PHP_OS_FAMILY;
+
+final class AnalysedFilesResolver
+{
+
+	/** @var bool[] filePath(string) => bool(true) */
+	private array $analysedFiles = [];
+
+	private bool $caseInsensitiveFilesystem;
+
+	public function __construct()
+	{
+		$this->caseInsensitiveFilesystem = PHP_OS_FAMILY === 'Darwin';
+	}
+
+	/**
+	 * @param string[] $files
+	 */
+	public function setAnalysedFiles(array $files): void
+	{
+		if ($this->caseInsensitiveFilesystem) {
+			$files = array_map(static fn (string $file): string => strtolower($file), $files);
+		}
+		$this->analysedFiles = array_fill_keys($files, true);
+	}
+
+	public function isInAnalyzedFiles(string $file): bool
+	{
+		if ($this->caseInsensitiveFilesystem) {
+			$file = strtolower($file);
+		}
+
+		return isset($this->analysedFiles[$file]);
+	}
+
+}

src/Analyser/NodeScopeResolver.php

@@ -230,8 +230,7 @@ final class NodeScopeResolver
 	private const LOOP_SCOPE_ITERATIONS = 3;
 	private const GENERALIZE_AFTER_ITERATION = 1;
 
-	/** @var bool[] filePath(string) => bool(true) */
-	private array $analysedFiles = [];
+	private AnalysedFilesResolver $analysedFilesResolver;
 
 	/** @var array<string, true> */
 	private array $earlyTerminatingMethodNames;
@@ -285,6 +284,7 @@ public function __construct(
 			}
 		}
 		$this->earlyTerminatingMethodNames = $earlyTerminatingMethodNames;
+		$this->analysedFilesResolver = new AnalysedFilesResolver();
 	}
 
 	/**
@@ -293,7 +293,7 @@ public function __construct(
 	 */
 	public function setAnalysedFiles(array $files): void
 	{
-		$this->analysedFiles = array_fill_keys($files, true);
+		$this->analysedFilesResolver->setAnalysedFiles($files);
 	}
 
 	/**
@@ -6283,7 +6283,7 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS
 				continue; // trait from eval or from PHP itself
 			}
 			$fileName = $this->fileHelper->normalizePath($traitFileName);
-			if (!isset($this->analysedFiles[$fileName])) {
+			if (!$this->analysedFilesResolver->isInAnalyzedFiles($fileName)) {
 				continue;
 			}
 			$adaptations = [];
@@ -6402,7 +6402,7 @@ private function processCalledMethod(MethodReflection $methodReflection): ?Mutat
 		$this->calledMethodStack[$stackName] = true;
 
 		$fileName = $this->fileHelper->normalizePath($declaringClass->getFileName());
-		if (!isset($this->analysedFiles[$fileName])) {
+		if (!$this->analysedFilesResolver->isInAnalyzedFiles($fileName)) {
 			return null;
 		}
 		$parserNodes = $this->parser->parseFile($fileName);

src/Parser/PathRoutingParser.php

@@ -2,27 +2,21 @@
 
 namespace PHPStan\Parser;
 
+use PHPStan\Analyser\AnalysedFilesResolver;
 use PHPStan\File\FileHelper;
-use function array_fill_keys;
-use function array_map;
 use function array_slice;
 use function count;
 use function explode;
 use function implode;
 use function is_link;
 use function realpath;
 use function str_contains;
-use function strtolower;
 use const DIRECTORY_SEPARATOR;
-use const PHP_OS_FAMILY;
 
 final class PathRoutingParser implements Parser
 {
 
-	/** @var bool[] filePath(string) => bool(true) */
-	private array $analysedFiles = [];
-
-	private bool $caseInsensitiveFilesystem;
+	private AnalysedFilesResolver $analysedFilesResolver;
 
 	public function __construct(
 		private FileHelper $fileHelper,
@@ -31,27 +25,15 @@ public function __construct(
 		private Parser $php8Parser,
 	)
 	{
-		$this->caseInsensitiveFilesystem = PHP_OS_FAMILY === 'Darwin';
+		$this->analysedFilesResolver = new AnalysedFilesResolver();
 	}
 
 	/**
 	 * @param string[] $files
 	 */
 	public function setAnalysedFiles(array $files): void
 	{
-		if ($this->caseInsensitiveFilesystem) {
-			$files = array_map(static fn (string $file): string => strtolower($file), $files);
-		}
-		$this->analysedFiles = array_fill_keys($files, true);
-	}
-
-	private function isInAnalyzedFiles(string $file): bool
-	{
-		if ($this->caseInsensitiveFilesystem) {
-			$file = strtolower($file);
-		}
-
-		return isset($this->analysedFiles[$file]);
+		$this->analysedFilesResolver->setAnalysedFiles($files);
 	}
 
 	public function parseFile(string $file): array
@@ -65,7 +47,7 @@ public function parseFile(string $file): array
 		}
 
 		$file = $this->fileHelper->normalizePath($file);
-		if (!$this->isInAnalyzedFiles($file)) {
+		if (!$this->analysedFilesResolver->isInAnalyzedFiles($file)) {
 			// check symlinked file that still might be in analysedFiles
 			$pathParts = explode(DIRECTORY_SEPARATOR, $file);
 			for ($i = count($pathParts); $i > 1; $i--) {
@@ -77,7 +59,7 @@ public function parseFile(string $file): array
 				$realFilePath = realpath($file);
 				if ($realFilePath !== false) {
 					$normalizedRealFilePath = $this->fileHelper->normalizePath($realFilePath);
-					if ($this->isInAnalyzedFiles($normalizedRealFilePath)) {
+					if ($this->analysedFilesResolver->isInAnalyzedFiles($normalizedRealFilePath)) {
 						return $this->currentPhpVersionRichParser->parseFile($file);
 					}
 				}