From 34d3189d61e8209fea9e27890b04adb6c5c2d731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Sun, 28 Jun 2020 14:30:34 +0200
Subject: [PATCH] Queue bootstrapper use tenancy() state

---
 src/Bootstrappers/QueueTenancyBootstrapper.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Bootstrappers/QueueTenancyBootstrapper.php b/src/Bootstrappers/QueueTenancyBootstrapper.php
index 5923928d..42d2e0e2 100644
--- a/src/Bootstrappers/QueueTenancyBootstrapper.php
+++ b/src/Bootstrappers/QueueTenancyBootstrapper.php
@@ -15,8 +15,6 @@ use Stancl\Tenancy\Contracts\Tenant;
 
 class QueueTenancyBootstrapper implements TenancyBootstrapper
 {
-    public $tenancyInitialized = false;
-
     /** @var Repository */
     protected $config;
 
@@ -47,7 +45,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
             $tenantId = $event->job->payload()['tenant_id'] ?? null;
 
             // The job is not tenant-aware
-            if (! $tenantId) {
+            if (!$tenantId) {
                 return;
             }
 
@@ -66,7 +64,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
     {
         $bootstrapper = &$this;
 
-        if (! $this->queue instanceof QueueFake) {
+        if (!$this->queue instanceof QueueFake) {
             $this->queue->createPayloadUsing(function ($connection) use (&$bootstrapper) {
                 return $bootstrapper->getPayload($connection);
             });
@@ -75,17 +73,17 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
 
     public function bootstrap(Tenant $tenant)
     {
-        $this->tenancyInitialized = true;
+        //
     }
 
     public function revert()
     {
-        $this->tenancyInitialized = false;
+        //
     }
 
     public function getPayload(string $connection)
     {
-        if (! $this->tenancyInitialized) {
+        if (! tenancy()->initialized) {
             return [];
         }