Skip to content

Commit 28bd0b3

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [HttpClient][PHPDoc] Fix 2 remaining return mixed [Cache] [FrameworkBundle] Fix logging for TagAwareAdapter [Route] Better inline requirements and defaults parsing Simplified condition and removed unused code from AbstractSessionListener::onKernelRequest [PhpUnitBridge] Fix phpunit symlink on Windows [Yaml] Fixed infinite loop when parser goes through an additional and invalid closing tag
2 parents 0287787 + b99b8ce commit 28bd0b3

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

EventListener/AbstractSessionListener.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,13 @@ public function onKernelRequest(RequestEvent $event)
5656
return;
5757
}
5858

59-
$session = null;
6059
$request = $event->getRequest();
6160
if (!$request->hasSession()) {
6261
$sess = null;
6362
$request->setSessionFactory(function () use (&$sess) { return $sess ?? $sess = $this->getSession(); });
6463
}
6564

66-
$session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);
65+
$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null;
6766
$this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;
6867
}
6968

0 commit comments

Comments
 (0)