Move middleware/after to boot()

barryvdh · barryvdh · commit 0ee41ebb6c64 · 2013-12-24T09:26:32.000+01:00
diff --git a/src/Barryvdh/Debugbar/LaravelDebugBar.php b/src/Barryvdh/Debugbar/LaravelDebugBar.php
@@ -234,6 +234,15 @@ public function boot(){
         $renderer->setBaseUrl(asset('packages/barryvdh/laravel-debugbar'));
         $renderer->setIncludeVendors($this->app['config']->get('laravel-debugbar::config.include_vendors', true));
 
+        if(version_compare($app::VERSION, '4.1', '>=')){
+            $app->middleware('Barryvdh\Debugbar\Middleware', array($debugbar));
+        }else{
+            $app->after(function ($request, $response) use($debugbar)
+            {
+                $debugbar->modifyResponse($request, $response);
+            });
+        }
+
         $this->booted = true;
 
     }
diff --git a/src/Barryvdh/Debugbar/ServiceProvider.php b/src/Barryvdh/Debugbar/ServiceProvider.php
@@ -52,17 +52,6 @@ public function register()
             });
         $this->commands('command.debugbar.publish');
 
-        $debugbar = $this->app['debugbar'];
-        $app = $this->app;
-
-        if(version_compare($app::VERSION, '4.1', '>=')){
-            $this->app->middleware('Barryvdh\Debugbar\Middleware', array($debugbar));
-        }else{
-            $this->app->after(function ($request, $response) use($debugbar)
-            {
-                $debugbar->modifyResponse($request, $response);
-            });
-        }
 
     }
 
