From 597236407516a0602df1f66e37ddf863623c7ab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Sun, 3 May 2020 17:59:35 +0200
Subject: [PATCH] [3.x] Rename facades (#387)

* Remove Facade suffix from facades, fix #386

* Apply fixes from StyleCI

* Fix facade test
---
 composer.json                                          |  6 +++---
 src/Facades/{GlobalCacheFacade.php => GlobalCache.php} |  2 +-
 src/Facades/{TenancyFacade.php => Tenancy.php}         |  2 +-
 src/Facades/{TenantFacade.php => Tenant.php}           | 10 +++++-----
 tests/TestCase.php                                     |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename src/Facades/{GlobalCacheFacade.php => GlobalCache.php} (83%)
 rename src/Facades/{TenancyFacade.php => Tenancy.php} (87%)
 rename src/Facades/{TenantFacade.php => Tenant.php} (59%)

diff --git a/composer.json b/composer.json
index 2409cbca..cac4568d 100644
--- a/composer.json
+++ b/composer.json
@@ -41,9 +41,9 @@
                 "Stancl\\Tenancy\\TenancyServiceProvider"
             ],
             "aliases": {
-                "Tenant": "Stancl\\Tenancy\\Facades\\TenantFacade",
-                "Tenancy": "Stancl\\Tenancy\\Facades\\TenancyFacade",
-                "GlobalCache": "Stancl\\Tenancy\\Facades\\GlobalCacheFacade"
+                "Tenant": "Stancl\\Tenancy\\Facades\\Tenant",
+                "Tenancy": "Stancl\\Tenancy\\Facades\\Tenancy",
+                "GlobalCache": "Stancl\\Tenancy\\Facades\\GlobalCache"
             }
         }
     },
diff --git a/src/Facades/GlobalCacheFacade.php b/src/Facades/GlobalCache.php
similarity index 83%
rename from src/Facades/GlobalCacheFacade.php
rename to src/Facades/GlobalCache.php
index b96200d3..6c3b8dde 100644
--- a/src/Facades/GlobalCacheFacade.php
+++ b/src/Facades/GlobalCache.php
@@ -6,7 +6,7 @@ namespace Stancl\Tenancy\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
-class GlobalCacheFacade extends Facade
+class GlobalCache extends Facade
 {
     protected static function getFacadeAccessor()
     {
diff --git a/src/Facades/TenancyFacade.php b/src/Facades/Tenancy.php
similarity index 87%
rename from src/Facades/TenancyFacade.php
rename to src/Facades/Tenancy.php
index b3f7f6d9..58fef2ac 100644
--- a/src/Facades/TenancyFacade.php
+++ b/src/Facades/Tenancy.php
@@ -7,7 +7,7 @@ namespace Stancl\Tenancy\Facades;
 use Illuminate\Support\Facades\Facade;
 use Stancl\Tenancy\TenantManager;
 
-class TenancyFacade extends Facade
+class Tenancy extends Facade
 {
     protected static function getFacadeAccessor()
     {
diff --git a/src/Facades/TenantFacade.php b/src/Facades/Tenant.php
similarity index 59%
rename from src/Facades/TenantFacade.php
rename to src/Facades/Tenant.php
index e319cb8c..6cfd05c8 100644
--- a/src/Facades/TenantFacade.php
+++ b/src/Facades/Tenant.php
@@ -5,17 +5,17 @@ declare(strict_types=1);
 namespace Stancl\Tenancy\Facades;
 
 use Illuminate\Support\Facades\Facade;
-use Stancl\Tenancy\Tenant;
+use Stancl\Tenancy\Tenant as TenantObject;
 
-class TenantFacade extends Facade
+class Tenant extends Facade
 {
     protected static function getFacadeAccessor()
     {
-        return Tenant::class;
+        return TenantObject::class;
     }
 
-    public static function create($domains, array $data = []): Tenant
+    public static function create($domains, array $data = []): TenantObject
     {
-        return Tenant::create($domains, $data);
+        return TenantObject::create($domains, $data);
     }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 5d865549..d94164f7 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -122,9 +122,9 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
     protected function getPackageAliases($app)
     {
         return [
-            'Tenant' => \Stancl\Tenancy\Facades\TenantFacade::class,
-            'Tenancy' => \Stancl\Tenancy\Facades\TenancyFacade::class,
-            'GlobalCache' => \Stancl\Tenancy\Facades\GlobalCacheFacade::class,
+            'Tenant' => \Stancl\Tenancy\Facades\Tenant::class,
+            'Tenancy' => \Stancl\Tenancy\Facades\Tenancy::class,
+            'GlobalCache' => \Stancl\Tenancy\Facades\GlobalCache::class,
         ];
     }