From dabaff1338b4c7388859109c8e0260ad808cf52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Sun, 8 Sep 2019 17:24:03 +0200 Subject: [PATCH] Remove Tenant facade, move facades to Facades --- composer.json | 5 ++--- src/{GlobalCacheFacade.php => Facades/GlobalCache.php} | 2 +- src/{TenancyFacade.php => Facades/Tenancy.php} | 3 ++- tests/TestCase.php | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) rename src/{GlobalCacheFacade.php => Facades/GlobalCache.php} (86%) rename src/{TenancyFacade.php => Facades/Tenancy.php} (75%) diff --git a/composer.json b/composer.json index cb963c2a..f3cae583 100644 --- a/composer.json +++ b/composer.json @@ -40,9 +40,8 @@ "Stancl\\Tenancy\\TenancyServiceProvider" ], "aliases": { - "Tenancy": "Stancl\\Tenancy\\TenancyFacade", - "Tenant": "Stancl\\Tenancy\\TenancyFacade", - "GlobalCache": "Stancl\\Tenancy\\GlobalCacheFacade" + "Tenancy": "Stancl\\Tenancy\\Facades\\Tenancy", + "GlobalCache": "Stancl\\Tenancy\\Facades\\GlobalCache" } } }, diff --git a/src/GlobalCacheFacade.php b/src/Facades/GlobalCache.php similarity index 86% rename from src/GlobalCacheFacade.php rename to src/Facades/GlobalCache.php index d8de4469..b96200d3 100644 --- a/src/GlobalCacheFacade.php +++ b/src/Facades/GlobalCache.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Stancl\Tenancy; +namespace Stancl\Tenancy\Facades; use Illuminate\Support\Facades\Facade; diff --git a/src/TenancyFacade.php b/src/Facades/Tenancy.php similarity index 75% rename from src/TenancyFacade.php rename to src/Facades/Tenancy.php index d9b3bcdd..16bc1cd5 100644 --- a/src/TenancyFacade.php +++ b/src/Facades/Tenancy.php @@ -2,8 +2,9 @@ declare(strict_types=1); -namespace Stancl\Tenancy; +namespace Stancl\Tenancy\Facades; +use Stancl\Tenancy\TenantManager; use Illuminate\Support\Facades\Facade; class TenancyFacade extends Facade diff --git a/tests/TestCase.php b/tests/TestCase.php index 1a13cd69..24c3377f 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -132,9 +132,8 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase protected function getPackageAliases($app) { return [ - 'Tenancy' => \Stancl\Tenancy\TenancyFacade::class, - 'Tenant' => \Stancl\Tenancy\TenancyFacade::class, - 'GlobalCache' => \Stancl\Tenancy\GlobalCacheFacade::class, + 'Tenancy' => \Stancl\Tenancy\Facades\Tenancy::class, + 'GlobalCache' => \Stancl\Tenancy\Facades\GlobalCache::class, ]; }