archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 15:14:04 +00:00
Code Activity

drop laravel < 9 support

Browse source
This commit is contained in:
Samuel Štancl 2023-02-16 11:55:23 +01:00
parent eca3b79118
commit 89c5029fd6
7 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
ARG PHP_VERSION=7.4 ARG PHP_VERSION=8.1
ARG PHP_TARGET=php:${PHP_VERSION}-cli ARG PHP_TARGET=php:${PHP_VERSION}-cli
FROM ${PHP_TARGET} FROM ${PHP_TARGET}

21
composer.json
View file

@ -13,17 +13,17 @@
"php": "^8.0", "php": "^8.0",
"ext-json": "*", "ext-json": "*",
"illuminate/support": "^9.0|^10.0", "illuminate/support": "^9.0|^10.0",
"facade/ignition-contracts": "^1.0", "facade/ignition-contracts": "^1.0.2",
"ramsey/uuid": "^3.7|^4.0", "ramsey/uuid": "^4.7.3",
"stancl/jobpipeline": "^1.0", "stancl/jobpipeline": "^1.6.2",
"stancl/virtualcolumn": "^1.0" "stancl/virtualcolumn": "^1.3.1"
}, },
"require-dev": { "require-dev": {
"laravel/framework": "^9.0|^10.0", "laravel/framework": "^9.0|^10.0",
"orchestra/testbench": "^7.0|^8.0", "orchestra/testbench": "^7.0|^8.0",
"league/flysystem-aws-s3-v3": "^1.0|^3.0", "league/flysystem-aws-s3-v3": "^3.12.2",
"doctrine/dbal": "^2.10", "doctrine/dbal": "^2.13.9",
"spatie/valuestore": "^1.2.5" "spatie/valuestore": "^1.3.2"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -50,5 +50,10 @@
} }
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"prefer-stable": true "prefer-stable": true,
"config": {
"allow-plugins": {
"pestphp/pest-plugin": true
}
}
} }

3
src/Bootstrappers/QueueTenancyBootstrapper.php
View file

@ -63,14 +63,11 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
static::initializeTenancyForQueue($event->job->payload()['tenant_id'] ?? null); 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) { $dispatcher->listen(JobRetryRequested::class, function ($event) use (&$previousTenant) {
$previousTenant = tenant(); $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 // If we're running tests, we make sure to clean up after any artisan('queue:work') calls
$revertToPreviousState = function ($event) use (&$previousTenant, $runningTests) { $revertToPreviousState = function ($event) use (&$previousTenant, $runningTests) {

4
src/TenantDatabaseManagers/PostgreSQLSchemaManager.php
View file

@ -46,11 +46,7 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager
public function makeConnectionConfig(array $baseConfig, string $databaseName): array public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{ {
if (version_compare(app()->version(), '9.0', '>=')) {
$baseConfig['search_path'] = $databaseName; $baseConfig['search_path'] = $databaseName;
} else {
$baseConfig['schema'] = $databaseName;
}
return $baseConfig; return $baseConfig;
} }

4
tests/BootstrapperTest.php
View file

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

4
tests/Features/ViteBundlerTest.php
View file

@ -12,10 +12,6 @@ class ViteBundlerTest extends TestCase
/** @test */ /** @test */
public function the_vite_helper_uses_our_custom_class() public function the_vite_helper_uses_our_custom_class()
{ {
if (version_compare(app()->version(), '9.0', '<')) {
$this->markTestSkipped('Vite is only used in Laravel 9+');
}
$vite = app(\Illuminate\Foundation\Vite::class); $vite = app(\Illuminate\Foundation\Vite::class);
$this->assertInstanceOf(\Illuminate\Foundation\Vite::class, $vite); $this->assertInstanceOf(\Illuminate\Foundation\Vite::class, $vite);

4
tests/TenantDatabaseManagerTest.php
View file

@ -194,9 +194,7 @@ class TenantDatabaseManagerTest extends TestCase
]); ]);
tenancy()->initialize($tenant); tenancy()->initialize($tenant);
$schemaConfig = version_compare(app()->version(), '9.0', '>=') ? $schemaConfig = config('database.connections.' . config('database.default') . '.search_path');
config('database.connections.' . config('database.default') . '.search_path') :
config('database.connections.' . config('database.default') . '.schema');
$this->assertSame($tenant->database()->getName(), $schemaConfig); $this->assertSame($tenant->database()->getName(), $schemaConfig);
$this->assertSame($originalDatabaseName, config(['database.connections.pgsql.database'])); $this->assertSame($originalDatabaseName, config(['database.connections.pgsql.database']));