Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit d3a43b177ae5 · 2018-06-28T10:10:58.000+02:00
* 4.1:
  [HttpFoundation] fix merge
diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php
@@ -62,7 +62,7 @@ public function onKernelRequest(GetResponseEvent $event)
         }
 
         $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)

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function onKernelRequest(GetResponseEvent $event)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`$session = $session ?? ($this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : null);`
`65`		`- $this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : null;`
	`65`	`+ $this->sessionUsageStack[] = $session instanceof Session ? $session->getUsageIndex() : 0;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public function onKernelResponse(FilterResponseEvent $event)`