Merge 3.x into master

.github/workflows/ci.yml

@@ -15,7 +15,11 @@ jobs:
 
     strategy:
       matrix:
-        laravel: ['^9.0']
+        include:
+        - laravel: 9
+          php: "8.0"
+        - laravel: 10
+          php: "8.1"
 
     steps:
       - name: Checkout

assets/config.php

@@ -258,7 +258,7 @@ return [
     ],
 
     /**
-     * Redis tenancy config. Used by RedisTenancyBoostrapper.
+     * Redis tenancy config. Used by RedisTenancyBootstrapper.
      *
      * Note: You need phpredis to use Redis tenancy.
      *
@@ -286,6 +286,7 @@ return [
         // Stancl\Tenancy\Features\TelescopeTags::class,
         // Stancl\Tenancy\Features\TenantConfig::class, // https://tenancyforlaravel.com/docs/v3/features/tenant-config
         // Stancl\Tenancy\Features\CrossDomainRedirect::class, // https://tenancyforlaravel.com/docs/v3/features/cross-domain-redirect
+        // Stancl\Tenancy\Features\ViteBundler::class,
     ],
 
     /**

composer.json

@@ -17,18 +17,19 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "illuminate/support": "^9.38",
+        "illuminate/support": "^9.38|^10.0",
         "spatie/ignition": "^1.4",
-        "ramsey/uuid": "^4.0",
-        "stancl/jobpipeline": "^1.0",
-        "stancl/virtualcolumn": "^1.3"
+        "ramsey/uuid": "^4.7.3",
+        "stancl/jobpipeline": "^1.6.2",
+        "stancl/virtualcolumn": "^1.3.1",
+        "facade/ignition-contracts": "^1.0.2"
     },
     "require-dev": {
-        "laravel/framework": "^9.38",
-        "orchestra/testbench": "^7.0",
-        "league/flysystem-aws-s3-v3": "^3.0",
-        "doctrine/dbal": "^2.10",
-        "spatie/valuestore": "^1.2.5",
+        "laravel/framework": "^9.38|^10.0",
+        "orchestra/testbench": "^7.0|^8.0",
+        "league/flysystem-aws-s3-v3": "^3.12.2",
+        "doctrine/dbal": "^3.6.0",
+        "spatie/valuestore": "^1.3.2",
         "pestphp/pest": "^1.21",
         "nunomaduro/larastan": "^2.4",
         "spatie/invade": "^1.1"

phpunit.xml

@@ -1,39 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <file>./src/routes.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_KEY" value="base64:uYVmTs9lrQbXWfHgSSiG0VZMjc2KG/fBbjV1i1JDVos="/>
-        <env name="BCRYPT_ROUNDS" value="4"/>
-        <env name="CACHE_DRIVER" value="redis"/>
-        <env name="MAIL_DRIVER" value="array"/>
-        <env name="QUEUE_CONNECTION" value="sync"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="DB_CONNECTION" value="central"/>
-        <env name="AWS_DEFAULT_REGION" value="us-west-2"/>
-    </php>
-    <logging>
-        <log type="coverage-clover" target="coverage/phpunit/clover.xml" showUncoveredFiles="true"/>
-        <log type="coverage-html" target="coverage/phpunit/html" lowUpperBound="35" highLowerBound="70"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <file>./src/routes.php</file>
+      <file>./src/Vite.php</file>
+    </exclude>
+    <report>
+      <clover outputFile="coverage/phpunit/clover.xml"/>
+      <html outputDirectory="coverage/phpunit/html" lowUpperBound="35" highLowerBound="70"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Unit">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="APP_KEY" value="base64:uYVmTs9lrQbXWfHgSSiG0VZMjc2KG/fBbjV1i1JDVos="/>
+    <env name="BCRYPT_ROUNDS" value="4"/>
+    <env name="CACHE_DRIVER" value="redis"/>
+    <env name="MAIL_DRIVER" value="array"/>
+    <env name="QUEUE_CONNECTION" value="sync"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="DB_CONNECTION" value="central"/>
+    <env name="AWS_DEFAULT_REGION" value="us-west-2"/>
+  </php>
+  <logging/>
 </phpunit>

src/Database/Models/Tenant.php

@@ -32,6 +32,8 @@ class Tenant extends Model implements Contracts\Tenant
         Concerns\InitializationHelpers,
         Concerns\InvalidatesResolverCache;
 
+    protected static $modelsShouldPreventAccessingMissingAttributes = false;
+
     protected $table = 'tenants';
     protected $primaryKey = 'id';
     protected $guarded = [];

src/Database/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php

@@ -41,7 +41,8 @@ class PermissionControlledMySQLDatabaseManager extends MySQLDatabaseManager impl
 
     protected function isVersion8(): bool
     {
-        $version = $this->database()->select($this->database()->raw('select version()'))[0]->{'version()'};
+        $versionSelect = $this->database()->raw('select version()')->getValue($this->database()->getQueryGrammar());
+        $version = $this->database()->select($versionSelect)[0]->{'version()'};
 
         return version_compare($version, '8.0.0') >= 0;
     }

src/Features/ViteBundler.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Features;
+
+use Illuminate\Foundation\Application;
+use Stancl\Tenancy\Contracts\Feature;
+use Stancl\Tenancy\Tenancy;
+use Stancl\Tenancy\Vite;
+
+class ViteBundler implements Feature
+{
+    /** @var Application */
+    protected $app;
+
+    public function __construct(Application $app)
+    {
+        $this->app = $app;
+    }
+
+    public function bootstrap(Tenancy $tenancy): void
+    {
+        $this->app->singleton(\Illuminate\Foundation\Vite::class, Vite::class);
+    }
+}

src/TenancyServiceProvider.php

@@ -62,6 +62,7 @@ class TenancyServiceProvider extends ServiceProvider
         $this->app->singleton(Commands\Rollback::class, function ($app) {
             return new Commands\Rollback($app['migrator']);
         });
+
         $this->app->singleton(Commands\Seed::class, function ($app) {
             return new Commands\Seed($app['db']);
         });

src/Vite.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Stancl\Tenancy;
+
+use Illuminate\Foundation\Vite as BaseVite;
+
+class Vite extends BaseVite // todo move to a different directory in v4
+{
+    /**
+     * Generate an asset path for the application.
+     *
+     * @param  string  $path
+     * @param  bool|null  $secure
+     * @return string
+     */
+    protected function assetPath($path, $secure = null)
+    {
+        return global_asset($path);
+    }
+}

tests/EventListenerTest.php

@@ -79,7 +79,7 @@ test('ing events can be used to cancel db creation', function () {
     });
 
     $tenant = Tenant::create();
-    dispatch_now(new CreateDatabase($tenant));
+    dispatch_sync(new CreateDatabase($tenant));
 
     pest()->assertFalse($tenant->database()->manager()->databaseExists(
         $tenant->database()->getName()
@@ -171,12 +171,13 @@ test('database is not migrated if creation is disabled', function () {
         })->toListener()
     );
 
-    Tenant::create([
+    $tenant = Tenant::create([
         'tenancy_create_database' => false,
         'tenancy_db_name' => 'already_created',
     ]);
 
-    expect(pest()->hasFailed())->toBeFalse();
+    // Assert test didn't fail
+    $this->assertTrue($tenant->exists());
 });
 
 class FooListener extends QueueableListener