mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-16 06:16:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 1236-database-changes

Browse Source
This commit is contained in:
Daniël Klabbers
2018-06-03 21:51:01 +02:00
parent c293fdaec0 3ec32f8430
commit 26b02adc9d
40 changed files with 221 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Api/Controller/ApiControllerTestCase.php
View File

@ -11,16 +11,16 @@
namespace Flarum\Tests\Api\Controller;
use Flarum\Http\Controller\ControllerInterface;
use Flarum\Tests\Test\TestCase;
use Flarum\User\User;
use Illuminate\Support\Arr;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Server\RequestHandlerInterface;
abstract class ApiControllerTestCase extends TestCase
{
/**
* @var ControllerInterface
* @var RequestHandlerInterface
*/
protected $controller;

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

@ -75,9 +75,10 @@ trait CreatesForum
$data->setSetting('mail_driver', 'log');
$database = $data->getDatabaseConfiguration();
$database['database'] = env('DB_DATABASE', 'flarum');
$database['username'] = env('DB_USERNAME', 'root');
$database['password'] = env('DB_PASSWORD', '');
$database['host'] = env('DB_HOST', $database['host']);
$database['database'] = env('DB_DATABASE', $database['database']);
$database['username'] = env('DB_USERNAME', $database['username']);
$database['password'] = env('DB_PASSWORD', $database['password']);
$data->setDatabaseConfiguration($database);
$this->configuration = $data;