[10.x] Move Illuminate\Foundation\Application::joinPaths() to Illuminate\Filesystem\join_paths() (#49433)

* Move `Illuminate\Foundation\Application::joinPaths()` to
`Illuminate\Filesystem\join_paths()`

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* formatting

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>
Co-authored-by: Taylor Otwell <[email protected]>

Author: crynobone

composer.json

@@ -127,6 +127,7 @@
         "files": [
             "src/Illuminate/Collections/helpers.php",
             "src/Illuminate/Events/functions.php",
+            "src/Illuminate/Filesystem/functions.php",
             "src/Illuminate/Foundation/helpers.php",
             "src/Illuminate/Support/helpers.php"
         ],

src/Illuminate/Console/MigrationGeneratorCommand.php

@@ -5,6 +5,8 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Composer;
 
+use function Illuminate\Filesystem\join_paths;
+
 abstract class MigrationGeneratorCommand extends Command
 {
     /**
@@ -114,7 +116,7 @@ protected function replaceMigrationPlaceholders($path, $table)
     protected function migrationExists($table)
     {
         return count($this->files->glob(
-            $this->laravel->joinPaths($this->laravel->databasePath('migrations'), '*_*_*_*_create_'.$table.'_table.php')
+            join_paths($this->laravel->databasePath('migrations'), '*_*_*_*_create_'.$table.'_table.php')
         )) !== 0;
     }
 }

src/Illuminate/Filesystem/composer.json

@@ -24,7 +24,10 @@
     "autoload": {
         "psr-4": {
             "Illuminate\\Filesystem\\": ""
-        }
+        },
+        "files": [
+            "functions.php"
+        ]
     },
     "extra": {
         "branch-alias": {

src/Illuminate/Filesystem/functions.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Illuminate\Filesystem;
+
+if (! function_exists('Illuminate\Filesystem\join_paths')) {
+    /**
+     * Join the given paths together.
+     *
+     * @param  string|null  $basePath
+     * @param  string  ...$paths
+     * @return string
+     */
+    function join_paths($basePath, string ...$paths)
+    {
+        foreach ($paths as $index => $path) {
+            if (empty($path)) {
+                unset($paths[$index]);
+            } else {
+                $paths[$index] = DIRECTORY_SEPARATOR.ltrim($path, DIRECTORY_SEPARATOR);
+            }
+        }
+
+        return $basePath.implode('', $paths);
+    }
+}

src/Illuminate/Foundation/Application.php

@@ -29,6 +29,8 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
+use function Illuminate\Filesystem\join_paths;
+
 class Application extends Container implements ApplicationContract, CachesConfiguration, CachesRoutes, HttpKernelInterface
 {
     use Macroable;
@@ -586,7 +588,7 @@ public function viewPath($path = '')
      */
     public function joinPaths($basePath, $path = '')
     {
-        return $basePath.($path != '' ? DIRECTORY_SEPARATOR.ltrim($path, DIRECTORY_SEPARATOR) : '');
+        return join_paths($basePath, $path);
     }
 
     /**

tests/Filesystem/JoinPathsHelperTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Illuminate\Tests\Filesystem;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresOperatingSystem;
+use PHPUnit\Framework\TestCase;
+
+use function Illuminate\Filesystem\join_paths;
+
+class JoinPathsHelperTest extends TestCase
+{
+    #[RequiresOperatingSystem('Linux|DAR')]
+    #[DataProvider('unixDataProvider')]
+    public function testItCanMergePathsForUnix(string $expected, string $given)
+    {
+        $this->assertSame($expected, $given);
+    }
+
+    public static function unixDataProvider()
+    {
+        yield ['app/Http/Kernel.php', join_paths('app', 'Http', 'Kernel.php')];
+        yield ['app/Http/Kernel.php', join_paths('app', '', 'Http', 'Kernel.php')];
+    }
+
+    #[RequiresOperatingSystem('Windows')]
+    #[DataProvider('windowsDataProvider')]
+    public function testItCanMergePathsForWindows(string $expected, string $given)
+    {
+        $this->assertSame($expected, $given);
+    }
+
+    public static function windowsDataProvider()
+    {
+        yield ['app\Http\Kernel.php', join_paths('app', 'Http', 'Kernel.php')];
+        yield ['app\Http\Kernel.php', join_paths('app', '', 'Http', 'Kernel.php')];
+    }
+}