Update getSession usages

Author: driesvints

src/Illuminate/Http/Request.php

@@ -11,7 +11,6 @@
 use RuntimeException;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * @method array validate(array $rules, ...$params)
@@ -405,8 +404,8 @@ public static function createFrom(self $from, $to = null)
 
         $request->setJson($from->json());
 
-        if ($from->hasSession()) {
-            $request->setLaravelSession($from->getSession());
+        if ($from->hasSession() && $session = $from->getSession()) {
+            $request->setLaravelSession($session);
         }
 
         $request->setUserResolver($from->getUserResolver());
@@ -489,16 +488,6 @@ public function session()
         return $this->session;
     }
 
-    /**
-     * Get the session associated with the request.
-     *
-     * @return \Illuminate\Session\Store
-     */
-    public function getSession(): SessionInterface
-    {
-        return $this->session;
-    }
-
     /**
      * Set the session instance on the request.
      *

src/Illuminate/Testing/TestResponse.php

@@ -186,7 +186,7 @@ protected function statusMessageWithDetails($expected, $actual)
         }
 
         if ($this->baseResponse instanceof RedirectResponse) {
-            $session = $this->baseResponse->getSession();
+            $session = $this->baseResponse->session();
 
             if (! is_null($session) && $session->has('errors')) {
                 return $this->statusMessageWithErrors($expected, $actual, $session->get('errors')->all());