diff --git a/composer.json b/composer.json index cc213add..0dc9df09 100644 --- a/composer.json +++ b/composer.json @@ -63,6 +63,7 @@ "docker-m1": "ln -s docker-compose-m1.override.yml docker-compose.override.yml", "coverage": "open coverage/phpunit/html/index.html", "phpstan": "vendor/bin/phpstan", + "cs": "php-cs-fixer fix --config=.php-cs-fixer.php", "test": "PHP_VERSION=8.1 ./test --no-coverage", "test-full": "PHP_VERSION=8.1 ./test" }, diff --git a/src/Commands/Down.php b/src/Commands/Down.php index 23598212..96ed5335 100644 --- a/src/Commands/Down.php +++ b/src/Commands/Down.php @@ -11,7 +11,7 @@ class Down extends DownCommand { use HasATenantsOption; - protected $signature = 'tenants:down + protected $signature = 'tenants:down {--redirect= : The path that users should be redirected to} {--retry= : The number of seconds after which the request may be retried} {--refresh= : The number of seconds after which the browser may refresh} @@ -29,7 +29,7 @@ class Down extends DownCommand $payload = $this->getDownDatabasePayload(); // This runs for all tenants if no --tenants are specified - tenancy()->runForMultiple($this->option('tenants'), function ($tenant) use ($payload){ + tenancy()->runForMultiple($this->option('tenants'), function ($tenant) use ($payload) { $this->line("Tenant: {$tenant['id']}"); $tenant->putDownForMaintenance($payload); }); diff --git a/src/Database/Concerns/MaintenanceMode.php b/src/Database/Concerns/MaintenanceMode.php index 44b0a45f..cc4490f6 100644 --- a/src/Database/Concerns/MaintenanceMode.php +++ b/src/Database/Concerns/MaintenanceMode.php @@ -19,7 +19,7 @@ trait MaintenanceMode 'refresh' => $data['refresh'] ?? null, 'secret' => $data['secret'] ?? null, 'status' => $data['status'] ?? 503, - ] + ], ]); } diff --git a/src/Database/DatabaseConfig.php b/src/Database/DatabaseConfig.php index a4c79582..0079b014 100644 --- a/src/Database/DatabaseConfig.php +++ b/src/Database/DatabaseConfig.php @@ -13,7 +13,7 @@ use Stancl\Tenancy\Database\Contracts\TenantWithDatabase as Tenant; class DatabaseConfig { /** The tenant whose database we're dealing with. */ - public Tenant&Model $tenant; + public Tenant & Model $tenant; /** Database username generator (can be set by the developer.) */ public static Closure|null $usernameGenerator = null; diff --git a/src/Events/SyncedResourceSaved.php b/src/Events/SyncedResourceSaved.php index 72d34d16..81caf504 100644 --- a/src/Events/SyncedResourceSaved.php +++ b/src/Events/SyncedResourceSaved.php @@ -10,7 +10,7 @@ use Stancl\Tenancy\Database\Contracts\TenantWithDatabase; class SyncedResourceSaved { - public Syncable&Model $model; + public Syncable & Model $model; /** @var (TenantWithDatabase&Model)|null */ public TenantWithDatabase|null $tenant; diff --git a/src/Jobs/CreateDatabase.php b/src/Jobs/CreateDatabase.php index dbc4b097..5a3a4473 100644 --- a/src/Jobs/CreateDatabase.php +++ b/src/Jobs/CreateDatabase.php @@ -20,7 +20,7 @@ class CreateDatabase implements ShouldQueue use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public function __construct( - protected TenantWithDatabase&Model $tenant, + protected TenantWithDatabase & Model $tenant, ) { } diff --git a/src/Jobs/CreateStorageSymlinks.php b/src/Jobs/CreateStorageSymlinks.php index 2e1db88a..fb9a3b0d 100644 --- a/src/Jobs/CreateStorageSymlinks.php +++ b/src/Jobs/CreateStorageSymlinks.php @@ -18,7 +18,8 @@ class CreateStorageSymlinks implements ShouldQueue public function __construct( public Tenant $tenant, - ) {} + ) { + } public function handle(): void { diff --git a/src/Jobs/DeleteDatabase.php b/src/Jobs/DeleteDatabase.php index 71358f74..56e8acb9 100644 --- a/src/Jobs/DeleteDatabase.php +++ b/src/Jobs/DeleteDatabase.php @@ -19,7 +19,7 @@ class DeleteDatabase implements ShouldQueue use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public function __construct( - protected TenantWithDatabase&Model $tenant, + protected TenantWithDatabase & Model $tenant, ) { } diff --git a/src/Jobs/DeleteDomains.php b/src/Jobs/DeleteDomains.php index 15fff779..bc251b51 100644 --- a/src/Jobs/DeleteDomains.php +++ b/src/Jobs/DeleteDomains.php @@ -15,9 +15,9 @@ class DeleteDomains { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; - protected TenantWithDatabase&Model $tenant; + protected TenantWithDatabase & Model $tenant; - public function __construct(TenantWithDatabase&Model $tenant) + public function __construct(TenantWithDatabase & Model $tenant) { $this->tenant = $tenant; } diff --git a/src/Jobs/MigrateDatabase.php b/src/Jobs/MigrateDatabase.php index 4624f212..120beea4 100644 --- a/src/Jobs/MigrateDatabase.php +++ b/src/Jobs/MigrateDatabase.php @@ -18,7 +18,7 @@ class MigrateDatabase implements ShouldQueue use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public function __construct( - protected TenantWithDatabase&Model $tenant, + protected TenantWithDatabase & Model $tenant, ) { } diff --git a/src/Jobs/SeedDatabase.php b/src/Jobs/SeedDatabase.php index e1bae0c7..03da22db 100644 --- a/src/Jobs/SeedDatabase.php +++ b/src/Jobs/SeedDatabase.php @@ -18,7 +18,7 @@ class SeedDatabase implements ShouldQueue use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; public function __construct( - protected TenantWithDatabase&Model $tenant, + protected TenantWithDatabase & Model $tenant, ) { } diff --git a/src/Tenancy.php b/src/Tenancy.php index 0a8d4542..2260f8e8 100644 --- a/src/Tenancy.php +++ b/src/Tenancy.php @@ -95,7 +95,7 @@ class Tenancy return static::model()->query(); } - public static function model(): Tenant&Model + public static function model(): Tenant & Model { $class = config('tenancy.tenant_model');