use config helper instead of env in application code

This commit is contained in:
Ethan Brace 2020-04-26 06:07:27 -04:00
parent 16092f657c
commit 6a11f130c2
18 changed files with 29 additions and 23 deletions

View File

@ -23,11 +23,11 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)
{ {
// Not installed yet // Not installed yet
if (!env('APP_INSTALLED')) { if (!config('app.installed')) {
return; return;
} }
$schedule_time = env('APP_SCHEDULE_TIME', '09:00'); $schedule_time = config('app.schedule_time');
$schedule->command('reminder:invoice')->dailyAt($schedule_time); $schedule->command('reminder:invoice')->dailyAt($schedule_time);
$schedule->command('reminder:bill')->dailyAt($schedule_time); $schedule->command('reminder:bill')->dailyAt($schedule_time);

View File

@ -54,7 +54,7 @@ class Handler extends ExceptionHandler
*/ */
public function render($request, Throwable $exception) public function render($request, Throwable $exception)
{ {
if (env('APP_DEBUG') === false) { if (config('app.debug') === false) {
return $this->handleExceptions($request, $exception); return $this->handleExceptions($request, $exception);
} }

View File

@ -115,7 +115,7 @@ class Login extends Controller
auth()->logout(); auth()->logout();
// Session destroy is required if stored in database // Session destroy is required if stored in database
if (env('SESSION_DRIVER') == 'database') { if (config('session.driver') == 'database') {
$request = app('Illuminate\Http\Request'); $request = app('Illuminate\Http\Request');
$request->session()->getHandler()->destroy($request->session()->getId()); $request->session()->getHandler()->destroy($request->session()->getId());
} }

View File

@ -27,8 +27,10 @@ class Database extends Controller
*/ */
public function store(Request $request) public function store(Request $request)
{ {
$connection = config('database.default','mysql');
$host = $request['hostname']; $host = $request['hostname'];
$port = env('DB_PORT', '3306'); $port = config("database.connections.$connection.port", '3306');
$database = $request['database']; $database = $request['database'];
$username = $request['username']; $username = $request['username'];
$password = $request['password']; $password = $request['password'];

View File

@ -19,7 +19,7 @@ class Notifications
public function compose(View $view) public function compose(View $view)
{ {
// No need to add suggestions in console // No need to add suggestions in console
if (app()->runningInConsole() || !env('APP_INSTALLED') || !user()) { if (app()->runningInConsole() || !config('app.installed') || !user()) {
return; return;
} }

View File

@ -20,7 +20,7 @@ class Suggestions
public function compose(View $view) public function compose(View $view)
{ {
// No need to add suggestions in console // No need to add suggestions in console
if (app()->runningInConsole() || !env('APP_INSTALLED')) { if (app()->runningInConsole() || !config('app.installed')) {
return; return;
} }

View File

@ -26,7 +26,7 @@ class Version207 extends Listener
// Update .env file // Update .env file
Installer::updateEnv([ Installer::updateEnv([
'MAIL_MAILER' => env('MAIL_DRIVER'), 'MAIL_MAILER' => config('mail.default'),
]); ]);
} }
} }

View File

@ -31,11 +31,11 @@ class App extends Provider
*/ */
public function register() public function register()
{ {
if (env('APP_INSTALLED') && env('APP_DEBUG')) { if (config('app.installed') && config('app.debug')) {
$this->app->register(\Barryvdh\Debugbar\ServiceProvider::class); $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
} }
if (env('APP_ENV') !== 'production') { if (config('app.env') !== 'production') {
$this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class); $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
} }
} }

View File

@ -17,7 +17,7 @@ trait DateTime
$default = 'd M Y'; $default = 'd M Y';
// Make sure it's installed // Make sure it's installed
if (!env('APP_INSTALLED') && (env('APP_ENV') !== 'testing')) { if (!config('app.installed') && (config('app.env') !== 'testing')) {
return $default; return $default;
} }

View File

@ -33,7 +33,7 @@ class Info
public static function mysqlVersion() public static function mysqlVersion()
{ {
if (env('DB_CONNECTION') === 'mysql') { if (config('database.default') === 'mysql') {
return DB::selectOne('select version() as mversion')->mversion; return DB::selectOne('select version() as mversion')->mversion;
} }

View File

@ -183,8 +183,8 @@ class Installer
'database' => $database, 'database' => $database,
'username' => $username, 'username' => $username,
'password' => $password, 'password' => $password,
'driver' => env('DB_CONNECTION', 'mysql'), 'driver' => $connection = config('database.default', 'mysql'),
'charset' => env('DB_CHARSET', 'utf8mb4'), 'charset' => config("database.connections.$connection.charset", 'utf8mb4'),
]); ]);
try { try {
@ -213,7 +213,7 @@ class Installer
'DB_PREFIX' => $prefix, 'DB_PREFIX' => $prefix,
]); ]);
$con = env('DB_CONNECTION', 'mysql'); $con = config('database.default', 'mysql');
// Change current connection // Change current connection
$db = Config::get('database.connections.' . $con); $db = Config::get('database.connections.' . $con);

View File

@ -14,6 +14,10 @@ return [
'name' => env('APP_NAME', 'Akaunting'), 'name' => env('APP_NAME', 'Akaunting'),
'installed' => env('APP_INSTALLED', false),
'schedule_time' => env('APP_SCHEDULE_TIME', '9:00'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Environment | Application Environment

View File

@ -33,7 +33,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>
@stack('js') @stack('js')

View File

@ -28,7 +28,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>
@stack('js') @stack('js')

View File

@ -31,7 +31,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_home = '{{ url("apps/categories") }}'; var app_home = '{{ url("apps/categories") }}';
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>
@stack('js') @stack('js')

View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>
@stack('js') @stack('js')

View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>
@stack('js') @stack('js')

View File

@ -30,7 +30,7 @@
<script type="text/javascript"><!-- <script type="text/javascript"><!--
var url = '{{ url("/") }}'; var url = '{{ url("/") }}';
var app_url = '{{ env("APP_URL") }}'; var app_url = '{{ config("app.url") }}';
//--></script> //--></script>
@stack('js') @stack('js')