From 4baf5d50086ab0f9f39c943ebfc767e03d08b567 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 1 Feb 2019 10:33:21 +0100
Subject: [PATCH] Fix tests

---
 .../tests/Install/DefaultInstallationTest.php | 20 ++++++-------
 .../core/tests/Test/Concerns/CreatesForum.php | 28 +++++++++----------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/framework/core/tests/Install/DefaultInstallationTest.php b/framework/core/tests/Install/DefaultInstallationTest.php
index 02eaf4d2a..7533a9343 100644
--- a/framework/core/tests/Install/DefaultInstallationTest.php
+++ b/framework/core/tests/Install/DefaultInstallationTest.php
@@ -11,6 +11,7 @@
 
 namespace Flarum\Tests\Install;
 
+use Flarum\Install\AdminUser;
 use Flarum\Install\Installation;
 use Flarum\Tests\Test\TestCase;
 use Illuminate\Database\Connectors\ConnectionFactory;
@@ -41,11 +42,9 @@ class DefaultInstallationTest extends TestCase
 
         $this->assertFileExists(base_path('config.php'));
 
-        $admin = $this->getAdmin();
-
         $this->assertEquals(
             $this->getDatabase()->table('users')->find(1)->username,
-            $admin['username']
+            'admin'
         );
     }
 
@@ -53,17 +52,16 @@ class DefaultInstallationTest extends TestCase
     {
         $factory = new ConnectionFactory(app());
 
-        return $factory->make($this->getDatabaseConfiguration());
+        return $factory->make($this->getDatabaseConfiguration()->getConfig());
     }
 
-    private function getAdmin()
+    private function getAdmin(): AdminUser
     {
-        return [
-            'username' => 'admin',
-            'password' => 'password',
-            'password_confirmation' => 'password',
-            'email' => 'admin@example.com',
-        ];
+        return new AdminUser(
+            'admin',
+            'password',
+            'admin@example.com'
+        );
     }
 
     private function getSettings()
diff --git a/framework/core/tests/Test/Concerns/CreatesForum.php b/framework/core/tests/Test/Concerns/CreatesForum.php
index 9046aac0c..6727510c8 100644
--- a/framework/core/tests/Test/Concerns/CreatesForum.php
+++ b/framework/core/tests/Test/Concerns/CreatesForum.php
@@ -19,6 +19,7 @@ use Flarum\Foundation\SiteInterface;
 use Flarum\Foundation\UninstalledSite;
 use Flarum\Http\Server;
 use Flarum\Install\Console\DataProviderInterface;
+use Flarum\Install\DatabaseConfig;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Database\Connectors\MySqlConnector;
 use Illuminate\Database\MySqlConnection;
@@ -73,20 +74,17 @@ trait CreatesForum
         $this->app = $this->site->bootApp();
     }
 
-    protected function getDatabaseConfiguration()
+    protected function getDatabaseConfiguration(): DatabaseConfig
     {
-        return [
-            'driver'    => 'mysql',
-            'host'      => env('DB_HOST', 'localhost'),
-            'database'  => env('DB_DATABASE', 'flarum'),
-            'username'  => env('DB_USERNAME', 'root'),
-            'password'  => env('DB_PASSWORD', ''),
-            'charset'   => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'prefix'    => env('DB_PREFIX', ''),
-            'port'      => '3306',
-            'strict'    => false,
-        ];
+        return new DatabaseConfig(
+            'mysql',
+            env('DB_HOST', 'localhost'),
+            3306,
+            env('DB_DATABASE', 'flarum'),
+            env('DB_USERNAME', 'root'),
+            env('DB_PASSWORD', ''),
+            env('DB_PREFIX', '')
+        );
     }
 
     protected function refreshApplication()
@@ -109,7 +107,7 @@ trait CreatesForum
     {
         return [
             'debug'    => true,
-            'database' => $this->getDatabaseConfiguration(),
+            'database' => $this->getDatabaseConfiguration()->getConfig(),
             'url'      => 'http://flarum.local',
             'paths'    => [
                 'api'   => 'api',
@@ -124,7 +122,7 @@ trait CreatesForum
             return;
         }
 
-        $dbConfig = $this->getDatabaseConfiguration();
+        $dbConfig = $this->getDatabaseConfiguration()->getConfig();
 
         $pdo = (new MySqlConnector)->connect($dbConfig);
         $db = new MySqlConnection($pdo, $dbConfig['database'], $dbConfig['prefix'], $dbConfig);