Tweaks

Author: GrahamCampbell

src/HTMLMinServiceProvider.php

@@ -67,7 +67,7 @@ protected function setupConfig(Application $app)
      */
     protected function enableBladeOptimisations(Application $app)
     {
-        $app['view']->getEngineResolver()->register('blade', function () use ($app) {
+        $app->view->getEngineResolver()->register('blade', function () use ($app) {
             $compiler = $app['htmlmin.compiler'];
 
             return new CompilerEngine($compiler);
@@ -85,8 +85,8 @@ protected function enableBladeOptimisations(Application $app)
      */
     protected function enableLiveOptimisations(Application $app)
     {
-        $app['router']->after(function ($request, $response) use ($app) {
-            $app['htmlmin']->live($response);
+        $app->router->after(function ($request, $response) use ($app) {
+            $app->htmlmin->live($response);
         });
     }
 
@@ -99,8 +99,8 @@ protected function enableLiveOptimisations(Application $app)
      */
     protected function setupFilters(Application $app)
     {
-        $app['router']->filter('htmlmin', function ($route, $request, $response) use ($app) {
-            $app['htmlmin']->live($response);
+        $app->router->filter('htmlmin', function ($route, $request, $response) use ($app) {
+            $app->htmlmin->live($response);
         });
     }
 
@@ -180,7 +180,7 @@ protected function registerHtmlMinifier(Application $app)
     protected function registerBladeMinifier(Application $app)
     {
         $app->singleton('htmlmin.blade', function ($app) {
-            $force = $app['config']['graham-campbell/htmlmin::force'];
+            $force = $app->config->get('html.force', false);
 
             return new Minifiers\BladeMinifier($force);
         });
@@ -200,7 +200,7 @@ protected function registerMinifyCompiler(Application $app)
         $app->singleton('htmlmin.compiler', function ($app) {
             $blade = $app['htmlmin.blade'];
             $files = $app['files'];
-            $storagePath = $app['config']['view.compiled'];
+            $storagePath = $app->get('view.compiled');
 
             return new Compilers\MinifyCompiler($blade, $files, $storagePath);
         });

tests/Functional/BladeEnabledTest.php

@@ -29,14 +29,14 @@ class BladeEnabledTest extends AbstractFunctionalTestCase
      */
     protected function additionalSetup($app)
     {
-        $app['config']->set('graham-campbell/htmlmin::blade', true);
+        $app->config->set('htmlmin.blade', true);
     }
 
     public function testNewSetup()
     {
-        $this->app['view']->addNamespace('stubs', realpath(__DIR__.'/stubs'));
+        $this->app->view->addNamespace('stubs', realpath(__DIR__.'/stubs'));
 
-        $actual = $this->app['view']->make('stubs::test')->render();
+        $actual = $this->app->view->make('stubs::test')->render();
 
         $expected = file_get_contents(__DIR__.'/stubs/blade.txt');
 

tests/Functional/FilterEnabledTest.php

@@ -20,10 +20,10 @@ class FilterEnabledTest extends AbstractFunctionalTestCase
 {
     public function testNewSetup()
     {
-        $this->app['view']->addNamespace('stubs', realpath(__DIR__.'/stubs'));
+        $this->app->view->addNamespace('stubs', realpath(__DIR__.'/stubs'));
 
-        $this->app['router']->get('htmlmin-test-route', ['after' => 'htmlmin', function () {
-            return $this->app['view']->make('stubs::test');
+        $this->app->router->get('htmlmin-test-route', ['after' => 'htmlmin', function () {
+            return $this->app->view->make('stubs::test');
         }]);
 
         $actual = $this->call('GET', 'htmlmin-test-route')->getContent();

tests/Functional/LiveEnabledTest.php

@@ -31,14 +31,14 @@ class LiveEnabledTest extends AbstractFunctionalTestCase
      */
     protected function additionalSetup($app)
     {
-        $app['config']->set('graham-campbell/htmlmin::live', true);
+        $app->config->set('htmlmin.live', true);
     }
 
     public function testNewSetup()
     {
-        $this->app['view']->addNamespace('stubs', realpath(__DIR__.'/stubs'));
+        $this->app->view->addNamespace('stubs', realpath(__DIR__.'/stubs'));
 
-        $this->app['router']->get('htmlmin-test-route', function () {
+        $this->app->router->get('htmlmin-test-route', function () {
             return Response::view('stubs::test');
         });
 
@@ -51,7 +51,7 @@ public function testNewSetup()
 
     public function testRedirect()
     {
-        $this->app['router']->get('htmlmin-test-route', function () {
+        $this->app->router->get('htmlmin-test-route', function () {
             return Redirect::to('foo');
         });
 
@@ -62,7 +62,7 @@ public function testRedirect()
 
     public function testJson()
     {
-        $this->app['router']->get('htmlmin-test-route', function () {
+        $this->app->router->get('htmlmin-test-route', function () {
             return Response::json(['foo' => 'bar', ['baz']], 200, [], JSON_PRETTY_PRINT);
         });