diff --git a/Changelog b/Changelog index 88d84e3aa..3da96dfa5 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2017-07-14 DariusIII + * Fix: Remove $adapter assignment from install and installtest * Fix: Fix phpunit install test * Fix: Fix phpunit.xml bootstrap.php path * Mrg: Merge dev-laravel-switch branch into dev diff --git a/_install/install_nntmux.php b/_install/install_nntmux.php index 4b9548a5e..f5a2637d0 100644 --- a/_install/install_nntmux.php +++ b/_install/install_nntmux.php @@ -151,17 +151,6 @@ if (env('ADMIN_USER') === '' || env('ADMIN_PASS') === '' || env('ADMIN_EMAIL') = exit(); } -switch (env('DB_SYSTEM')) { - case 'mysql': - $adapter = 'MySql'; - break; - case 'pgsql': - $adapter = 'PostgreSql'; - break; - default: - break; -} - $capsule = new Capsule; // Same as database configuration file of Laravel. $capsule->addConnection([ diff --git a/tests/Install/InstallTest.php b/tests/Install/InstallTest.php index 9a476b9cf..48062c851 100644 --- a/tests/Install/InstallTest.php +++ b/tests/Install/InstallTest.php @@ -186,17 +186,6 @@ class InstallTest extends \PHPUnit\Framework\TestCase exit(); } - switch (env('DB_SYSTEM')) { - case 'mysql': - $adapter = 'MySql'; - break; - case 'pgsql': - $adapter = 'PostgreSql'; - break; - default: - break; - } - $capsule = new Capsule; // Same as database configuration file of Laravel. $capsule->addConnection([