Use config publisher

barryvdh · barryvdh · commit 0b69cc27c399 · 2015-01-26T20:45:48.000+01:00
diff --git a/config/debugbar.php b/config/debugbar.php
diff --git a/readme.md b/readme.md
@@ -45,8 +45,8 @@ Require this package with composer:
 composer require barryvdh/laravel-debugbar
 ```
 
-After updating composer, add the ServiceProvider to the providers array in app/config/app.php
-> Note for Laravel 5: If you use a catch-all/fallback route, make sure you load the Debugbar ServiceProvider before your own App ServiceProviders.
+After updating composer, add the ServiceProvider to the providers array in config/app.php
+> If you use a catch-all/fallback route, make sure you load the Debugbar ServiceProvider before your own App ServiceProviders.
 
 ```
 'Barryvdh\Debugbar\ServiceProvider',
@@ -58,12 +58,14 @@ If you want to use the facade to log messages, add this to your facades in app.p
 'Debugbar' => 'Barryvdh\Debugbar\Facade',
 ```
 
-The profiler is enabled by default, if you have app.debug=true. You can override that in the config (`debugbar.enabled`). See more options in `config/config.php`
+The profiler is enabled by default, if you have app.debug=true. You can override that in the config (`debugbar.enabled`). See more options in `config/debugbar.php`
 You can also set in your config if you want to include/exclude the vendor files also (FontAwesome, Highlight.js and jQuery). If you already use them in your site, set it to false.
 You can also only display the js of css vendors, by setting it to 'js' or 'css'. (Highlight.js requires both css + js, so set to `true` for syntax highlighting)
 
+Copy the package config to your local config with the publish command:
+
 ```
-php artisan config:publish barryvdh/laravel-debugbar
+php artisan vendor:publish
 ```
 
 You can also disable/enable the loggers you want. You can also use the IoC container to add extra loggers. (`$app['debugbar']->addCollector(new MyDataCollector)`)
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -66,7 +66,9 @@ function ($request, $response) use ($app) {
      */
     public function register()
     {
-        $this->app['config']->set('debugbar', require __DIR__ .'/../config/config.php');
+        $configPath = __DIR__ . '/../config/debugbar.php';
+        $this->loadConfigFrom('debugbar', $configPath);
+        $this->publishes([$configPath => config_path('debugbar.php')]);
         
         $this->app->alias(
             'DebugBar\DataFormatter\DataFormatter',
@@ -105,4 +107,18 @@ public function provides()
     {
         return array('debugbar', 'command.debugbar.clear');
     }
+    
+    /**
+     * Register the package defaults.
+     *
+     * @param  string  $key
+     * @param  string  $path
+     * @return void
+     */
+    protected function loadConfigFrom($key, $path)
+    {
+        $defaults = $this->app['files']->getRequire($path);
+        $config = $this->app['config']->get($key, []);
+        $this->app['config']->set($key, array_merge($defaults, $config));
+    }
 }
