fix config:cache

src/Frozennode/Administrator/AdministratorServiceProvider.php

@@ -1,7 +1,5 @@
 <?php
-
 namespace Frozennode\Administrator;
-
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
@@ -11,7 +9,6 @@
 use Frozennode\Administrator\Config\Factory as ConfigFactory;
 use Frozennode\Administrator\Actions\Factory as ActionFactory;
 use Frozennode\Administrator\DataTable\Columns\Factory as ColumnFactory;
-
 class AdministratorServiceProvider extends ServiceProvider
 {
     /**
@@ -20,34 +17,31 @@ class AdministratorServiceProvider extends ServiceProvider
      * @var bool
      */
     protected $defer = false;
-
     /**
      * Bootstrap the application events.
      */
     public function boot()
     {
         $this->loadViewsFrom(__DIR__.'/../../views', 'administrator');
 
-        $this->mergeConfigFrom(
-            __DIR__.'/../../config/administrator.php', 'administrator'
-        );
+        // Hack for laravel config cache
+        if (app()->runningInConsole()) {
+            \Config::set('administrator', []);
+        } else {
+            $this->mergeConfigFrom(config_path('administrator.php'), 'administrator');
+        }
 
         $this->loadTranslationsFrom(__DIR__.'/../../lang', 'administrator');
-
         $this->publishes([
             __DIR__.'/../../config/administrator.php' => config_path('administrator.php'),
         ]);
-
         $this->publishes([
             __DIR__.'/../../../public' => public_path('packages/summerblue/administrator'),
         ], 'public');
-
         //set the locale
         $this->setLocale();
-
         $this->app['events']->dispatch('administrator.ready');
     }
-
     /**
      * Register the service provider.
      */
@@ -56,69 +50,62 @@ public function register()
         //include our view composers, and routes to avoid issues with catch-all routes defined by users
         include __DIR__.'/../../viewComposers.php';
         include __DIR__.'/../../helpers.php';
-
-        // Load route with web middleware 
+
+        // Hack for laravel config cache
+        if (app()->runningInConsole()) {
+            \Config::set('administrator', []);
+        } else {
+            $this->mergeConfigFrom(config_path('administrator.php'), 'administrator');
+        }
+
+        // Load route with web middleware
         Route::group([
             'middleware' => 'web',
         ], function () {
             $this->loadRoutesFrom(__DIR__.'/../../routes.php');
         });
-
         //the admin validator
         $this->app->singleton('admin_validator', function ($app) {
             //get the original validator class so we can set it back after creating our own
             $originalValidator = LValidator::make(array(), array());
             $originalValidatorClass = get_class($originalValidator);
-
             //temporarily override the core resolver
             LValidator::resolver(function ($translator, $data, $rules, $messages) use ($app) {
                 $validator = new Validator($translator, $data, $rules, $messages);
                 $validator->setUrlInstance($app->make('url'));
-
                 return $validator;
             });
-
             //grab our validator instance
             $validator = LValidator::make(array(), array());
-
             //set the validator resolver back to the original validator
             LValidator::resolver(function ($translator, $data, $rules, $messages) use ($originalValidatorClass) {
                 return new $originalValidatorClass($translator, $data, $rules, $messages);
             });
-
             //return our validator instance
             return $validator;
         });
-
         //set up the shared instances
         $this->app->singleton('admin_config_factory', function ($app) {
             return new ConfigFactory($app->make('admin_validator'), LValidator::make(array(), array()), config('administrator'));
         });
-
         $this->app->singleton('admin_field_factory', function ($app) {
             return new FieldFactory($app->make('admin_validator'), $app->make('itemconfig'), $app->make('db'));
         });
-
         $this->app->singleton('admin_datatable', function ($app) {
             $dataTable = new DataTable($app->make('itemconfig'), $app->make('admin_column_factory'), $app->make('admin_field_factory'));
             $dataTable->setRowsPerPage($app->make('session.store'), config('administrator.global_rows_per_page'));
-
             return $dataTable;
         });
-
         $this->app->singleton('admin_column_factory', function ($app) {
             return new ColumnFactory($app->make('admin_validator'), $app->make('itemconfig'), $app->make('db'));
         });
-
         $this->app->singleton('admin_action_factory', function ($app) {
             return new ActionFactory($app->make('admin_validator'), $app->make('itemconfig'), $app->make('db'));
         });
-
         $this->app->singleton('admin_menu', function ($app) {
             return new Menu($app->make('config'), $app->make('admin_config_factory'));
         });
     }
-
     /**
      * Get the services provided by the provider.
      *
@@ -129,7 +116,6 @@ public function provides()
         return array('admin_validator', 'admin_config_factory', 'admin_field_factory', 'admin_datatable', 'admin_column_factory',
             'admin_action_factory', 'admin_menu', );
     }
-
     /**
      * Sets the locale if it exists in the session and also exists in the locales option.
      */