Revert and fix session manager (#1666)

Author: barryvdh

src/LaravelDebugbar.php

@@ -130,16 +130,12 @@ public function __construct($app = null)
     public function getHttpDriver()
     {
         if ($this->httpDriver === null) {
-            if ($this->app->bound('cookie')) {
-                $this->httpDriver = $this->app->make(SessionHttpDriver::class);
-            } else {
-                $this->httpDriver = $this->app->make(SymfonyHttpDriver::class);
-            }
+            $this->httpDriver = $this->app->make(SymfonyHttpDriver::class);
         }
 
         return $this->httpDriver;
     }
-    
+
     /**
      * Enable the Debugbar and boot, if not already booted.
      */
@@ -740,6 +736,12 @@ public function modifyResponse(Request $request, Response $response)
         // Prevent duplicate modification
         $this->responseIsModified = true;
 
+        // Set the Response if required
+        $httpDriver = $this->getHttpDriver();
+        if ($httpDriver instanceof SymfonyHttpDriver) {
+            $httpDriver->setResponse($response);
+        }
+
         // Show the Http Response Exception in the Debugbar, when available
         if (isset($response->exception)) {
             $this->addThrowable($response->exception);
@@ -757,11 +759,11 @@ public function modifyResponse(Request $request, Response $response)
 
         $sessionHiddens = $app['config']->get('debugbar.options.session.hiddens', []);
         if ($app->bound(SessionManager::class)) {
+            /** @var \Illuminate\Session\SessionManager $sessionManager */
+            $sessionManager = $app->make(SessionManager::class);
 
             if ($this->shouldCollect('session') && ! $this->hasCollector('session')) {
                 try {
-                    /** @var \Illuminate\Session\SessionManager $sessionManager */
-                    $sessionManager = $app->make(SessionManager::class);
                     $this->addCollector(new SessionCollector($sessionManager, $sessionHiddens));
                 } catch (Exception $e) {
                     $this->addCollectorException('Cannot add SessionCollector', $e);

src/ServiceProvider.php

@@ -35,14 +35,6 @@ public function register()
             return new LaravelDebugbar($app);
         });
 
-        $this->app->singleton(SessionHttpDriver::class, function ($app) {
-            // Attach the Cookie Handler with Request
-            $cookieHandler = new CookieSessionHandler($app->make('cookie'), 0, true);
-            $cookieHandler->setRequest($app['request']);
-
-            return new SessionHttpDriver($cookieHandler);
-        });
-
         $this->app->singleton(SymfonyHttpDriver::class, function ($app) {
             return new SymfonyHttpDriver($app->make(SessionManager::class));
         });
@@ -176,12 +168,6 @@ protected function registerResponseListener()
             /** @var LaravelDebugbar $debugbar */
             $debugbar = $this->app->make(LaravelDebugbar::class);
             if ($debugbar->isEnabled()) {
-                // Now that we have a Response, set it on the Driver
-                $httpDriver = $debugbar->getHttpDriver();
-                if ($httpDriver instanceof SessionHttpDriver || $httpDriver instanceof SymfonyHttpDriver) {
-                    $httpDriver->setResponse($event->response);
-                }
-
                 if ($event->response->isRedirection()) {
                     $debugbar->modifyResponse($event->request, $event->response);
                 } else {

src/SessionHttpDriver.php

@@ -9,7 +9,6 @@
 /**
  * HTTP driver for Symfony Request/Session
  *
- * @deprecated
  */
 class SymfonyHttpDriver implements HttpDriverInterface
 {