[10.x] Support inline disk for scoped driver (#47776)

* Support inline disk for scoped driver * added test * Improve tests and remove warnings in test
laravel · Jul 24, 2023 · d44b529 · d44b529
1 parent 971e822
commit d44b529
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -284,7 +284,7 @@ public function createScopedDriver(array $config)
         }
 
         return $this->build(tap(
-            $this->getConfig($config['disk']),
+            is_string($config['disk']) ? $this->getConfig($config['disk']) : $config['disk'],
             fn (&$parent) => $parent['prefix'] = $config['prefix']
         ));
     }

diff --git a/tests/Filesystem/FilesystemManagerTest.php b/tests/Filesystem/FilesystemManagerTest.php
@@ -97,4 +97,29 @@ public function testCanBuildScopedDisks()
             rmdir(__DIR__.'/../../to-be-scoped');
         }
     }
+
+    public function testCanBuildInlineScopedDisks()
+    {
+        try {
+            $filesystem = new FilesystemManager(new Application);
+
+            $scoped = $filesystem->build([
+                'driver' => 'scoped',
+                'disk' => [
+                    'driver' => 'local',
+                    'root' => 'to-be-scoped',
+                ],
+                'prefix' => 'path-prefix',
+            ]);
+
+            $scoped->put('dirname/filename.txt', 'file content');
+            $this->assertTrue(is_dir(__DIR__ . '/../../to-be-scoped/path-prefix'));
+            $this->assertEquals(file_get_contents(__DIR__.'/../../to-be-scoped/path-prefix/dirname/filename.txt'), 'file content');
+        } finally {
+            unlink(__DIR__.'/../../to-be-scoped/path-prefix/dirname/filename.txt');
+            rmdir(__DIR__.'/../../to-be-scoped/path-prefix/dirname');
+            rmdir(__DIR__.'/../../to-be-scoped/path-prefix');
+            rmdir(__DIR__.'/../../to-be-scoped');
+        }
+    }
 }