fix(core): Path::getRelativePath() will return correct path when `$…

…root` is file. (cherry picked from commit 9478b44)
LastDragon-ru · May 26, 2024 · cf82d55 · cf82d55
1 parent c8baa09
commit cf82d55
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/core/src/Utils/Path.php b/packages/core/src/Utils/Path.php
@@ -18,9 +18,8 @@ public static function getPath(string $root, string $path): string {
     }
 
     public static function getRelativePath(string $root, string $path): string {
-        $path = static::isRelative($path)
-            ? static::join(static::getDirname($root), $path)
-            : $path;
+        $root = static::getDirname($root);
+        $path = static::isRelative($path) ? static::join($root, $path) : $path;
         $path = SymfonyPath::makeRelative($path, $root);
         $path = static::normalize($path);
 

diff --git a/packages/core/src/Utils/PathTest.php b/packages/core/src/Utils/PathTest.php
@@ -5,6 +5,7 @@
 use LastDragon_ru\LaraASP\Core\Testing\Package\TestCase;
 use PHPUnit\Framework\Attributes\CoversClass;
 
+use function basename;
 use function dirname;
 use function str_replace;
 
@@ -25,6 +26,7 @@ public function testGetPath(): void {
     public function testGetRelativePath(): void {
         self::assertEquals('../to/file', Path::getRelativePath('/any/path', '/any/path/../to/file'));
         self::assertEquals('to/file', Path::getRelativePath('/absolute/path', 'to/./file'));
+        self::assertEquals(basename(__FILE__), Path::getRelativePath(__FILE__, __FILE__));
     }
 
     public function testJoin(): void {