[FrameworkBundle] Replace container by service locator in SessionListener

chalasr · chalasr · commit d8ea88c86ec5 · 2017-02-15T23:41:11.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Bundle\FrameworkBundle\EventListener;
 
+use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpKernel\EventListener\SessionListener as BaseSessionListener;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Sets the session in the request.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -49,7 +49,9 @@
 
         <service id="session_listener" class="Symfony\Bundle\FrameworkBundle\EventListener\SessionListener">
             <tag name="kernel.event_subscriber" />
-            <argument type="service" id="service_container" />
+            <argument type="service-locator">
+                <argument key="session" type="service" id="session" on-invalid="null" />
+            </argument>
         </service>
 
         <service id="session.save_listener" class="Symfony\Component\HttpKernel\EventListener\SaveSessionListener">
