Tweak serviceprovider (#1673)

Author: barryvdh

src/LaravelDebugbar.php

@@ -729,7 +729,7 @@ public function modifyResponse(Request $request, Response $response)
     {
         /** @var Application $app */
         $app = $this->app;
-        if (!$this->isEnabled() || $this->isDebugbarRequest() || $this->responseIsModified) {
+        if (!$this->isEnabled() || !$this->booted || $this->isDebugbarRequest() || $this->responseIsModified) {
             return $response;
         }
 

src/ServiceProvider.php

@@ -102,7 +102,6 @@ public function boot()
 
         $this->loadRoutesFrom(__DIR__ . '/debugbar-routes.php');
 
-        $this->registerResponseListener();
         $this->registerMiddleware(InjectDebugbar::class);
 
         $this->commands(['command.debugbar.clear']);
@@ -128,16 +127,6 @@ protected function getConfigPath()
         return config_path('debugbar.php');
     }
 
-    /**
-     * Publish the config file
-     *
-     * @param  string $configPath
-     */
-    protected function publishConfig($configPath)
-    {
-        $this->publishes([$configPath => config_path('debugbar.php')], 'config');
-    }
-
     /**
      * Register the Debugbar Middleware
      *
@@ -148,32 +137,4 @@ protected function registerMiddleware($middleware)
         $kernel = $this->app[Kernel::class];
         $kernel->pushMiddleware($middleware);
     }
-
-    /**
-     * Register the Response Listener
-     *
-     * @param  string $middleware
-     */
-    protected function registerResponseListener()
-    {
-        if (!isset($this->app['events']) || !class_exists(ResponsePrepared::class)) {
-            return;
-        }
-
-        /**
-         * For redirects, prepare the response early to store in the session.
-         * For regular requests, get the stacked data early
-         */
-        $this->app['events']->listen(ResponsePrepared::class, function (ResponsePrepared $event) {
-            /** @var LaravelDebugbar $debugbar */
-            $debugbar = $this->app->make(LaravelDebugbar::class);
-            if ($debugbar->isEnabled()) {
-                if ($event->response->isRedirection()) {
-                    $debugbar->modifyResponse($event->request, $event->response);
-                } else {
-                    $debugbar->getStackedData();
-                }
-            }
-        });
-    }
 }