From 8445e3ebb8675bfbb251c7b0bfebf658c0b0acde Mon Sep 17 00:00:00 2001
From: George <jiri.zizka@funfirst.cz>
Date: Sat, 12 Feb 2022 13:58:15 +0100
Subject: [PATCH] Filesystem adapter updated

---
 docker-compose.yml                            |  3 +++
 .../FilesystemTenancyBootstrapper.php         | 22 +++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e8e8d418..f86aa0bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,7 @@ services:
         stdin_open: true
         tty: true
     mysql:
+        platform: linux/x86_64
         image: mysql:5.7
         environment:
             MYSQL_ROOT_PASSWORD: password
@@ -36,6 +37,7 @@ services:
             timeout: 10s
             retries: 10
     mysql2:
+        platform: linux/x86_64
         image: mysql:5.7
         environment:
             MYSQL_ROOT_PASSWORD: password
@@ -47,6 +49,7 @@ services:
             timeout: 10s
             retries: 10
     postgres:
+        platform: linux/x86_64
         image: postgres:11
         environment:
             POSTGRES_PASSWORD: password
diff --git a/src/Bootstrappers/FilesystemTenancyBootstrapper.php b/src/Bootstrappers/FilesystemTenancyBootstrapper.php
index d5ae2d50..50ba8513 100644
--- a/src/Bootstrappers/FilesystemTenancyBootstrapper.php
+++ b/src/Bootstrappers/FilesystemTenancyBootstrapper.php
@@ -54,23 +54,20 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
         }
 
         // Storage facade
+        Storage::forgetDisk($this->app['config']['tenancy.filesystem.disks']);
         foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) {
-            /** @var FilesystemAdapter $filesystemDisk */
-            $filesystemDisk = Storage::disk($disk);
-            $this->originalPaths['disks'][$disk] = $filesystemDisk->getAdapter()->getPathPrefix();
+            $root = $this->app['config']["filesystems.disks.{$disk}.root"];
+            $this->originalPaths['disks'][$disk] = $root;
 
-            if ($root = str_replace(
+            if (!$root = str_replace(
                 '%storage_path%',
                 storage_path(),
                 $this->app['config']["tenancy.filesystem.root_override.{$disk}"] ?? ''
             )) {
-                $filesystemDisk->getAdapter()->setPathPrefix($finalPrefix = $root);
-            } else {
-                $root = $this->app['config']["filesystems.disks.{$disk}.root"];
-                $filesystemDisk->getAdapter()->setPathPrefix($finalPrefix = $root . "/{$suffix}");
+                $root .= '/' . $suffix;
             }
 
-            $this->app['config']["filesystems.disks.{$disk}.root"] = $finalPrefix;
+            $this->app['config']["filesystems.disks.{$disk}.root"] = $root;
         }
     }
 
@@ -84,13 +81,10 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
         $this->app['url']->setAssetRoot($this->app['config']['app.asset_url']);
 
         // Storage facade
+
+        Storage::forgetDisk($this->app['config']['tenancy.filesystem.disks']);
         foreach ($this->app['config']['tenancy.filesystem.disks'] as $disk) {
-            /** @var FilesystemAdapter $filesystemDisk */
-            $filesystemDisk = Storage::disk($disk);
-
             $root = $this->originalPaths['disks'][$disk];
-
-            $filesystemDisk->getAdapter()->setPathPrefix($root);
             $this->app['config']["filesystems.disks.{$disk}.root"] = $root;
         }
     }