From ce8e74e978f4d7e48ac49bd786ed5aeb819fac84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Tue, 12 Mar 2024 16:16:52 +0100 Subject: [PATCH] Remove Laravel 10 from CI matrix --- .github/workflows/ci.yml | 2 -- tests/CommandsTest.php | 3 +-- tests/PrefixCacheBootstrapperTest.php | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1d26494..d1667c60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,6 @@ jobs: strategy: matrix: include: - - laravel: "^10.0" - php: "8.2" - laravel: "^11.0" php: "8.3" diff --git a/tests/CommandsTest.php b/tests/CommandsTest.php index a06238b3..09f13207 100644 --- a/tests/CommandsTest.php +++ b/tests/CommandsTest.php @@ -161,8 +161,7 @@ test('the tenants migrate command uses the schema dump correctly', function (boo // Were created in the tenant database expect(Schema::hasTable('example'))->toBeTrue(); expect(Schema::hasTable('users'))->toBeTrue(); -})->with([true, false]) - ->skip(fn () => str(app()->version())->startsWith('10.'), 'todo@l10 drop laravel 10 support before release'); +})->with([true, false]); test('dump command works', function () { $tenant = Tenant::create(); diff --git a/tests/PrefixCacheBootstrapperTest.php b/tests/PrefixCacheBootstrapperTest.php index f44a939b..45e7ef52 100644 --- a/tests/PrefixCacheBootstrapperTest.php +++ b/tests/PrefixCacheBootstrapperTest.php @@ -74,7 +74,7 @@ test('correct cache prefix is used in all contexts', function () { expect(cache($tenantOnePrefix . 'key'))->toBe('tenantone-value'); expect(cache($tenantTwoPrefix . 'key'))->toBe('tenanttwo-value'); -})->skip(fn () => str(app()->version())->startsWith('10.'), 'todo@l10 drop laravel 10 support before release'); +}); test('cache is persisted when reidentification is used', function () { $tenant1 = Tenant::create(); @@ -148,7 +148,7 @@ test('cache base prefix is customizable', function () { ->toBe(cache()->store('redis2')->getPrefix()) // Non-default store gets prefixed correctly too ->toBe(app('cache')->getPrefix()) ->toBe(app('cache.store')->getPrefix()); -})->skip(fn () => str(app()->version())->startsWith('10.'), 'todo@l10 drop laravel 10 support before release'); +}); test('cache is prefixed correctly when using a repository injected in a singleton', function () { $this->app->singleton(CacheService::class); @@ -280,7 +280,7 @@ test('non default stores get prefixed too when specified in tenantCacheStores', ->toBe(cache()->store('redis2')->getPrefix()); // Non-default store tenancy()->end(); -})->skip(fn () => str(app()->version())->startsWith('10.'), 'todo@l10 drop laravel 10 support before release'); +}); test('cache store prefix generation can be customized', function() { // Use custom prefix generator @@ -302,7 +302,7 @@ test('cache store prefix generation can be customized', function() { ->toBe(app('cache.store')->getPrefix()); tenancy()->end(); -})->skip(fn () => str(app()->version())->startsWith('10.'), 'todo@l10 drop laravel 10 support before release'); +}); test('stores get prefixed using the default way if no prefix generator is specified', function() { $originalPrefix = config('cache.prefix'); @@ -321,4 +321,4 @@ test('stores get prefixed using the default way if no prefix generator is specif ->toBe(cache()->store('redis2')->getPrefix()); tenancy()->end(); -})->skip(fn () => str(app()->version())->startsWith('10.'), 'todo@l10 drop laravel 10 support before release'); +});