Merge branch 'master' of https://github.com/archtechx/tenancy into stein-j-readied-tenant

tests/AutomaticModeTest.php

@@ -107,12 +107,12 @@ function contextIsSwitchedWhenTenancyInitialized()
 
 class MyBootstrapper implements TenancyBootstrapper
 {
-    public function bootstrap(\Stancl\Tenancy\Contracts\Tenant $tenant)
+    public function bootstrap(\Stancl\Tenancy\Contracts\Tenant $tenant): void
     {
         app()->instance('tenancy_initialized_for_tenant', $tenant->getTenantKey());
     }
 
-    public function revert()
+    public function revert(): void
     {
         app()->instance('tenancy_ended', true);
     }

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()
 {

tests/BootstrapperTest.php

@@ -332,10 +332,6 @@ function getDiskPrefix(string $disk): string
     $disk = Storage::disk($disk);
     $adapter = $disk->getAdapter();
 
-    if (! Str::startsWith(app()->version(), '9.')) {
-        return $adapter->getPathPrefix();
-    }
-
      $prefixer = (new ReflectionObject($adapter))->getProperty('prefixer');
      $prefixer->setAccessible(true);
 

tests/CachedTenantResolverTest.php

@@ -6,9 +6,7 @@ use Illuminate\Support\Facades\DB;
 use Stancl\Tenancy\Resolvers\DomainTenantResolver;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 
-afterEach(function () {
-    DomainTenantResolver::$shouldCache = false;
-});
+// todo@v4 test this with other resolvers as well?
 
 test('tenants can be resolved using the cached resolver', function () {
     $tenant = Tenant::create();
@@ -27,14 +25,14 @@ test('the underlying resolver is not touched when using the cached resolver', fu
 
     DB::enableQueryLog();
 
-    DomainTenantResolver::$shouldCache = false;
+    config(['tenancy.identification.resolvers.' . DomainTenantResolver::class . '.cache' => false]);
 
     expect($tenant->is(app(DomainTenantResolver::class)->resolve('acme')))->toBeTrue();
     DB::flushQueryLog();
     expect($tenant->is(app(DomainTenantResolver::class)->resolve('acme')))->toBeTrue();
     pest()->assertNotEmpty(DB::getQueryLog()); // not empty
 
-    DomainTenantResolver::$shouldCache = true;
+    config(['tenancy.identification.resolvers.' . DomainTenantResolver::class . '.cache' => true]);
 
     expect($tenant->is(app(DomainTenantResolver::class)->resolve('acme')))->toBeTrue();
     DB::flushQueryLog();
@@ -50,7 +48,7 @@ test('cache is invalidated when the tenant is updated', function () {
 
     DB::enableQueryLog();
 
-    DomainTenantResolver::$shouldCache = true;
+    config(['tenancy.identification.resolvers.' . DomainTenantResolver::class . '.cache' => true]);
 
     expect($tenant->is(app(DomainTenantResolver::class)->resolve('acme')))->toBeTrue();
     DB::flushQueryLog();
@@ -74,7 +72,7 @@ test('cache is invalidated when a tenants domain is changed', function () {
 
     DB::enableQueryLog();
 
-    DomainTenantResolver::$shouldCache = true;
+    config(['tenancy.identification.resolvers.' . DomainTenantResolver::class . '.cache' => true]);
 
     expect($tenant->is(app(DomainTenantResolver::class)->resolve('acme')))->toBeTrue();
     DB::flushQueryLog();

tests/PathIdentificationTest.php

@@ -10,8 +10,6 @@ use Stancl\Tenancy\Resolvers\PathTenantResolver;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 
 beforeEach(function () {
-    PathTenantResolver::$tenantParameterName = 'tenant';
-
     Route::group([
         'prefix' => '/{tenant}',
         'middleware' => InitializeTenancyByPath::class,
@@ -26,11 +24,6 @@ beforeEach(function () {
     });
 });
 
-afterEach(function () {
-    // Global state cleanup
-    PathTenantResolver::$tenantParameterName = 'tenant';
-});
-
 test('tenant can be identified by path', function () {
     Tenant::create([
         'id' => 'acme',
@@ -101,7 +94,7 @@ test('an exception is thrown when the routes first parameter is not tenant', fun
 });
 
 test('tenant parameter name can be customized', function () {
-    PathTenantResolver::$tenantParameterName = 'team';
+    config(['tenancy.identification.resolvers.' . PathTenantResolver::class . '.tenant_parameter_name' => 'team']);
 
     Route::group([
         'prefix' => '/{team}',

tests/SingleDatabaseTenancyTest.php

@@ -13,8 +13,6 @@ use Stancl\Tenancy\Database\Concerns\HasScopedValidationRules;
 use Stancl\Tenancy\Tests\Etc\Tenant as TestTenant;
 
 beforeEach(function () {
-    BelongsToTenant::$tenantIdColumn = 'tenant_id';
-
     Schema::create('posts', function (Blueprint $table) {
         $table->increments('id');
         $table->string('text');
@@ -144,7 +142,7 @@ test('tenant id is not auto added when creating primary resources in central con
 });
 
 test('tenant id column name can be customized', function () {
-    BelongsToTenant::$tenantIdColumn = 'team_id';
+    config(['tenancy.single_db.tenant_id_column' => 'team_id']);
 
     Schema::drop('comments');
     Schema::drop('posts');

tests/TenantAssetTest.php

@@ -6,10 +6,8 @@ use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Storage;
 use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper;
-use Stancl\Tenancy\Controllers\TenantAssetsController;
 use Stancl\Tenancy\Events\TenancyInitialized;
 use Stancl\Tenancy\Listeners\BootstrapTenancy;
-use Stancl\Tenancy\Middleware\InitializeTenancyByDomain;
 use Stancl\Tenancy\Middleware\InitializeTenancyByRequestData;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 
@@ -21,13 +19,8 @@ beforeEach(function () {
     Event::listen(TenancyInitialized::class, BootstrapTenancy::class);
 });
 
-afterEach(function () {
-    // Cleanup
-    TenantAssetsController::$tenancyMiddleware = InitializeTenancyByDomain::class;
-});
-
 test('asset can be accessed using the url returned by the tenant asset helper', function () {
-    TenantAssetsController::$tenancyMiddleware = InitializeTenancyByRequestData::class;
+    config(['tenancy.identification.default_middleware' => InitializeTenancyByRequestData::class]);
 
     $tenant = Tenant::create();
     tenancy()->initialize($tenant);
@@ -95,7 +88,7 @@ test('asset helper tenancy can be disabled', function () {
 });
 
 test('test asset controller returns a 404 when no path is provided', function () {
-    TenantAssetsController::$tenancyMiddleware = InitializeTenancyByRequestData::class;
+    config(['tenancy.identification.default_middleware' => InitializeTenancyByRequestData::class]);
 
     $tenant = Tenant::create();
 

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);

tests/TestCase.php

@@ -103,7 +103,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
                 '--realpath' => true,
                 '--force' => true,
             ],
-            'tenancy.bootstrappers.redis' => RedisTenancyBootstrapper::class, // todo0 change this to []? two tests in TenantDatabaseManagerTest are failing with that
+            'tenancy.bootstrappers.redis' => RedisTenancyBootstrapper::class, // todo1 change this to []? two tests in TenantDatabaseManagerTest are failing with that
             'queue.connections.central' => [
                 'driver' => 'sync',
                 'central' => true,