Merge branch 'on-demand-filesystem' into 8.x

funkjedi · Jun 18, 2021 · ed5da1a · ed5da1a
2 parents 77f45b7 + c21fc12
commit ed5da1a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -90,6 +90,20 @@ public function cloud()
         return $this->disks[$name] = $this->get($name);
     }
 
+    /**
+     * Build an on-demand disk.
+     *
+     * @param  string|array  $config
+     * @return \Illuminate\Contracts\Filesystem\Filesystem
+     */
+    public function build($config)
+    {
+        return $this->resolve('ondemand', is_array($config) ? $config : [
+            'driver' => 'local',
+            'root' => $config
+        ]);
+    }
+
     /**
      * Attempt to get the disk from the local cache.
      *
@@ -109,9 +123,9 @@ protected function get($name)
      *
      * @throws \InvalidArgumentException
      */
-    protected function resolve($name)
+    protected function resolve($name, $config = null)
     {
-        $config = $this->getConfig($name);
+        $config = $config ?? $this->getConfig($name);
 
         if (empty($config['driver'])) {
             throw new InvalidArgumentException("Disk [{$name}] does not have a configured driver.");

diff --git a/src/Illuminate/Support/Facades/Storage.php b/src/Illuminate/Support/Facades/Storage.php
@@ -8,6 +8,7 @@
  * @method static \Illuminate\Contracts\Filesystem\Filesystem assertExists(string|array $path)
  * @method static \Illuminate\Contracts\Filesystem\Filesystem assertMissing(string|array $path)
  * @method static \Illuminate\Contracts\Filesystem\Filesystem cloud()
+ * @method static \Illuminate\Contracts\Filesystem\Filesystem build(string|array $root)
  * @method static \Illuminate\Contracts\Filesystem\Filesystem disk(string|null $name = null)
  * @method static \Illuminate\Filesystem\FilesystemManager extend(string $driver, \Closure $callback)
  * @method static \Symfony\Component\HttpFoundation\StreamedResponse download(string $path, string|null $name = null, array|null $headers = [])

diff --git a/tests/Filesystem/FilesystemManagerTest.php b/tests/Filesystem/FilesystemManagerTest.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Filesystem;
 
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Filesystem\FilesystemManager;
 use Illuminate\Foundation\Application;
 use InvalidArgumentException;
@@ -20,4 +21,18 @@ public function testExceptionThrownOnUnsupportedDriver()
 
         $filesystem->disk('local');
     }
+
+    public function testCanBuildOnDemandDisk()
+    {
+        $filesystem = new FilesystemManager(new Application);
+
+        $this->assertInstanceOf(Filesystem::class, $filesystem->build('my-custom-path'));
+
+        $this->assertInstanceOf(Filesystem::class, $filesystem->build([
+            'driver'     => 'local',
+            'root'       => 'my-custom-path',
+            'url'        => 'my-custom-url',
+            'visibility' => 'public',
+        ]));
+    }
 }