fix(url): normalize webroot path

kleinweb · Nov 25, 2024 · 99506a9 · 99506a9
1 parent 3361c76
commit 99506a9
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Support/Url.php b/src/Support/Url.php
@@ -43,10 +43,15 @@ public static function fromFilesystemPath(string $path): UriInterface
             throw new UriSyntaxError('Target path must be absolute: ' . $path->value());
         }
 
+        $webRoot = \app()->webRoot();
+        $webRoot = HierarchicalPath::new($webRoot)
+            ->withoutDotSegments();
+
         Assert::stringNotEmpty($path->value());
+        Assert::stringNotEmpty($webRoot->value());
 
         // Strip the dirname common to webroot and target.
-        $relativePath = Str::after($path->value(), \app()->webRoot());
+        $relativePath = Str::after($path->value(), $webRoot->value());
 
         // A filesystem path in the web root is an absolute URI path.
         $uriPath = Path::new($relativePath)->withLeadingSlash();