diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Symfony 3 compatibility code.

Browse Source
This commit is contained in:
Alexander M. Turek 2020-10-30 14:31:03 +01:00
parent 5cc4623aad
commit b9ca866bdd
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/HttpFoundation/Request.php
View File

@ -179,7 +179,7 @@ class Request
protected $format; protected $format;
/** /**
* @var SessionInterface * @var SessionInterface|callable
*/ */
protected $session; protected $session;

6
src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
View File

@ -55,12 +55,8 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
$session = null; $session = null;
$request = $event->getRequest(); $request = $event->getRequest();
if ($request->hasSession()) { if (!$request->hasSession()) {
// no-op
} elseif (method_exists($request, 'setSessionFactory')) {
$request->setSessionFactory(function () { return $this->getSession(); }); $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); $session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);