From 4e126846f9c27720f36a2d876c3ab836e5c90c07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel@archte.ch>
Date: Thu, 29 Aug 2024 22:31:08 +0200
Subject: [PATCH] refactor RootUrlBootstrapper

---
 src/Bootstrappers/RootUrlBootstrapper.php | 27 ++++++++++++++---------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/Bootstrappers/RootUrlBootstrapper.php b/src/Bootstrappers/RootUrlBootstrapper.php
index a42b6ae6..c6a04434 100644
--- a/src/Bootstrappers/RootUrlBootstrapper.php
+++ b/src/Bootstrappers/RootUrlBootstrapper.php
@@ -44,17 +44,24 @@ class RootUrlBootstrapper implements TenancyBootstrapper
 
     public function bootstrap(Tenant $tenant): void
     {
-        $shouldRunInTests = ! app()->runningUnitTests() || static::$rootUrlOverrideInTests;
-        $shouldRun = $this->app->runningInConsole() && $shouldRunInTests && static::$rootUrlOverride;
-
-        if ($shouldRun) {
-            $this->originalRootUrl = $this->app['url']->to('/');
-
-            $newRootUrl = (static::$rootUrlOverride)($tenant, $this->originalRootUrl);
-
-            $this->app['url']->forceRootUrl($newRootUrl);
-            $this->config->set('app.url', $newRootUrl);
+        if (static::$rootUrlOverride === null) {
+            return;
         }
+
+        if (! $this->app->runningInConsole()) {
+            return;
+        }
+
+        if (app()->runningUnitTests() && ! static::$rootUrlOverrideInTests) {
+            return;
+        }
+
+        $this->originalRootUrl = $this->app['url']->to('/');
+
+        $newRootUrl = (static::$rootUrlOverride)($tenant, $this->originalRootUrl);
+
+        $this->app['url']->forceRootUrl($newRootUrl);
+        $this->config->set('app.url', $newRootUrl);
     }
 
     public function revert(): void