From 70d43e6e53233596a59f6d3ad7651bbb22741e17 Mon Sep 17 00:00:00 2001 From: Nabeel S Date: Wed, 30 Oct 2019 10:23:31 -0400 Subject: [PATCH] Wrap values in travis env (#426) * Wrap values in travis env * Inline CronService --- .travis/env.travis | 14 -------------- .travis/env.travis.php | 37 ++++++++++++++++++------------------- app/Console/Kernel.php | 13 ++----------- 3 files changed, 20 insertions(+), 44 deletions(-) delete mode 100644 .travis/env.travis diff --git a/.travis/env.travis b/.travis/env.travis deleted file mode 100644 index 58b8fe1c..00000000 --- a/.travis/env.travis +++ /dev/null @@ -1,14 +0,0 @@ -APP_ENV=prod -APP_KEY=base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI= -APP_DEBUG=true -APP_LOG_LEVEL=debug -APP_URL=http://localhost - -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=phpvms -DB_USERNAME=root -DB_PASSWORD= - -CACHE_DRIVER=array diff --git a/.travis/env.travis.php b/.travis/env.travis.php index cf997e50..89eb8bc4 100644 --- a/.travis/env.travis.php +++ b/.travis/env.travis.php @@ -2,29 +2,28 @@ exit(); ?> -APP_ENV=dev -APP_KEY=base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY= -APP_URL=http://localhost -APP_SKIN=default -APP_DEBUG=true -APP_LOCALE=en +APP_ENV="dev" +APP_KEY="base64:zdgcDqu9PM8uGWCtMxd74ZqdGJIrnw812oRMmwDF6KY=" +APP_URL="http://localhost" +APP_SKIN="default" +APP_DEBUG="true" +APP_LOCALE="en" -PHPVMS_INSTALLED=true -VACENTRAL_API_KEY= +PHPVMS_INSTALLED="true" -APP_LOG=daily -APP_LOG_LEVEL=debug -APP_LOG_MAX_FILES=3 +APP_LOG="daily" +APP_LOG_LEVEL="debug" +APP_LOG_MAX_FILES="3" -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=phpvms -DB_USERNAME=root +DB_CONNECTION="mysql" +DB_HOST="127.0.0.1" +DB_PORT="3306" +DB_DATABASE="phpvms" +DB_USERNAME="root" DB_PASSWORD= -CACHE_DRIVER=file +CACHE_DRIVER="file" CACHE_PREFIX= -SESSION_DRIVER=file -QUEUE_DRIVER=database +SESSION_DRIVER="file" +QUEUE_DRIVER="database" diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index b4c0a1af..ddd6eb6d 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -8,20 +8,10 @@ use App\Console\Cron\Nightly; use App\Console\Cron\Weekly; use App\Services\CronService; use Illuminate\Console\Scheduling\Schedule; -use Illuminate\Contracts\Events\Dispatcher; -use Illuminate\Contracts\Foundation\Application; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; class Kernel extends ConsoleKernel { - private $cronSvc; - - public function __construct(Application $app, Dispatcher $events) - { - parent::__construct($app, $events); - $this->cronSvc = app(CronService::class); - } - /** * Define the application's command schedule. * @@ -41,7 +31,8 @@ class Kernel extends ConsoleKernel $schedule->command('backup:run')->daily()->at('02:00'); // Update the last time the cron was run - $this->cronSvc->updateLastRunTime(); + $cronSvc = app(CronService::class); + $cronSvc->updateLastRunTime(); } /**