Fix phpunit install test

This commit is contained in:
DariusIII
2017-07-14 23:54:29 +02:00
parent 1062b5f7db
commit 077e4d6555
2 changed files with 21 additions and 23 deletions
+20 -23
View File
@@ -5,10 +5,10 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* @package NNTmux
* @author DariusIII
* @package NNTmux
* @author DariusIII
* @copyright (c) 2017, NNTmux
* @version 0.0.1
* @version 0.0.1
*/
namespace tests;
@@ -22,6 +22,7 @@ use nntmux\db\DB;
use nntmux\db\DbUpdate;
use nntmux\ColorCLI;
use nntmux\Users;
use Illuminate\Database\Capsule\Manager as Capsule;
/**
* Class InstallTest
@@ -196,26 +197,22 @@ class InstallTest extends \PHPUnit\Framework\TestCase
break;
}
if ($adapter !== null) {
if (empty(env('DB_SOCKET'))) {
$host = empty(env('DB_PORT')) ? env('DB_HOST') : env('DB_HOST') . ':' . env('DB_PORT');
} else {
$host = env('DB_SOCKET');
}
\lithium\data\Connections::add('default',
[
'type' => 'database',
'adapter' => $adapter,
'host' => $host,
'login' => env('DB_USER'),
'password' => env('DB_PASSWORD'),
'database' => env('DB_NAME'),
'encoding' => 'UTF-8',
'persistent' => false,
]
);
}
$capsule = new Capsule;
// Same as database configuration file of Laravel.
$capsule->addConnection([
'driver' => env('DB_SYSTEM'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_NAME', 'nntmux'),
'username' => env('DB_USER', 'root'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'strict' => false
], 'default'
);
$capsule->bootEloquent();
$user = new Users();
if (!$user->isValidUsername(env('ADMIN_USER'))) {