Merge branch '4.1'

* 4.1:
  [HttpFoundation] fix merge
This commit is contained in:
Nicolas Grekas 2018-06-28 10:10:58 +02:00
commit d3a43b177a

View File

@ -62,7 +62,7 @@ abstract class AbstractSessionListener implements EventSubscriberInterface
} }
$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);
$this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : null; $this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;
} }
public function onKernelResponse(FilterResponseEvent $event) public function onKernelResponse(FilterResponseEvent $event)