From fa09e3a0839e3d8a68d7eb85d69f514694e857ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Thu, 29 Sep 2022 16:02:08 +0200
Subject: [PATCH] remove version checks

---
 src/Bootstrappers/QueueTenancyBootstrapper.php | 11 ++++-------
 tests/BatchTest.php                            |  4 ++--
 tests/TenantDatabaseManagerTest.php            |  4 +---
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Bootstrappers/QueueTenancyBootstrapper.php b/src/Bootstrappers/QueueTenancyBootstrapper.php
index 2f859ecd..43b9dd20 100644
--- a/src/Bootstrappers/QueueTenancyBootstrapper.php
+++ b/src/Bootstrappers/QueueTenancyBootstrapper.php
@@ -62,14 +62,11 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
             static::initializeTenancyForQueue($event->job->payload()['tenant_id'] ?? null);
         });
 
-        if (version_compare(app()->version(), '8.64', '>=')) {
-            // JobRetryRequested only exists since Laravel 8.64
-            $dispatcher->listen(JobRetryRequested::class, function ($event) use (&$previousTenant) {
-                $previousTenant = tenant();
+        $dispatcher->listen(JobRetryRequested::class, function ($event) use (&$previousTenant) {
+            $previousTenant = tenant();
 
-                static::initializeTenancyForQueue($event->payload()['tenant_id'] ?? null);
-            });
-        }
+            static::initializeTenancyForQueue($event->payload()['tenant_id'] ?? null);
+        });
 
         // If we're running tests, we make sure to clean up after any artisan('queue:work') calls
         $revertToPreviousState = function ($event) use (&$previousTenant, $runningTests) {
diff --git a/tests/BatchTest.php b/tests/BatchTest.php
index a168deb2..629a4e61 100644
--- a/tests/BatchTest.php
+++ b/tests/BatchTest.php
@@ -30,13 +30,13 @@ test('batch repository is set to tenant connection and reverted', function () {
 
     tenancy()->initialize($tenant);
     expect(getBatchRepositoryConnectionName())->toBe('tenant');
-    
+
     tenancy()->initialize($tenant2);
     expect(getBatchRepositoryConnectionName())->toBe('tenant');
 
     tenancy()->end();
     expect(getBatchRepositoryConnectionName())->toBe('central');
-})->skip(fn() => version_compare(app()->version(), '8.0', '<'), 'Job batches are only supported in Laravel 8+');
+});
 
 function getBatchRepositoryConnectionName()
 {
diff --git a/tests/TenantDatabaseManagerTest.php b/tests/TenantDatabaseManagerTest.php
index d6a5b369..b16c06b6 100644
--- a/tests/TenantDatabaseManagerTest.php
+++ b/tests/TenantDatabaseManagerTest.php
@@ -154,9 +154,7 @@ test('schema manager uses schema to separate tenant dbs', function () {
     ]);
     tenancy()->initialize($tenant);
 
-    $schemaConfig = version_compare(app()->version(), '9.0', '>=') ?
-        config('database.connections.' . config('database.default') . '.search_path') :
-        config('database.connections.' . config('database.default') . '.schema');
+    $schemaConfig = config('database.connections.' . config('database.default') . '.search_path');
 
     expect($schemaConfig)->toBe($tenant->database()->getName());
     expect(config(['database.connections.pgsql.database']))->toBe($originalDatabaseName);