1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-04 17:04:03 +00:00

Refactor forgetDisks to handle scoped disks

This commit is contained in:
Victor R 2025-10-01 13:32:59 -04:00 committed by GitHub
parent 99d854ed8e
commit 2a864e237e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -113,7 +113,19 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
protected function forgetDisks(): void protected function forgetDisks(): void
{ {
Storage::forgetDisk($this->app['config']['tenancy.filesystem.disks']); $tenantDisks = $this->app['config']['tenancy.filesystem.disks'];
$scopedDisks = [];
foreach ($this->app['config']['filesystems.disks'] as $name => $disk) {
if (isset($disk['driver'], $disk['disk'])
&& $disk['driver'] === 'scoped'
&& in_array($disk['disk'], $tenantDisks, true)
&& ! in_array($disk['disk'], $scopedDisks, true)) {
$scopedDisks[] = $name;
}
}
Storage::forgetDisk([...$tenantDisks, ...$scopedDisks]);
} }
protected function diskRoot(string $disk, Tenant|false $tenant): void protected function diskRoot(string $disk, Tenant|false $tenant): void