diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 720925c7..a7cbc338 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,8 @@ jobs: matrix: laravel: [ "^6.0", - "^7.0" + "^7.0", + "^8.0" ] steps: diff --git a/composer.json b/composer.json index cdc7d0e8..24aeec7f 100644 --- a/composer.json +++ b/composer.json @@ -11,16 +11,16 @@ ], "require": { "ext-json": "*", - "illuminate/support": "^6.0|^7.0", + "illuminate/support": "^6.0|^7.0|^8.0", "facade/ignition-contracts": "^1.0", "ramsey/uuid": "^3.7|^4.0", "stancl/jobpipeline": "^1.0", "stancl/virtualcolumn": "^1.0" }, "require-dev": { - "vlucas/phpdotenv": "^3.3|^4.0", - "laravel/framework": "^6.0|^7.0", - "orchestra/testbench-browser-kit": "^4.0|^5.0", + "vlucas/phpdotenv": "^3.3|^4.0|^5.0", + "laravel/framework": "^6.0|^7.0|^8.0", + "orchestra/testbench-browser-kit": "^4.0|^5.0|^6.0", "league/flysystem-aws-s3-v3": "~1.0", "doctrine/dbal": "^2.10", "spatie/valuestore": "^1.2" diff --git a/src/Commands/Migrate.php b/src/Commands/Migrate.php index 4f5a19c6..4bf8408c 100644 --- a/src/Commands/Migrate.php +++ b/src/Commands/Migrate.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Stancl\Tenancy\Commands; +use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Database\Console\Migrations\MigrateCommand; use Illuminate\Database\Migrations\Migrator; use Stancl\Tenancy\Concerns\DealsWithMigrations; @@ -25,11 +26,12 @@ class Migrate extends MigrateCommand /** * Create a new command instance. * - * @return void + * @param Migrator $migrator + * @param Dispatcher $dispatcher */ - public function __construct(Migrator $migrator) + public function __construct(Migrator $migrator, Dispatcher $dispatcher) { - parent::__construct($migrator); + parent::__construct($migrator, $dispatcher); $this->setName('tenants:migrate'); $this->specifyParameters(); diff --git a/src/TenancyServiceProvider.php b/src/TenancyServiceProvider.php index 3e4936ef..58ae70f2 100644 --- a/src/TenancyServiceProvider.php +++ b/src/TenancyServiceProvider.php @@ -57,7 +57,7 @@ class TenancyServiceProvider extends ServiceProvider $this->app->bind(Contracts\UniqueIdentifierGenerator::class, $this->app['config']['tenancy.id_generator']); $this->app->singleton(Commands\Migrate::class, function ($app) { - return new Commands\Migrate($app['migrator']); + return new Commands\Migrate($app['migrator'], $app['events']); }); $this->app->singleton(Commands\Rollback::class, function ($app) { return new Commands\Rollback($app['migrator']);