mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-17 10:14:08 +00:00
Consolidate media disk config into AppConfigProvider
Remove duplicate configureMediaDisk() from AppServiceProvider — all FileDisk and media-library config is now in AppConfigProvider's configureFileSystemFromDatabase(). Replace setConfig() calls with inline config registration everywhere to avoid mutating filesystems.default, which caused infinite request loops on the File Disk admin page.
This commit is contained in:
@@ -27,8 +27,18 @@ class MigrateMediaToPrivateDisk extends Command
|
||||
$prefix = env('DYNAMIC_DISK_PREFIX', 'temp_');
|
||||
$targetDiskName = $prefix.$targetDisk->driver;
|
||||
|
||||
$targetDisk->setConfig();
|
||||
$targetRoot = config('filesystems.disks.'.$targetDiskName.'.root');
|
||||
// Register disk config without mutating filesystems.default
|
||||
$credentials = collect(json_decode($targetDisk->credentials));
|
||||
$baseConfig = config('filesystems.disks.'.$targetDisk->driver, []);
|
||||
|
||||
foreach ($baseConfig as $key => $value) {
|
||||
if ($credentials->has($key)) {
|
||||
$baseConfig[$key] = $credentials[$key];
|
||||
}
|
||||
}
|
||||
|
||||
config(['filesystems.disks.'.$targetDiskName => $baseConfig]);
|
||||
$targetRoot = $baseConfig['root'] ?? null;
|
||||
|
||||
if (! $targetRoot) {
|
||||
$this->error('Could not resolve target disk root path.');
|
||||
|
||||
Reference in New Issue
Block a user