From fa5c9a9e1c67f562226ff21da0371fed6d7924ae Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 20 Dec 2018 14:20:42 +0100 Subject: [PATCH] BC! Update database configuration and unify env settings(DB_NAME => DB_DATABASE, DB_USER => DB_USERNAME) and remove unused settings --- .env.example | 8 +++----- .env.scrutinizer | 8 +++----- .env.travis | 7 +++---- Changelog | 3 ++- config/database.php | 6 +++--- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.env.example b/.env.example index 068bdcde3..c3859a81c 100644 --- a/.env.example +++ b/.env.example @@ -1,12 +1,10 @@ -DB_CONNECTION=nntmux -DB_SYSTEM=mysql +DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_PORT=3306 DB_SOCKET= -DB_USER= +DB_USERNAME= DB_PASSWORD= -DB_NAME=nntmux -DB_PCONNECT=false +DB_DATABASE=nntmux NNTP_USERNAME= NNTP_PASSWORD= diff --git a/.env.scrutinizer b/.env.scrutinizer index ee1002651..0e6e7ed32 100644 --- a/.env.scrutinizer +++ b/.env.scrutinizer @@ -1,12 +1,10 @@ -DB_CONNECTION=nntmux -DB_SYSTEM = mysql +DB_CONNECTION=mysql DB_HOST = localhost DB_PORT = 3306 DB_SOCKET = -DB_USER = root +DB_USERNAME = root DB_PASSWORD = -DB_NAME = scrutinizer -DB_PCONNECT = false +DB_DATABASE = scrutinizer NNTP_USERNAME = NNTP_PASSWORD = diff --git a/.env.travis b/.env.travis index 2342217d3..20e87228b 100644 --- a/.env.travis +++ b/.env.travis @@ -1,11 +1,10 @@ -DB_SYSTEM = mysql +DB_CONNECTION=mysql DB_HOST = localhost DB_PORT = 3306 DB_SOCKET = -DB_USER = TEST +DB_USERNAME = TEST DB_PASSWORD = TEST -DB_NAME = TEST -DB_PCONNECT = false +DB_DATABASE = TEST NNTP_USERNAME = NNTP_PASSWORD = diff --git a/Changelog b/Changelog index 95dcb10c5..485744f92 100755 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ 2018-12-20 DariusIII - * Chg: BC remove nntmux and edit mysql database connection, make mysql default connection + * Chg: BC! Update database configuration and unify env settings(DB_NAME => DB_DATABASE, DB_USER => DB_USERNAME) and remove unused settings + * Chg: BC! Remove nntmux and edit mysql database connection, make mysql default connection * Chg: Add used branch to tmux output * Fix: Fix wrong class used in TmuxOutput class _getHeader function * Chg: Update TmuxOutput _getHeader function diff --git a/config/database.php b/config/database.php index f5f0a16ae..82136edc3 100644 --- a/config/database.php +++ b/config/database.php @@ -40,11 +40,11 @@ return [ ], 'mysql' => [ - 'driver' => env('DB_SYSTEM', 'mysql'), + 'driver' => 'mysql', 'host' => env('DB_HOST', '127.0.0.1'), 'port' => env('DB_PORT', '3306'), - 'database' => env('DB_NAME', 'nntmux'), - 'username' => env('DB_USER', 'nntmux'), + 'database' => env('DB_DATABASE', 'nntmux'), + 'username' => env('DB_USERNAME', 'nntmux'), 'password' => env('DB_PASSWORD', ''), 'unix_socket' => env('DB_SOCKET', ''), 'charset' => 'utf8',