Moved to L5 native config

Author: GrahamCampbell

README.md

@@ -41,16 +41,16 @@ Checkout the [2.1 branch](https://github.com/GrahamCampbell/Laravel-HTMLMin/tree
 
 ## Configuration
 
-Laravel HTMLMin supports optional configuration through [orchestral/config](https://github.com/orchestral/config).
+Laravel HTMLMin supports optional configuration.
 
-If you want an automated way to publish the config, then install [orchestral/publisher](https://github.com/orchestral/publisher).
-
-You can then publish the config file by running:
+To get started, you'll need to publish all vendor assets:
 
 ```bash
-$ php artisan publish:config graham-campbell/htmlmin
+$ php artisan vendor:publish
 ```
 
+This will create a `config/htmlmin.php` file in your app that you can modify to set your configuration. Also, make sure you check for changes to the original config file in this package between releases.
+
 There are a few config options:
 
 ##### Automatic Blade Optimizations

composer.json

@@ -16,8 +16,6 @@
         "illuminate/routing": "5.0.*",
         "illuminate/support": "5.0.*",
         "illuminate/view": "5.0.*",
-        "orchestra/config": "3.0.*",
-        "orchestra/support-providers": "3.0.*",
         "mrclay/minify": "~2.2"
     },
     "require-dev": {

config/config.php renamed to config/htmlmin.php

@@ -12,8 +12,8 @@
 namespace GrahamCampbell\HTMLMin;
 
 use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Engines\CompilerEngine;
-use Orchestra\Support\Providers\ServiceProvider;
 
 /**
  * This is the htmlmin service provider class.
@@ -29,17 +29,33 @@ class HTMLMinServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->addConfigComponent('graham-campbell/htmlmin', 'graham-campbell/htmlmin', realpath(__DIR__.'/../config'));
+        $this->setupConfig($this->app);
 
-        if ($this->app['config']['graham-campbell/htmlmin::blade']) {
+        if ($this->app->config->get('htmlmin.blade')) {
             $this->enableBladeOptimisations($this->app);
         }
 
-        if ($this->app['config']['graham-campbell/htmlmin::live']) {
+        if ($this->app->config->get('htmlmin.live')) {
             $this->enableLiveOptimisations($this->app);
         }
 
-        $this->setupFilters();
+        $this->setupFilters($this->app);
+    }
+
+    /**
+     * Setup the config.
+     *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
+     * @return void
+     */
+    protected function setupConfig(Application $app)
+    {
+        $source = realpath(__DIR__.'/../config/htmlmin.php');
+
+        $this->publishes([$source => config_path('htmlmin.php')]);
+
+        $this->mergeConfigFrom('htmlmin', $source);
     }
 
     /**
@@ -77,12 +93,12 @@ protected function enableLiveOptimisations(Application $app)
     /**
      * Setup the filters.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function setupFilters()
+    protected function setupFilters(Application $app)
     {
-        $app = $this->app;
-
         $app['router']->filter('htmlmin', function ($route, $request, $response) use ($app) {
             $app['htmlmin']->live($response);
         });
@@ -95,101 +111,113 @@ protected function setupFilters()
      */
     public function register()
     {
-        $this->registerJsMinifier();
-        $this->registerCssMinifier();
-        $this->registerHtmlMinifier();
-        $this->registerBladeMinifier();
-        $this->registerMinifyCompiler();
-        $this->registerHTMLMin();
+        $this->registerJsMinifier($this->app);
+        $this->registerCssMinifier($this->app);
+        $this->registerHtmlMinifier($this->app);
+        $this->registerBladeMinifier($this->app);
+        $this->registerMinifyCompiler($this->app);
+        $this->registerHTMLMin($this->app);
     }
 
     /**
      * Register the css minifier class.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function registerCssMinifier()
+    protected function registerCssMinifier(Application $app)
     {
-        $this->app->singleton('htmlmin.css', function ($app) {
+        $app->singleton('htmlmin.css', function ($app) {
             return new Minifiers\CssMinifier();
         });
 
-        $this->app->alias('htmlmin.css', 'GrahamCampbell\HTMLMin\Minifiers\CssMinifier');
+        $app->alias('htmlmin.css', 'GrahamCampbell\HTMLMin\Minifiers\CssMinifier');
     }
 
     /**
      * Register the js minifier class.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function registerJsMinifier()
+    protected function registerJsMinifier(Application $app)
     {
-        $this->app->singleton('htmlmin.js', function ($app) {
+        $app->singleton('htmlmin.js', function ($app) {
             return new Minifiers\JsMinifier();
         });
 
-        $this->app->alias('htmlmin.js', 'GrahamCampbell\HTMLMin\Minifiers\JsMinifier');
+        $app->alias('htmlmin.js', 'GrahamCampbell\HTMLMin\Minifiers\JsMinifier');
     }
 
     /**
      * Register the html minifier class.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function registerHtmlMinifier()
+    protected function registerHtmlMinifier(Application $app)
     {
-        $this->app->singleton('htmlmin.html', function ($app) {
+        $app->singleton('htmlmin.html', function ($app) {
             $css = $app['htmlmin.css'];
             $js = $app['htmlmin.js'];
 
             return new Minifiers\HtmlMinifier($css, $js);
         });
 
-        $this->app->alias('htmlmin.html', 'GrahamCampbell\HTMLMin\Minifiers\HtmlMinifier');
+        $app->alias('htmlmin.html', 'GrahamCampbell\HTMLMin\Minifiers\HtmlMinifier');
     }
 
     /**
      * Register the blade minifier class.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function registerBladeMinifier()
+    protected function registerBladeMinifier(Application $app)
     {
-        $this->app->singleton('htmlmin.blade', function ($app) {
+        $app->singleton('htmlmin.blade', function ($app) {
             $force = $app['config']['graham-campbell/htmlmin::force'];
 
             return new Minifiers\BladeMinifier($force);
         });
 
-        $this->app->alias('htmlmin.blade', 'GrahamCampbell\HTMLMin\Minifiers\BladeMinifier');
+        $app->alias('htmlmin.blade', 'GrahamCampbell\HTMLMin\Minifiers\BladeMinifier');
     }
 
     /**
      * Register the minify compiler class.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function registerMinifyCompiler()
+    protected function registerMinifyCompiler(Application $app)
     {
-        $this->app->singleton('htmlmin.compiler', function ($app) {
+        $app->singleton('htmlmin.compiler', function ($app) {
             $blade = $app['htmlmin.blade'];
             $files = $app['files'];
             $storagePath = $app['config']['view.compiled'];
 
             return new Compilers\MinifyCompiler($blade, $files, $storagePath);
         });
 
-        $this->app->alias('htmlmin.compiler', 'GrahamCampbell\HTMLMin\Compilers\MinifyCompiler');
+        $app->alias('htmlmin.compiler', 'GrahamCampbell\HTMLMin\Compilers\MinifyCompiler');
     }
 
     /**
      * Register the htmlmin class.
      *
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     *
      * @return void
      */
-    protected function registerHTMLMin()
+    protected function registerHTMLMin(Application $app)
     {
-        $this->app->singleton('htmlmin', function ($app) {
+        $app->singleton('htmlmin', function ($app) {
             $blade = $app['htmlmin.blade'];
             $css = $app['htmlmin.css'];
             $js = $app['htmlmin.js'];
@@ -198,7 +226,7 @@ protected function registerHTMLMin()
             return new HTMLMin($blade, $css, $js, $html);
         });
 
-        $this->app->alias('htmlmin', 'GrahamCampbell\HTMLMin\HTMLMin');
+        $app->alias('htmlmin', 'GrahamCampbell\HTMLMin\HTMLMin');
     }
 
     /**