resolveFilePath(PathUtility): handle absolute path cleanly

andi34 · andi34 · commit 15692fcfef60 · 2025-04-01T22:38:20.000+02:00
diff --git a/src/Utility/PathUtility.php b/src/Utility/PathUtility.php
@@ -93,12 +93,9 @@ public static function resolveFilePath(string $filePath): string
             return $filePath;
         }
 
-        if (!self::isAbsolutePath($filePath)) {
-            $filePath = self::getAbsolutePath($filePath);
-        }
-
-        if (file_exists($filePath)) {
-            return $filePath;
+        $absolutePath = self::isAbsolutePath($filePath) ? $filePath : self::getAbsolutePath($filePath);
+        if (file_exists($absolutePath)) {
+            return $absolutePath;
         }
 
         $altPath1 = $_SERVER['DOCUMENT_ROOT'] . $filePath;

Original file line number	Diff line number	Diff line change
`@@ -93,12 +93,9 @@ public static function resolveFilePath(string $filePath): string`
`93`	`93`	`return $filePath;`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (!self::isAbsolutePath($filePath)) {`
`97`		`- $filePath = self::getAbsolutePath($filePath);`
`98`		`- }`
`99`		`-`
`100`		`- if (file_exists($filePath)) {`
`101`		`- return $filePath;`
	`96`	`+ $absolutePath = self::isAbsolutePath($filePath) ? $filePath : self::getAbsolutePath($filePath);`
	`97`	`+ if (file_exists($absolutePath)) {`
	`98`	`+ return $absolutePath;`
`102`	`99`	`}`
`103`	`100`
`104`	`101`	`$altPath1 = $_SERVER['DOCUMENT_ROOT'] . $filePath;`