Upgrade to laravel 11

ci.phpunit.xml

@@ -26,11 +26,12 @@
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="APP_KEY" value="Phei9thoong3ai8aqu4ieHie6kee1zee"/>
+        <env name="DB_CONNECTION" value="mysql"/>
         <env name="DB_DATABASE" value="testing"/>
         <env name="IN_CI" value="1"/>
         <env name="LIMIT_UUID_LENGTH_32" value="1"/>
         <env name="MAIL_MAILER" value="log"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="TENANCY_DATABASE_AUTO_DELETE_USER" value="1"/>
         <env name="TENANCY_DATABASE_AUTO_DELETE" value="1"/>
         <env name="TENANCY_DEFAULT_HOSTNAME" value="local.testing"/>

composer.json

@@ -24,15 +24,14 @@
     },
     "require": {
         "php": "^8.0",
-        "doctrine/dbal": "~2.5|~3.0",
         "ramsey/uuid": "^4.0",
-        "laravel/framework": "^9.0|^10.0"
+        "laravel/framework": "^11.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.12",
-        "laravel/laravel": "^9.0|^10.0",
+        "laravel/laravel": "^11.0",
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.0",
         "symfony/dom-crawler": "~3.1"
     },
     "autoload": {

phpunit.xml

@@ -18,11 +18,12 @@
         <env name="APP_ENV" value="testing"/>
         <env name="APP_KEY" value="Phei9thoong3ai8aqu4ieHie6kee1zee"/>
         <env name="DB_DATABASE" value="tenancy"/>
+        <env name="DB_CONNECTION" value="mysql"/>
         <env name="DB_PASSWORD" value=""/>
         <env name="DB_USERNAME" value="root"/>
         <env name="MAIL_MAILER" value="log"/>
         <env name="LIMIT_UUID_LENGTH_32" value="1"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="TENANCY_DATABASE_AUTO_DELETE" value="1"/>
         <env name="TENANCY_DATABASE_AUTO_DELETE_USER" value="1"/>
         <env name="TENANCY_DEFAULT_HOSTNAME" value="local.testing"/>

src/Environment.php

@@ -83,6 +83,10 @@ public function identifyHostname()
 
             return $hostname;
         });
+
+        if ($this->app->resolved(CurrentHostname::class)) {
+            $this->app->make(CurrentHostname::class);
+        }
     }
 
     /**

src/Generators/Webserver/Vhost/ApacheGenerator.php

@@ -39,7 +39,7 @@ public function __construct(Directory $directory)
     public function media(Website $website)
     {
         return $this->directory->setWebsite($website)->isLocal() && $this->directory->exists('media') ?
-            $this->directory->path('media', true) :
+            $this->directory->localPath('media') :
             null;
     }
 

src/Generators/Webserver/Vhost/NginxGenerator.php

@@ -39,7 +39,7 @@ public function __construct(Directory $directory)
     public function media(Website $website)
     {
         return $this->directory->setWebsite($website)->isLocal() && $this->directory->exists('media') ?
-            $this->directory->path('media', true) :
+            $this->directory->localPath('media') :
             null;
     }
 

src/Listeners/Filesystem/LoadsTranslations.php

@@ -40,7 +40,7 @@ class LoadsTranslations extends AbstractTenantDirectoryListener
     public function load(WebsiteEvent $event)
     {
         if ($this->directory()->isLocal()) {
-            $this->readLanguageFiles($this->directory()->path($this->path, true));
+            $this->readLanguageFiles($this->directory()->localPath($this->path));
         } else {
             throw new FilesystemException("$this->path is not available locally, cannot include");
         }

src/Listeners/Filesystem/LoadsViews.php

@@ -43,7 +43,7 @@ public function load(WebsiteEvent $event)
         if ($this->directory()->isLocal()) {
             /** @var Factory views */
             $this->views = app(Factory::class);
-            $this->viewsPath = $this->directory()->path($this->path, true);
+            $this->viewsPath = $this->directory()->localPath($this->path);
 
             $namespace = $this->config->get('tenancy.folders.views.namespace');
 

src/Website/Directory.php

@@ -75,10 +75,9 @@ public function setWebsite(Website $website): Directory
 
     /**
      * @param string $path
-     * @param bool $local
      * @return string
      */
-    public function path(string $path = null, $local = false): string
+    public function path($path = null): string
     {
         $prefix = "{$this->getWebsite()->uuid}/";
 
@@ -90,7 +89,18 @@ public function path(string $path = null, $local = false): string
             $path = "$prefix$path";
         }
 
-        if ($local && $this->isLocal()) {
+        return $path;
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function localPath(string $path = null): string
+    {
+        $path = $this->path($path);
+
+        if ($this->isLocal()) {
             $config = $this->filesystem->getConfig();
             $path = sprintf(
                 "%s/%s",
@@ -102,6 +112,25 @@ public function path(string $path = null, $local = false): string
         return $path;
     }
 
+    public function putFile($path, $file = null, $options = [])
+    {
+        return $this->filesystem->putFile(
+            $this->path($path),
+            $file,
+            $options
+        );
+    }
+
+    public function putFileAs($path, $file, $name = null, $options = [])
+    {
+        return $this->filesystem->putFileAs(
+            $this->path($path),
+            $file,
+            $name,
+            $options
+        );
+    }
+
     /**
      * Get the contents of a file.
      *
@@ -367,7 +396,7 @@ public function isLocal(): bool
     public function __call($name, $arguments)
     {
         if ($this->isLocal() && method_exists($this->local, $name)) {
-            $arguments[0] = $this->path($arguments[0], true);
+            $arguments[0] = $this->localPath($arguments[0]);
 
             return call_user_func_array([$this->local, $name], $arguments);
         }

tests/unit-tests/Commands/RunCommandTest.php

@@ -14,7 +14,7 @@
 
 namespace Hyn\Tenancy\Tests\Commands;
 
-use App\Console\Kernel;
+use Illuminate\Foundation\Console\Kernel;
 use Hyn\Tenancy\Tests\Test;
 use Illuminate\Contracts\Foundation\Application;
 

tests/unit-tests/Commands/SeedCommandTest.php

@@ -49,8 +49,8 @@ public function runs_seed_on_one_tenant()
 
         $this->connection->set($this->website);
 
-        $this->assertFalse($this->connection->get()->getDoctrineSchemaManager()->tablesExist('users'));
-        $this->assertTrue($this->connection->get()->getDoctrineSchemaManager()->tablesExist('samples'));
+        $this->assertFalse($this->connection->get()->getSchemaBuilder()->hasTable('users'));
+        $this->assertTrue($this->connection->get()->getSchemaBuilder()->hasTable('samples'));
 
         $this->assertGreaterThan(
             0,
@@ -87,8 +87,8 @@ public function runs_configured_seed()
 
         $this->connection->set($this->website);
 
-        $this->assertFalse($this->connection->get()->getDoctrineSchemaManager()->tablesExist('users'));
-        $this->assertTrue($this->connection->get()->getDoctrineSchemaManager()->tablesExist('samples'));
+        $this->assertFalse($this->connection->get()->getSchemaBuilder()->hasTable('users'));
+        $this->assertTrue($this->connection->get()->getSchemaBuilder()->hasTable('samples'));
     }
 
     /**
@@ -98,14 +98,14 @@ public function runs_seed_on_tenants()
     {
         $this->connection->set($this->website);
 
-        $this->assertFalse($this->connection->get()->getDoctrineSchemaManager()->tablesExist('samples'));
+        $this->assertFalse($this->connection->get()->getSchemaBuilder()->hasTable('samples'));
 
         $this->migrateAndTest('migrate');
 
         $this->seedAndTest(function (Website $website) {
             $this->connection->set($website);
 
-            $this->assertTrue($this->connection->get()->getDoctrineSchemaManager()->tablesExist('samples'));
+            $this->assertTrue($this->connection->get()->getSchemaBuilder()->hasTable('samples'));
 
             $this->assertEquals(
                 2,

tests/unit-tests/Database/ConnectionTest.php

@@ -14,7 +14,6 @@
 
 namespace Hyn\Tenancy\Tests\Database;
 
-use Doctrine\DBAL\Driver\PDOException;
 use Hyn\Tenancy\Commands\UpdateKeyCommand;
 use Hyn\Tenancy\Contracts\CurrentHostname;
 use Hyn\Tenancy\Environment;
@@ -23,6 +22,7 @@
 use Hyn\Tenancy\Tests\Test;
 use Illuminate\Database\Connection as DatabaseConnection;
 use Illuminate\Support\Str;
+use PDOException;
 
 class ConnectionTest extends Test
 {
@@ -135,16 +135,23 @@ public function can_rotate_tenant_key()
 
         // Re-establish connection and expect 1045 error code (Access denied for user)
         app(Environment::class)->tenant($this->website);
+
+        $hasCaughtException = false;
         try {
             $this->connection->get()->reconnect();
+            $this->connection->get()->getPdo();
         } catch (PDOException $e) {
             $this->assertTrue($e->getCode() === 1045 || $e->getCode() === 7, 'Access should be denied for tenant database user: [code: '.$e->getCode().'] '. $e->getMessage());
+            $hasCaughtException = true;
         }
 
+        $this->assertTrue($hasCaughtException, 'Access should be denied for tenant database user.');
+
         $this->artisan(UpdateKeyCommand::class);
 
         // Re-establish connection after updating tenant users password
         app(Environment::class)->tenant($this->website);
         $this->connection->get()->reconnect();
+        $this->connection->get()->getPdo();
     }
 }

tests/unit-tests/Database/MultiDatabaseTest.php

@@ -17,6 +17,7 @@
 use Hyn\Tenancy\Database\Connection;
 use Hyn\Tenancy\Tests\Test;
 use Illuminate\Contracts\Foundation\Application;
+use PDOException;
 
 class MultiDatabaseTest extends Test
 {
@@ -50,9 +51,7 @@ public function allow_writing_to_secondary_database()
         // make sure the Website model still uses the regular system name.
         $this->assertEquals(app(Connection::class)->systemName(), $this->website->getConnectionName());
 
-        $this->assertTrue(in_array(
-            $this->website->uuid,
-            $this->getConnection('secondary')->getDoctrineSchemaManager()->listDatabases()
-        ));
+        $this->expectException(PDOException::class);
+        $this->getConnection('secondary')->getSchemaBuilder()->createDatabase($this->website->uuid);
     }
 }

tests/unit-tests/Providers/RouteProviderTest.php

@@ -50,7 +50,7 @@ public function overrides_global_route()
     {
         $this->overrideGlobalRoute();
 
-        $this->assertEquals(2, $this->app['router']->getRoutes()->count());
+        $this->assertGreaterThan(1, $this->app['router']->getRoutes()->count());
     }
 
     /**