diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc61273d..314d6e4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,6 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: '8.2' - extensions: imagick, swoole - uses: actions/checkout@v2 - name: Install composer dependencies run: composer install diff --git a/src/Tenancy.php b/src/Tenancy.php index 1acd02ad..98373203 100644 --- a/src/Tenancy.php +++ b/src/Tenancy.php @@ -19,7 +19,7 @@ class Tenancy /** * The current tenant. */ - public (Tenant&Model)|null $tenant = null; + public Tenant|null $tenant = null; // todo docblock public ?Closure $getBootstrappersUsing = null; @@ -111,7 +111,7 @@ class Tenancy /** * Try to find a tenant using an ID. */ - public static function find(int|string $id): (Tenant&Model)|null + public static function find(int|string $id): Tenant|null { $tenant = static::model()->where(static::model()->getTenantKeyName(), $id)->first();