Allow to use 0 in path

sabre-io · Sep 4, 2019 · 8db0c82 · 8db0c82
1 parent 1381865
commit 8db0c82
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/functions.php b/lib/functions.php
@@ -52,8 +52,8 @@ function resolve(string $basePath, string $newPath): string
     $newParts['host'] = $pick('host');
     $newParts['port'] = $pick('port');
 
-    $path = '';
-    if ($delta['path']) {
+    $path = $base['path'] ?: '/';
+    if (is_string($delta['path']) and strlen($delta['path']) > 0) {
         // If the path starts with a slash
         if ('/' === $delta['path'][0]) {
             $path = $delta['path'];
@@ -66,9 +66,8 @@ function resolve(string $basePath, string $newPath): string
             }
             $path .= '/'.$delta['path'];
         }
-    } else {
-        $path = $base['path'] ?: '/';
     }
+
     // Removing .. and .
     $pathParts = explode('/', $path);
     $newPathParts = [];

diff --git a/tests/ResolveTest.php b/tests/ResolveTest.php
@@ -104,6 +104,12 @@ public function resolveData()
                 '#',
                 'http://example.org/path.json',
             ],
+            // Allow to use 0 in path
+            [
+                'http://example.org/',
+                '0',
+                'http://example.org/0',
+            ],
         ];
     }
 }