[6.x] Fix FilesystemManager unwanted changes (#30369)

* Update expected exception and target disk in test * Fix filesystem disk resolving
laravel · Oct 21, 2019 · 0087f11 · 0087f11
1 parent 204140f
commit 0087f11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Illuminate/Filesystem/FilesystemManager.php b/src/Illuminate/Filesystem/FilesystemManager.php
@@ -113,7 +113,11 @@ protected function resolve($name)
     {
         $config = $this->getConfig($name);
 
-        $name = $config['driver'] ?? $name;
+        if (empty($config['driver'])) {
+            throw new InvalidArgumentException("Disk [{$name}] does not have a configured driver.");
+        }
+
+        $name = $config['driver'];
 
         if (isset($this->customCreators[$name])) {
             return $this->callCustomCreator($config);

diff --git a/tests/Filesystem/FilesystemManagerTest.php b/tests/Filesystem/FilesystemManagerTest.php
@@ -12,12 +12,12 @@ class FilesystemManagerTest extends TestCase
     public function testExceptionThrownOnUnsupportedDriver()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('Driver [unsupported-disk] is not supported.');
+        $this->expectExceptionMessage('Disk [local] does not have a configured driver.');
 
         $filesystem = new FilesystemManager(tap(new Application, function ($app) {
-            $app['config'] = ['filesystems.disks.unsupported-disk' => null];
+            $app['config'] = ['filesystems.disks.local' => null];
         }));
 
-        $filesystem->disk('unsupported-disk');
+        $filesystem->disk('local');
     }
 }