Merge pull request #1125 from hydephp/refactor-hyde-path-helper

emmadesilva · web-flow · commit a4a822670e31 · 2023-02-27T12:04:58.000+01:00
Refactor the Hyde::path() helper to normalize already absolute paths
diff --git a/packages/framework/src/Console/Concerns/Command.php b/packages/framework/src/Console/Concerns/Command.php
@@ -84,7 +84,7 @@ public function handleException(Exception $exception): int
      */
     public static function fileLink(string $filepath, string $label = null): string
     {
-        $link = 'file://'.str_replace('\\', '/', realpath($filepath) ?: Hyde::path(Hyde::pathToRelative($filepath)));
+        $link = 'file://'.str_replace('\\', '/', realpath($filepath) ?: Hyde::path($filepath));
 
         return $label ? "<href=$link>$label</>" : $link;
     }
diff --git a/packages/framework/src/Foundation/Kernel/Filesystem.php b/packages/framework/src/Foundation/Kernel/Filesystem.php
@@ -61,7 +61,7 @@ public function path(string $path = ''): string
             return $this->getBasePath();
         }
 
-        $path = unslash($path);
+        $path = unslash($this->pathToRelative($path));
 
         return path_join($this->getBasePath(), $path);
     }
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -91,6 +91,22 @@ public function test_path_method_returns_expected_value_regardless_of_trailing_d
         $this->assertEquals('/foo/bar/file.php', $this->filesystem->path('\\/bar/file.php/'));
     }
 
+    public function test_path_method_resolves_already_absolute_paths()
+    {
+        Hyde::getInstance()->setBasePath('/foo');
+        $this->assertEquals('/foo/bar', $this->filesystem->path('/foo/bar'));
+    }
+
+    public function test_path_method_resolves_already_absolute_paths_using_helper()
+    {
+        $this->assertEquals($this->filesystem->path('foo'), $this->filesystem->path($this->filesystem->path('foo')));
+    }
+
+    public function test_path_method_resolves_already_absolute_paths_using_helper_with_trailing_slash()
+    {
+        $this->assertEquals($this->filesystem->path('foo'), $this->filesystem->path($this->filesystem->path('foo/')));
+    }
+
     public function test_vendor_path_method_exists()
     {
         $this->assertTrue(method_exists(Filesystem::class, 'vendorPath'));

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public function handleException(Exception $exception): int`
`84`	`84`	`*/`
`85`	`85`	`public static function fileLink(string $filepath, string $label = null): string`
`86`	`86`	`{`
`87`		`- $link = 'file://'.str_replace('\\', '/', realpath($filepath) ?: Hyde::path(Hyde::pathToRelative($filepath)));`
	`87`	`+ $link = 'file://'.str_replace('\\', '/', realpath($filepath) ?: Hyde::path($filepath));`
`88`	`88`
`89`	`89`	`return $label ? "<href=$link>$label</>" : $link;`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function path(string $path = ''): string`
`61`	`61`	`return $this->getBasePath();`
`62`	`62`	`}`
`63`	`63`
`64`		`- $path = unslash($path);`
	`64`	`+ $path = unslash($this->pathToRelative($path));`
`65`	`65`
`66`	`66`	`return path_join($this->getBasePath(), $path);`
`67`	`67`	`}`