From 9277609fb1300a282d84f3707e05f165e7a2e6bc Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 11 Dec 2025 11:10:28 +0100 Subject: [PATCH 1/4] Remove path normalizing from NodeDependencies --- src/Dependency/NodeDependencies.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Dependency/NodeDependencies.php b/src/Dependency/NodeDependencies.php index e8aae65b0a..20f1838572 100644 --- a/src/Dependency/NodeDependencies.php +++ b/src/Dependency/NodeDependencies.php @@ -42,7 +42,6 @@ public function getFileDependencies(string $currentFile, array $analysedFiles): if ($dependencyFile === null) { continue; } - $dependencyFile = $this->fileHelper->normalizePath($dependencyFile); if ($currentFile === $dependencyFile) { continue; From bde96c83c1a843e4c4b42f37c66f61d36d713ee0 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 11 Dec 2025 11:15:19 +0100 Subject: [PATCH 2/4] cs --- src/Dependency/NodeDependencies.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Dependency/NodeDependencies.php b/src/Dependency/NodeDependencies.php index 20f1838572..bbd137fef8 100644 --- a/src/Dependency/NodeDependencies.php +++ b/src/Dependency/NodeDependencies.php @@ -2,7 +2,6 @@ namespace PHPStan\Dependency; -use PHPStan\File\FileHelper; use PHPStan\Reflection\ClassReflection; use PHPStan\Reflection\FunctionReflection; use function array_values; @@ -14,7 +13,6 @@ final class NodeDependencies * @param array $reflections */ public function __construct( - private FileHelper $fileHelper, private array $reflections, private ?RootExportedNode $exportedNode, ) From ab71fbf4d234879c12bcf42c77422e16219e1e47 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 11 Dec 2025 11:19:18 +0100 Subject: [PATCH 3/4] Update DependencyResolver.php --- src/Dependency/DependencyResolver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php index 9ca07af7a9..faddb8edf3 100644 --- a/src/Dependency/DependencyResolver.php +++ b/src/Dependency/DependencyResolver.php @@ -492,7 +492,7 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies } } - return new NodeDependencies($this->fileHelper, $dependenciesReflections, $this->exportedNodeResolver->resolve($scope->getFile(), $node)); + return new NodeDependencies($dependenciesReflections, $this->exportedNodeResolver->resolve($scope->getFile(), $node)); } public function resolveUsedTraitDependencies(InClassNode $inClassNode): NodeDependencies @@ -502,7 +502,7 @@ public function resolveUsedTraitDependencies(InClassNode $inClassNode): NodeDepe $dependenciesReflections[] = $trait; } - return new NodeDependencies($this->fileHelper, $dependenciesReflections, null); + return new NodeDependencies($dependenciesReflections, null); } private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode): bool From 2e2a6564f8b60df3ed43250926a26dac3ff4fa16 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Thu, 11 Dec 2025 11:23:55 +0100 Subject: [PATCH 4/4] fix --- src/Dependency/DependencyResolver.php | 2 -- tests/PHPStan/Analyser/AnalyserTest.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php index faddb8edf3..9c91266ed4 100644 --- a/src/Dependency/DependencyResolver.php +++ b/src/Dependency/DependencyResolver.php @@ -12,7 +12,6 @@ use PHPStan\Broker\ClassNotFoundException; use PHPStan\Broker\FunctionNotFoundException; use PHPStan\DependencyInjection\AutowiredService; -use PHPStan\File\FileHelper; use PHPStan\Node\ClassPropertyNode; use PHPStan\Node\FunctionCallableNode; use PHPStan\Node\InClassMethodNode; @@ -38,7 +37,6 @@ final class DependencyResolver { public function __construct( - private FileHelper $fileHelper, private ReflectionProvider $reflectionProvider, private ExportedNodeResolver $exportedNodeResolver, private FileTypeMapper $fileTypeMapper, diff --git a/tests/PHPStan/Analyser/AnalyserTest.php b/tests/PHPStan/Analyser/AnalyserTest.php index 08df78b261..a7c68a3ffe 100644 --- a/tests/PHPStan/Analyser/AnalyserTest.php +++ b/tests/PHPStan/Analyser/AnalyserTest.php @@ -842,7 +842,7 @@ private function createAnalyser(): Analyser $container, new IgnoreLexer(), ), - new DependencyResolver($fileHelper, $reflectionProvider, new ExportedNodeResolver($reflectionProvider, $fileTypeMapper, new ExprPrinter(new Printer())), $fileTypeMapper), + new DependencyResolver($reflectionProvider, new ExportedNodeResolver($reflectionProvider, $fileTypeMapper, new ExprPrinter(new Printer())), $fileTypeMapper), new IgnoreErrorExtensionProvider(new NetteContainer(new Container([]))), $container->getByType(RuleErrorTransformer::class), new LocalIgnoresProcessor(),