fix join_paths issue with '0' (#51649)

laravel · May 30, 2024 · 7aab6b9 · 7aab6b9
1 parent 92eda54
commit 7aab6b9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Illuminate/Filesystem/functions.php b/src/Illuminate/Filesystem/functions.php
@@ -13,7 +13,7 @@
     function join_paths($basePath, ...$paths)
     {
         foreach ($paths as $index => $path) {
-            if (empty($path)) {
+            if (empty($path) && $path !== '0') {
                 unset($paths[$index]);
             } else {
                 $paths[$index] = DIRECTORY_SEPARATOR.ltrim($path, DIRECTORY_SEPARATOR);

diff --git a/tests/Filesystem/JoinPathsHelperTest.php b/tests/Filesystem/JoinPathsHelperTest.php
@@ -23,15 +23,23 @@ public static function unixDataProvider()
         yield ['segments/get/ltrimed/by_directory/separator.php', join_paths('segments', '/get/ltrimed', '/by_directory/separator.php')];
         yield ['only/\\os_separator\\/\\get_ltrimmed.php', join_paths('only', '\\os_separator\\', '\\get_ltrimmed.php')];
         yield ['/base_path//does_not/get_trimmed.php', join_paths('/base_path/', '/does_not', '/get_trimmed.php')];
-        yield ['Empty/1/Segments/00/Get_removed.php', join_paths('Empty', '', '0', null, 0, false, [], '1', 'Segments', '00', 'Get_removed.php')];
+        yield ['Empty/0/1/Segments/00/Get_removed.php', join_paths('Empty', '', '0', null, 0, false, [], '1', 'Segments', '00', 'Get_removed.php')];
         yield ['', join_paths(null, null, '')];
+        yield ['1/2/3', join_paths(1, 0, 2, 3)];
         yield ['app/objecty', join_paths('app', new class()
         {
             public function __toString()
             {
                 return 'objecty';
             }
         })];
+        yield ['app/0', join_paths('app', new class()
+        {
+            public function __toString()
+            {
+                return '0';
+            }
+        })];
     }
 
     #[RequiresOperatingSystem('Windows')]
@@ -47,14 +55,22 @@ public static function windowsDataProvider()
         yield ['segments\get\ltrimed\by_directory\separator.php', join_paths('segments', '\get\ltrimed', '\by_directory\separator.php')];
         yield ['only\\/os_separator/\\/get_ltrimmed.php', join_paths('only', '/os_separator/', '/get_ltrimmed.php')];
         yield ['\base_path\\\\does_not\get_trimmed.php', join_paths('\\base_path\\', '\does_not', '\get_trimmed.php')];
-        yield ['Empty\1\Segments\00\Get_removed.php', join_paths('Empty', '', '0', null, 0, false, [], '1', 'Segments', '00', 'Get_removed.php')];
+        yield ['Empty\0\1\Segments\00\Get_removed.php', join_paths('Empty', '', '0', null, 0, false, [], '1', 'Segments', '00', 'Get_removed.php')];
         yield ['', join_paths(null, null, '')];
+        yield ['1\2\3', join_paths(1, 2, 3)];
         yield ['app\\objecty', join_paths('app', new class()
         {
             public function __toString()
             {
                 return 'objecty';
             }
         })];
+        yield ['app\\0', join_paths('app', new class()
+        {
+            public function __toString()
+            {
+                return '0';
+            }
+        })];
     }
 }