From c5377a16f7037d453d444fe738bb62d8e2d3e2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 13 May 2020 00:34:55 +0200 Subject: [PATCH] Move resource sharing test to original namespace --- tests/BootstrapperTest.php | 6 +++++- tests/{v3 => }/ResourceSyncingTest.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) rename tests/{v3 => }/ResourceSyncingTest.php (99%) diff --git a/tests/BootstrapperTest.php b/tests/BootstrapperTest.php index 94b4c7d9..ae9e0154 100644 --- a/tests/BootstrapperTest.php +++ b/tests/BootstrapperTest.php @@ -189,7 +189,11 @@ class BootstrapperTest extends TestCase foreach (config('tenancy.filesystem.disks') as $disk) { $suffix = config('tenancy.filesystem.suffix_base') . tenant('id'); - $current_path_prefix = Storage::disk($disk)->getAdapter()->getPathPrefix(); + + /** @var FilesystemAdapter $filesystemDisk */ + $filesystemDisk = Storage::disk($disk); + + $current_path_prefix = $filesystemDisk->getAdapter()->getPathPrefix(); if ($override = config("tenancy.filesystem.root_override.{$disk}")) { $correct_path_prefix = str_replace('%storage_path%', storage_path(), $override); diff --git a/tests/v3/ResourceSyncingTest.php b/tests/ResourceSyncingTest.php similarity index 99% rename from tests/v3/ResourceSyncingTest.php rename to tests/ResourceSyncingTest.php index a866eecc..8f202c50 100644 --- a/tests/v3/ResourceSyncingTest.php +++ b/tests/ResourceSyncingTest.php @@ -1,6 +1,6 @@