github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-28 20:16:08 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

Fixes issue with Laravel 8.48 filesystem changes

Browse Source 
The FilesystemManager has changed to also allow to override
the config while resolving a filesystem.

This PR adds the argument and applies it if provided.
This commit is contained in:
Daniel Klabbers 2021-06-22 21:20:00 +02:00 committed by Daniël Klabbers
parent 1cf9491fe6
commit 6e92af8b00
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Filesystem/FilesystemManager.php
View File

@ -35,16 +35,16 @@ class FilesystemManager extends LaravelFilesystemManager
/** /**
* @inheritDoc * @inheritDoc
*/ */
protected function resolve($name): Filesystem protected function resolve($name, $config = null): Filesystem
{ {
$driver = $this->getDriver($name); $localConfig = $config ?? $this->getLocalConfig($name);
$localConfig = $this->getLocalConfig($name);
if (empty($localConfig)) { if (empty($localConfig)) {
throw new InvalidArgumentException("Disk [{$name}] has not been declared. Use the Filesystem extender to do this."); throw new InvalidArgumentException("Disk [{$name}] has not been declared. Use the Filesystem extender to do this.");
} }
$driver = $config['driver'] ?? $this->getDriver($name);
if ($driver === 'local') { if ($driver === 'local') {
return $this->createLocalDriver($localConfig); return $this->createLocalDriver($localConfig);
} }