Merge branch '6.0' into 6

Author: github-actions[bot]

src/Core/Path.php

@@ -29,16 +29,24 @@ public static function join(...$parts)
             $parts = $parts[0];
         }
 
-        // Cleanup and join all parts
-        $parts = array_filter(array_map('trim', array_filter($parts ?? [])));
+        // Remove empty parts and trim all parts
+        // Explicitly allow zero as a segment in the path (e.g. /some/path/0/file.txt)
+        $notEmpty = fn(mixed $part) => ($part === 0 || $part === '0' || (bool) $part);
+        $parts = array_filter(array_map('trim', array_filter($parts ?? [], $notEmpty)), $notEmpty);
+
+        // Normalise and join parts
         $fullPath = static::normalise(implode(DIRECTORY_SEPARATOR, $parts));
 
         // Protect against directory traversal vulnerability (OTG-AUTHZ-001)
         if ($fullPath === '..' || str_ends_with($fullPath, '/..') || str_contains($fullPath, '../')) {
             throw new InvalidArgumentException('Can not collapse relative folders');
         }
 
-        return $fullPath ?: DIRECTORY_SEPARATOR;
+        if ($fullPath === '') {
+            return DIRECTORY_SEPARATOR;
+        }
+
+        return $fullPath;
     }
 
     /**

tests/php/Core/PathTest.php

@@ -18,7 +18,7 @@ class PathTest extends SapphireTest
     #[DataProvider('providerTestJoinPaths')]
     public function testJoinPaths($args, $expected)
     {
-        $joined = Path::join($args);
+        $joined = Path::join(...$args);
         $this->assertEquals($expected, $joined);
     }
 
@@ -47,10 +47,18 @@ public static function providerTestJoinPaths()
             [['', '/root', '/', ' ', '/', '\\'], '/root'],
             [['', 'root', '/', ' ', '/', '\\'], 'root'],
             [['\\', '', '/root', '/', ' ', '/', '\\'], '/root'],
+            [[' one ', ' ', 'two', null], 'one/two'],
             // join blocks of paths
             [['/root/dir', 'another/path\\to/join'], '/root/dir/another/path/to/join'],
             // Double dot is fine if it's not attempting directory traversal
             [['/root/my..name/', 'another/path\\to/join'], '/root/my..name/another/path/to/join'],
+            // Don't remove zero
+            [['0'], '0'],
+            [[0], '0'],
+            [['1', '0', 'a'], '1/0/a'],
+            [[1, 0, 'a'], '1/0/a'],
+            // first arg is array
+            [[['one', 'two', 'three']], 'one/two/three'],
         ];
 
         // Rewrite tests for other filesystems (output arg only)