bug #38894 [HttpKernel] Remove Symfony 3 compatibility code (derrabus)

Nyholm · Nyholm · commit 2d511de6b3ce · 2020-10-30T16:05:23.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] Remove Symfony 3 compatibility code | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #38892 | License | MIT | Doc PR | N/A This PR removes dead code that checks for the presence of the `Request::setSessionFactory()` method. That method was added with #25836 in HttpFoundation 4.1. Since HttpKernel requires at least HttpFoundation 4.4, we can assume that the method is always present and thus simplify some code here. Additionally, I also fix the doc block as described in #38892. 😉 Commits ------- b9ca866 Remove Symfony 3 compatibility code.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -179,7 +179,7 @@ class Request
     protected $format;
 
     /**
-     * @var SessionInterface
+     * @var SessionInterface|callable
      */
     protected $session;
 
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -55,12 +55,8 @@ public function onKernelRequest(GetResponseEvent $event)
 
         $session = null;
         $request = $event->getRequest();
-        if ($request->hasSession()) {
-            // no-op
-        } elseif (method_exists($request, 'setSessionFactory')) {
+        if (!$request->hasSession()) {
             $request->setSessionFactory(function () { return $this->getSession(); });
-        } elseif ($session = $this->getSession()) {
-            $request->setSession($session);
         }
 
         $session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
