From 4e6bfc9aac3045384d8dcf914e21a73221dd442a Mon Sep 17 00:00:00 2001
From: Erik Gaal <me@erikgaal.nl>
Date: Wed, 2 Mar 2022 21:30:40 +0100
Subject: [PATCH] Refactor Storage facade changes

---
 .../FilesystemTenancyBootstrapper.php           | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Bootstrappers/FilesystemTenancyBootstrapper.php b/src/Bootstrappers/FilesystemTenancyBootstrapper.php
index 540dc801..418be93f 100644
--- a/src/Bootstrappers/FilesystemTenancyBootstrapper.php
+++ b/src/Bootstrappers/FilesystemTenancyBootstrapper.php
@@ -57,19 +57,20 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
         Storage::forgetDisk($this->app['config']['tenancy.filesystem.disks']);
 
         foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) {
-            $root = $this->app['config']->get("filesystems.disks.{$disk}.root");
-            $this->originalPaths['disks'][$disk] = $root;
+            $originalRoot = $this->app['config']["filesystems.disks.{$disk}.root"];
+            $this->originalPaths['disks'][$disk] = $originalRoot;
 
-            if (!($root = str_replace(
+            $finalPrefix = str_replace(
                 '%storage_path%',
                 storage_path(),
-                $this->app['config']["tenancy.filesystem.root_override.{$disk}"] ?? ''
-            ))) {
-                $root = "{$root}/{$suffix}";
+                $this->app['config']["tenancy.filesystem.root_override.{$disk}"] ?? '',
+            );
+
+            if (! $finalPrefix) {
+                $finalPrefix = $originalRoot . '/'. $suffix;
             }
 
-            $this->app['config']["filesystems.disks.{$disk}.root"] = $root;
-
+            $this->app['config']["filesystems.disks.{$disk}.root"] = $finalPrefix;
         }
     }