Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

bin/phpstan

@@ -151,7 +151,11 @@ use Symfony\Component\Console\Helper\ProgressBar;
 	$application->setDefaultCommand('analyse');
 	ProgressBar::setFormatDefinition('file_download', ' [%bar%] %percent:3s%% %fileSize%');
 
+	$composerAutoloaderProjectPaths = array_map(function(string $s): string {
+		return str_replace(DIRECTORY_SEPARATOR, '/', $s);
+	}, $composerAutoloaderProjectPaths);
 	$reversedComposerAutoloaderProjectPaths = array_values(array_unique(array_reverse($composerAutoloaderProjectPaths)));
+
 	$application->add(new AnalyseCommand($reversedComposerAutoloaderProjectPaths, $analysisStartTime));
 	$application->add(new WorkerCommand($reversedComposerAutoloaderProjectPaths));
 	$application->add(new ClearResultCacheCommand($reversedComposerAutoloaderProjectPaths));

composer.json

@@ -25,7 +25,7 @@
 		"nikic/php-parser": "^5.2.0",
 		"ondram/ci-detector": "^3.4.0",
 		"ondrejmirtes/better-reflection": "6.42.0.8",
-		"phpstan/php-8-stubs": "0.3.105",
+		"phpstan/php-8-stubs": "0.3.106",
 		"phpstan/phpdoc-parser": "^2.0",
 		"psr/http-message": "^1.1",
 		"react/async": "^3",

composer.lock

@@ -3,6 +3,7 @@
 namespace PHPStan\Analyser;
 
 use EnumTypeAssertions\Foo;
+use PHPStan\File\FileHelper;
 use PHPStan\Testing\TypeInferenceTestCase;
 use stdClass;
 use function array_shift;
@@ -205,7 +206,10 @@ public static function dataFile(): iterable
 		$base = dirname(__DIR__, 3) . '/';
 		$baseLength = strlen($base);
 
+		$fileHelper = new FileHelper($base);
 		foreach (self::findTestFiles() as $file) {
+			$file = $fileHelper->normalizePath($file);
+
 			$testName = $file;
 			if (str_starts_with($file, $base)) {
 				$testName = substr($file, $baseLength);