Fix FuzzyRelativePathHelper for directories ending in .php

ondrejmirtes · ondrejmirtes · commit bff85e27cd48 · 2022-12-07T22:15:28.000+01:00
diff --git a/src/File/FuzzyRelativePathHelper.php b/src/File/FuzzyRelativePathHelper.php
@@ -70,8 +70,9 @@ public function __construct(
 			/** @var string[] $pathArray */
 			$pathArray = explode($directorySeparator, $path);
 			$pathTempParts = [];
+			$pathArraySize = count($pathArray);
 			foreach ($pathArray as $i => $pathPart) {
-				if (str_ends_with($pathPart, '.php')) {
+				if ($i === $pathArraySize - 1 && str_ends_with($pathPart, '.php')) {
 					continue;
 				}
 				if (!isset($pathToTrimArray[$i])) {
diff --git a/tests/PHPStan/File/RelativePathHelperTest.php b/tests/PHPStan/File/RelativePathHelperTest.php
@@ -142,6 +142,40 @@ public function dataGetRelativePath(): array
 				'/usr/app/src/analyzed.php',
 				'/usr/app/src/analyzed.php',
 			],
+			[
+				'/Users/ondrej/Downloads/phpstan-wtf/normal.php',
+				[
+					'/Users/ondrej/Downloads/phpstan-wtf/normal.php/src',
+				],
+				'/Users/ondrej/Downloads/phpstan-wtf/normal.php/src/index.php',
+				'index.php',
+			],
+			[
+				'/Users/ondrej/Downloads/phpstan-wtf/normal',
+				[
+					'/Users/ondrej/Downloads/phpstan-wtf/normal/src',
+				],
+				'/Users/ondrej/Downloads/phpstan-wtf/normal/src/index.php',
+				'index.php',
+			],
+			[
+				'/Users/ondrej/Downloads/phpstan-wtf/normal.php',
+				[
+					'/Users/ondrej/Downloads/phpstan-wtf/normal.php/src',
+					'/Users/ondrej/Downloads/phpstan-wtf/normal.php/tests',
+				],
+				'/Users/ondrej/Downloads/phpstan-wtf/normal.php/src/index.php',
+				'src/index.php',
+			],
+			[
+				'/Users/ondrej/Downloads/phpstan-wtf/normal',
+				[
+					'/Users/ondrej/Downloads/phpstan-wtf/normal/src',
+					'/Users/ondrej/Downloads/phpstan-wtf/normal/tests',
+				],
+				'/Users/ondrej/Downloads/phpstan-wtf/normal/src/index.php',
+				'src/index.php',
+			],
 		];
 	}
 
