From 44d6509691aed69f54d1bcebc1c9e08888347c46 Mon Sep 17 00:00:00 2001
From: Mark <14284867+xHeaven@users.noreply.github.com>
Date: Sun, 29 Dec 2024 09:15:13 +0100
Subject: [PATCH] Use nullsafe operator

---
 src/Bootstrappers/QueueTenancyBootstrapper.php | 2 +-
 src/helpers.php                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bootstrappers/QueueTenancyBootstrapper.php b/src/Bootstrappers/QueueTenancyBootstrapper.php
index 577e90d1..16ae043b 100644
--- a/src/Bootstrappers/QueueTenancyBootstrapper.php
+++ b/src/Bootstrappers/QueueTenancyBootstrapper.php
@@ -128,7 +128,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
         }
 
         // Revert back to the previous tenant
-        if (tenant() && $previousTenant && $previousTenant->isNot(tenant())) {
+        if (tenant() && $previousTenant?->isNot(tenant())) {
             tenancy()->initialize($previousTenant);
         }
 
diff --git a/src/helpers.php b/src/helpers.php
index 91d55910..5794a000 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -30,7 +30,7 @@ if (! function_exists('tenant')) {
             return app(Tenant::class);
         }
 
-        return optional(app(Tenant::class))->getAttribute($key) ?? null;
+        return app(Tenant::class)?->getAttribute($key);
     }
 }