upgrading to laravel 5.6

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2

.env.example

@@ -0,0 +1,39 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=homestead
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitattributes

@@ -1 +1,5 @@
 * text=auto
+*.css linguist-vendored
+*.scss linguist-vendored
+*.js linguist-vendored
+CHANGELOG.md export-ignore

.gitignore

@@ -1,20 +1,30 @@
-/bootstrap/compiled.php
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
 /vendor
+/.idea
+/.vscode
+/.vagrant
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+.env
+
+/bootstrap/compiled.php
 composer.phar
 composer.lock
-.env.*.php
-.env.php
 .DS_Store
 Thumbs.db
 .idea
 *.pid
 /app/storage/*
 /app/storage/tmp
 /app/storage/monit
-/node_modules
 /.sass-cache
 installed.json
 commander.config.php
 cme-commander.pem
 cme-commander
-version
+version

app/Cme/Cli/CreateUser.php

@@ -1,8 +1,8 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Helpers\InstallerHelper;
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Helpers\InstallerHelper;
+use App\Cme\Lib\Cli\CmeCommand;
 
 class CreateUser extends CmeCommand
 {
@@ -36,7 +36,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $username = $this->ask("Username:");
     $password = $this->secret("Password:");

app/Cme/Cli/DbSnapshot.php

@@ -1,7 +1,7 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Lib\Cli\CmeCommand;
 use Illuminate\Support\Facades\DB;
 
 class DbSnapshot extends CmeCommand
@@ -36,7 +36,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $snapshotFile = implode(
       DIRECTORY_SEPARATOR,

app/Cme/Cli/GenerateInstallFiles.php

@@ -1,5 +1,5 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
 use Way\Generators\Commands\GeneratorCommand;
 use Symfony\Component\Console\Input\InputOption;
@@ -80,14 +80,12 @@ class GenerateInstallFiles extends GeneratorCommand
    */
   protected $table;
 
-  public function __construct(
-    Config $config
-  )
+  public function __construct()
   {
     $this->file     = new Filesystem();
     $generator      = new Generator($this->file);
     $this->compiler = new TemplateCompiler();
-    $this->config   = $config;
+    $this->config   = config();
 
     parent::__construct($generator);
   }
@@ -97,7 +95,7 @@ public function __construct(
    *
    * @return void
    */
-  public function fire()
+  public function handle()
   {
     $this->info('Using connection: ' . $this->option('connection') . "\n");
     $this->schemaGenerator = new SchemaGenerator(

app/Cme/Cli/GenerateMigrationFiles.php

@@ -1,7 +1,7 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Lib\Cli\CmeCommand;
 use Illuminate\Support\Facades\DB;
 
 class GenerateMigrationFiles extends CmeCommand
@@ -45,7 +45,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     //load snapshot
     $snapshotFile = implode(

app/Cme/Cli/InstallCommander.php

@@ -1,8 +1,8 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
 use Aws\Ec2\Ec2Client;
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Lib\Cli\CmeCommand;
 use Illuminate\Support\Facades\Config;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -75,7 +75,7 @@ private function _validateAws()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->_validateAws();
     $this->_ec2Client = Ec2Client::factory($this->_awsCredentials);

app/Cme/Cli/InstallDb.php

@@ -1,8 +1,8 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Helpers\InstallerHelper;
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Helpers\InstallerHelper;
+use App\Cme\Lib\Cli\CmeCommand;
 use Symfony\Component\Console\Input\InputArgument;
 
 class InstallDb extends CmeCommand
@@ -37,7 +37,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $table   = $this->argument('table');
     $classes = [];

app/Cme/Cli/ListImporter.php

@@ -1,9 +1,9 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Helpers\ApiImporter;
-use Cme\Helpers\CsvImporter;
-use Cme\Lib\Cli\LongRunningScript;
+use App\Cme\Helpers\ApiImporter;
+use App\Cme\Helpers\CsvImporter;
+use App\Cme\Lib\Cli\LongRunningScript;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Console\Input\InputArgument;
@@ -40,7 +40,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->_init();
     $this->_createPIDFile();

app/Cme/Cli/ListRefresher.php

@@ -1,8 +1,8 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Helpers\ApiImporter;
-use Cme\Lib\Cli\LongRunningScript;
+use App\Cme\Helpers\ApiImporter;
+use App\Cme\Lib\Cli\LongRunningScript;
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\Console\Input\InputArgument;
 
@@ -38,7 +38,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->_init();
     $this->_createPIDFile();

app/Cme/Cli/QueueMessages.php

@@ -1,7 +1,7 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Lib\Cli\LongRunningScript;
+use App\Cme\Lib\Cli\LongRunningScript;
 use CmeKernel\Core\CmeKernel;
 use CmeKernel\Helpers\CampaignHelper;
 use CmeKernel\Helpers\FilterHelper;
@@ -42,7 +42,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->_init();
     $this->_createPIDFile();

app/Cme/Cli/SendEmails.php

@@ -1,7 +1,7 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Lib\Cli\LongRunningScript;
+use App\Cme\Lib\Cli\LongRunningScript;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -49,7 +49,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->_init();
     $this->_createPIDFile();

app/Cme/Cli/SesTool.php

@@ -1,10 +1,10 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
 use Aws\Ses\SesClient;
 use Aws\Sns\SnsClient;
 use Aws\Sqs\SqsClient;
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Lib\Cli\CmeCommand;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Symfony\Component\Console\Input\InputArgument;
@@ -67,7 +67,7 @@ private function _validateAws()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->_validateAws();
     $task = $this->argument('task');

app/Cme/Cli/Setup.php

@@ -1,8 +1,8 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Helpers\InstallerHelper;
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Helpers\InstallerHelper;
+use App\Cme\Lib\Cli\CmeCommand;
 
 class Setup extends CmeCommand
 {
@@ -36,7 +36,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $this->info(
       "Welcome to CME Setup. This tool will help you install CME on your system"

app/Cme/Cli/UninstallDb.php

@@ -1,8 +1,8 @@
 <?php
-namespace Cme\Cli;
+namespace App\Cme\Cli;
 
-use Cme\Helpers\InstallerHelper;
-use Cme\Lib\Cli\CmeCommand;
+use App\Cme\Helpers\InstallerHelper;
+use App\Cme\Lib\Cli\CmeCommand;
 use Symfony\Component\Console\Input\InputArgument;
 
 class UninstallDb extends CmeCommand
@@ -37,7 +37,7 @@ public function __construct()
    *
    * @return mixed
    */
-  public function fire()
+  public function handle()
   {
     $table = $this->argument('table');
     if($table)