From 5fe79fea333039d47448eda2c2892d6d87fb2bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Tue, 8 Sep 2020 21:19:39 +0200
Subject: [PATCH] Fix initialize() method (#488)

* Fix initialize() method

* Remove useless line
---
 src/Tenancy.php | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Tenancy.php b/src/Tenancy.php
index 0e80221a..307f818f 100644
--- a/src/Tenancy.php
+++ b/src/Tenancy.php
@@ -31,6 +31,15 @@ class Tenancy
      */
     public function initialize($tenant): void
     {
+        if (! is_object($tenant)) {
+            $tenantId = $tenant;
+            $tenant = $this->find($tenantId);
+
+            if (! $tenant) {
+                throw new TenantCountNotBeIdentifiedById($tenantId);
+            }
+        }
+
         if ($this->initialized && $this->tenant->getTenantKey() === $tenant->getTenantKey()) {
             return;
         }
@@ -40,18 +49,7 @@ class Tenancy
             $this->end();
         }
 
-        if (is_object($tenant)) {
-            $this->tenant = $tenant;
-        } else {
-            $tenantId = $tenant;
-            $tenant = $this->find($tenantId);
-
-            if (! $tenant) {
-                throw new TenantCountNotBeIdentifiedById($tenantId);
-            }
-
-            $this->tenant = $tenant;
-        }
+        $this->tenant = $tenant;
 
         event(new Events\InitializingTenancy($this));