mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-11 02:44:04 +02:00
Code Issues Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Franz Liedke
2019-02-01 10:33:21 +01:00
parent ed9591c16f
commit af185fd3d1
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/Test/Concerns/CreatesForum.php
View File

@@ -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);