From 5f41647a6b349f103962c4ba62bb74f7698b7fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Fri, 26 Aug 2022 21:49:09 +0200
Subject: [PATCH] revert Tenancy changes, fix failing tests

---
 composer.json   | 8 ++++----
 src/Tenancy.php | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 03f08244..0df504b7 100644
--- a/composer.json
+++ b/composer.json
@@ -17,16 +17,16 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "illuminate/support": "^8.0|^9.0",
+        "illuminate/support": "^9.0",
         "facade/ignition-contracts": "^1.0",
         "ramsey/uuid": "^4.0",
         "stancl/jobpipeline": "^1.0",
         "stancl/virtualcolumn": "^1.0"
     },
     "require-dev": {
-        "laravel/framework": "^8.0|^9.0",
-        "orchestra/testbench": "^6.0|^7.0",
-        "league/flysystem-aws-s3-v3": "^1.0|^3.0",
+        "laravel/framework": "^9.0",
+        "orchestra/testbench": "^7.0",
+        "league/flysystem-aws-s3-v3": "^3.0",
         "doctrine/dbal": "^2.10",
         "spatie/valuestore": "^1.2.5",
         "pestphp/pest": "^1.21"
diff --git a/src/Tenancy.php b/src/Tenancy.php
index c0f655c2..d08e34ce 100644
--- a/src/Tenancy.php
+++ b/src/Tenancy.php
@@ -68,11 +68,13 @@ class Tenancy
 
         event(new Events\EndingTenancy($this));
 
+        // todo find a way to refactor these two methods
+
+        event(new Events\TenancyEnded($this));
+
         $this->tenant = null;
 
         $this->initialized = false;
-
-        event(new Events\TenancyEnded($this));
     }
 
     /** @return TenancyBootstrapper[] */