Another attempt at fixing anonymous class names

Author: ondrejmirtes

src/Reflection/BetterReflection/BetterReflectionProvider.php

@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\AnonymousClassNameHelper;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
+use PHPStan\File\FileHelper;
 use PHPStan\File\RelativePathHelper;
 use PHPStan\Parser\Parser;
 use PHPStan\PhpDoc\StubPhpDocProvider;
@@ -71,6 +72,9 @@ class BetterReflectionProvider implements ReflectionProvider
 	/** @var Parser */
 	private $parser;
 
+	/** @var \PHPStan\File\FileHelper */
+	private $fileHelper;
+
 	/** @var \PHPStan\Reflection\FunctionReflection[] */
 	private $functionReflections = [];
 
@@ -91,6 +95,7 @@ public function __construct(
 		AnonymousClassNameHelper $anonymousClassNameHelper,
 		Standard $printer,
 		Parser $parser,
+		FileHelper $fileHelper,
 		FunctionReflector $functionReflector,
 		ConstantReflector $constantReflector
 	)
@@ -105,6 +110,7 @@ public function __construct(
 		$this->anonymousClassNameHelper = $anonymousClassNameHelper;
 		$this->printer = $printer;
 		$this->parser = $parser;
+		$this->fileHelper = $fileHelper;
 		$this->functionReflector = $functionReflector;
 		$this->constantReflector = $constantReflector;
 	}
@@ -185,7 +191,7 @@ public function getAnonymousClassReflection(\PhpParser\Node\Stmt\Class_ $classNo
 			}
 		}
 
-		$filename = $this->relativePathHelper->getRelativePath($scopeFile);
+		$filename = $this->fileHelper->normalizePath($this->relativePathHelper->getRelativePath($scopeFile));
 		$className = $this->anonymousClassNameHelper->getAnonymousClassName(
 			$classNode,
 			$scopeFile

src/Reflection/Runtime/RuntimeReflectionProvider.php

@@ -6,6 +6,7 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Broker\AnonymousClassNameHelper;
 use PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider;
+use PHPStan\File\FileHelper;
 use PHPStan\File\RelativePathHelper;
 use PHPStan\Parser\Parser;
 use PHPStan\PhpDoc\StubPhpDocProvider;
@@ -49,6 +50,9 @@ class RuntimeReflectionProvider implements ReflectionProvider
 	/** @var Parser */
 	private $parser;
 
+	/** @var \PHPStan\File\FileHelper */
+	private $fileHelper;
+
 	/** @var RelativePathHelper */
 	private $relativePathHelper;
 
@@ -75,6 +79,7 @@ public function __construct(
 		\PhpParser\PrettyPrinter\Standard $printer,
 		AnonymousClassNameHelper $anonymousClassNameHelper,
 		Parser $parser,
+		FileHelper $fileHelper,
 		RelativePathHelper $relativePathHelper,
 		StubPhpDocProvider $stubPhpDocProvider
 	)
@@ -86,6 +91,7 @@ public function __construct(
 		$this->printer = $printer;
 		$this->anonymousClassNameHelper = $anonymousClassNameHelper;
 		$this->parser = $parser;
+		$this->fileHelper = $fileHelper;
 		$this->relativePathHelper = $relativePathHelper;
 		$this->stubPhpDocProvider = $stubPhpDocProvider;
 	}
@@ -165,7 +171,7 @@ public function getAnonymousClassReflection(
 			}
 		}
 
-		$filename = $this->relativePathHelper->getRelativePath($scopeFile);
+		$filename = $this->fileHelper->normalizePath($this->relativePathHelper->getRelativePath($scopeFile), '/');
 
 		$className = $this->anonymousClassNameHelper->getAnonymousClassName(
 			$classNode,

src/Testing/TestCase.php

@@ -143,7 +143,8 @@ public function createReflectionProvider(): ReflectionProvider
 		$cache = new Cache(new MemoryCacheStorage());
 		$currentWorkingDirectory = $this->getCurrentWorkingDirectory();
 		$relativePathHelper = new FuzzyRelativePathHelper($currentWorkingDirectory, DIRECTORY_SEPARATOR, []);
-		$fileTypeMapper = new FileTypeMapper($parser, $phpDocStringResolver, $phpDocNodeResolver, $cache, new AnonymousClassNameHelper(new FileHelper($currentWorkingDirectory), $relativePathHelper));
+		$fileHelper = new FileHelper($currentWorkingDirectory);
+		$fileTypeMapper = new FileTypeMapper($parser, $phpDocStringResolver, $phpDocNodeResolver, $cache, new AnonymousClassNameHelper($fileHelper, $relativePathHelper));
 		$functionCallStatementFinder = new FunctionCallStatementFinder();
 		$functionReflectionFactory = $this->getFunctionReflectionFactory(
 			$functionCallStatementFinder,
@@ -161,7 +162,8 @@ public function createReflectionProvider(): ReflectionProvider
 				$functionReflectionFactory,
 				$relativePathHelper,
 				$anonymousClassNameHelper,
-				$parser
+				$parser,
+				$fileHelper
 			) implements BetterReflectionProviderFactory {
 
 				/** @var \PHPStan\DependencyInjection\Reflection\ClassReflectionExtensionRegistryProvider */
@@ -185,14 +187,18 @@ public function createReflectionProvider(): ReflectionProvider
 				/** @var Parser */
 				private $parser;
 
+				/** @var \PHPStan\File\FileHelper */
+				private $fileHelper;
+
 				public function __construct(
 					ClassReflectionExtensionRegistryProvider $classReflectionExtensionRegistryProvider,
 					Container $container,
 					FileTypeMapper $fileTypeMapper,
 					FunctionReflectionFactory $functionReflectionFactory,
 					RelativePathHelper $relativePathHelper,
 					AnonymousClassNameHelper $anonymousClassNameHelper,
-					Parser $parser
+					Parser $parser,
+					FileHelper $fileHelper
 				)
 				{
 					$this->classReflectionExtensionRegistryProvider = $classReflectionExtensionRegistryProvider;
@@ -202,6 +208,7 @@ public function __construct(
 					$this->relativePathHelper = $relativePathHelper;
 					$this->anonymousClassNameHelper = $anonymousClassNameHelper;
 					$this->parser = $parser;
+					$this->fileHelper = $fileHelper;
 				}
 
 				public function create(
@@ -221,6 +228,7 @@ public function create(
 						$this->anonymousClassNameHelper,
 						$this->container->getByType(Standard::class),
 						$this->parser,
+						$this->fileHelper,
 						$functionReflector,
 						$constantReflector
 					);
@@ -325,7 +333,8 @@ public function create(
 		$annotationsPropertiesClassReflectionExtension = new AnnotationsPropertiesClassReflectionExtension($fileTypeMapper);
 		$signatureMapProvider = self::getContainer()->getByType(SignatureMapProvider::class);
 		$currentWorkingDirectory = $this->getCurrentWorkingDirectory();
-		$anonymousClassNameHelper = new AnonymousClassNameHelper(new FileHelper($currentWorkingDirectory), $relativePathHelper);
+		$fileHelper = new FileHelper($currentWorkingDirectory);
+		$anonymousClassNameHelper = new AnonymousClassNameHelper($fileHelper, $relativePathHelper);
 		$classReflectionExtensionRegistryProvider = $this->getClassReflectionExtensionRegistryProvider();
 		$functionReflectionFactory = $this->getFunctionReflectionFactory(
 			$functionCallStatementFinder,
@@ -339,6 +348,7 @@ public function create(
 			self::getContainer()->getByType(Standard::class),
 			$anonymousClassNameHelper,
 			self::getContainer()->getByType(Parser::class),
+			$fileHelper,
 			$relativePathHelper,
 			self::getContainer()->getByType(StubPhpDocProvider::class)
 		);

tests/PHPStan/Broker/BrokerTest.php

@@ -32,7 +32,8 @@ protected function setUp(): void
 
 		$workingDirectory = __DIR__;
 		$relativePathHelper = new FuzzyRelativePathHelper($workingDirectory, DIRECTORY_SEPARATOR, []);
-		$anonymousClassNameHelper = new AnonymousClassNameHelper(new FileHelper($workingDirectory), $relativePathHelper);
+		$fileHelper = new FileHelper($workingDirectory);
+		$anonymousClassNameHelper = new AnonymousClassNameHelper($fileHelper, $relativePathHelper);
 
 		$classReflectionExtensionRegistryProvider = new DirectClassReflectionExtensionRegistryProvider([], []);
 		$dynamicReturnTypeExtensionRegistryProvider = new DirectDynamicReturnTypeExtensionRegistryProvider([], [], []);
@@ -46,6 +47,7 @@ protected function setUp(): void
 			self::getContainer()->getByType(\PhpParser\PrettyPrinter\Standard::class),
 			$anonymousClassNameHelper,
 			self::getContainer()->getByType(Parser::class),
+			$fileHelper,
 			$relativePathHelper,
 			self::getContainer()->getByType(StubPhpDocProvider::class)
 		);