diff --git a/src/Commands/Run.php b/src/Commands/Run.php index d3435ca2..9b482682 100644 --- a/src/Commands/Run.php +++ b/src/Commands/Run.php @@ -16,9 +16,7 @@ class Run extends Command protected $description = 'Run a command for tenant(s)'; - protected $signature = 'tenants:run {commandname : The artisan command.} - {--tenants=* : The tenant(s) to run the command for. Default: all} - {--skip-tenants=* : The tenant(s) to skip}'; + protected $signature = 'tenants:run {commandname : The artisan command.}'; public function handle(): int { diff --git a/src/Commands/Seed.php b/src/Commands/Seed.php index 5cf468e9..5b9db3c4 100644 --- a/src/Commands/Seed.php +++ b/src/Commands/Seed.php @@ -16,11 +16,21 @@ class Seed extends SeedCommand protected $description = 'Seed tenant database(s).'; - protected $name = 'tenants:seed'; - public function __construct(ConnectionResolverInterface $resolver) { - parent::__construct($resolver); + // See https://github.com/archtechx/tenancy/issues/1474 + if (version_compare(app()->version(), '13.24.0', '>=')) { + $this->signature = 'tenants:seed + {class? : The class name of the root seeder} + {--class=Database\\Seeders\\DatabaseSeeder : The class name of the root seeder} + {--database= : The database connection to seed} + {--force : Force the operation to run when in production}'; + parent::__construct($resolver); + $this->specifyParameters(); + } else { + $this->name = 'tenants:seed'; + parent::__construct($resolver); + } } public function handle(): int diff --git a/src/Concerns/HasTenantOptions.php b/src/Concerns/HasTenantOptions.php index b10d7bd4..d89f2088 100644 --- a/src/Concerns/HasTenantOptions.php +++ b/src/Concerns/HasTenantOptions.php @@ -55,9 +55,9 @@ trait HasTenantOptions }); } - public function __construct() + public function __construct(mixed ...$args) { - parent::__construct(); + parent::__construct(...$args); $this->specifyParameters(); } diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php index 23d1ffab..30baa5ce 100644 --- a/src/TenancyServiceProvider.php +++ b/src/TenancyServiceProvider.php @@ -103,7 +103,7 @@ class TenancyServiceProvider extends ServiceProvider $config['connection'] ??= $centralConnection; /** @var CacheManager $this */ - return $this->createDatabaseDriver($config); // @phpstan-ignore method.protected + return $this->createDatabaseDriver($config); }); // DatabaseCacheBootstrapper explicitly writes 'tenant' into each store's 'connection'