move reset session and cookie to sandbox

Author: albertcht

src/Server/Application.php

@@ -278,20 +278,6 @@ public function terminate(Request $request, $response)
     protected function terminateLaravel(Request $request, $response)
     {
         $this->getKernel()->terminate($request, $response);
-
-        // clean laravel session
-        if ($request->hasSession()) {
-            $session = $request->getSession();
-            $session->flush();
-        }
-
-        // clean laravel cookie queue
-        if (isset($this->application['cookie'])) {
-            $cookies = $this->application['cookie'];
-            foreach ($cookies->getQueuedCookies() as $name => $cookie) {
-                $cookies->unqueue($name);
-            }
-        }
     }
 
     /**

src/Server/Sandbox.php

@@ -107,6 +107,8 @@ public function getApplication()
     protected function resetLaravelApp($application)
     {
         $this->resetConfigInstance($application);
+        $this->resetSession($application);
+        $this->resetCookie($application);
         $this->clearInstances($application);
         $this->rebindRouterContainer($application);
         $this->rebindViewContainer($application);
@@ -131,6 +133,29 @@ protected function resetConfigInstance($application)
         $application->instance('config', clone $this->config);
     }
 
+    /**
+     * Reset laravel's session data.
+     */
+    protected function resetSession($application)
+    {
+        if (isset($application['session'])) {
+            $session = $application->make('session');
+            $session->flush();
+        }
+    }
+
+    /**
+     * Reset laravel's cookie.
+     */
+    protected function resetCookie($application)
+    {
+        if (isset($application['cookie'])) {
+            foreach ($application->make('cookie')->getQueuedCookies() as $key => $value) {
+                $cookies->unqueue($key);
+            }
+        }
+    }
+
     /**
      * Rebind laravel's container in router.
      */