[HttpKernel] Dont implement ServiceSubscriberInterface on *SessionListener

nicolas-grekas · nicolas-grekas · commit 135800767ca8 · 2017-03-28T19:41:34.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
@@ -53,8 +53,14 @@
 
         <service id="session_listener" class="Symfony\Component\HttpKernel\EventListener\SessionListener">
             <tag name="kernel.event_subscriber" />
-            <tag name="container.service_subscriber" id="session" />
-            <argument type="service" id="container" />
+            <argument type="service">
+                <service class="Symfony\Component\DependencyInjection\ServiceLocator">
+                    <tag name="container.service_locator" />
+                    <argument type="collection">
+                        <argument key="session" type="service" id="session" on-invalid="ignore" />
+                    </argument>
+                </service>
+            </argument>
         </service>
 
         <service id="session.save_listener" class="Symfony\Component\HttpKernel\EventListener\SaveSessionListener">
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/test.xml
@@ -22,8 +22,14 @@
 
         <service id="test.session.listener" class="Symfony\Component\HttpKernel\EventListener\TestSessionListener">
             <tag name="kernel.event_subscriber" />
-            <tag name="container.service_subscriber" id="session" />
-            <argument type="service" id="container" />
+            <argument type="service">
+                <service class="Symfony\Component\DependencyInjection\ServiceLocator">
+                    <tag name="container.service_locator" />
+                    <argument type="collection">
+                        <argument key="session" type="service" id="session" on-invalid="ignore" />
+                    </argument>
+                </service>
+            </argument>
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * Sets the session in the request.
@@ -22,7 +20,7 @@
  *
  * @final since version 3.3
  */
-class SessionListener extends AbstractSessionListener implements ServiceSubscriberInterface
+class SessionListener extends AbstractSessionListener
 {
     private $container;
 
@@ -39,14 +37,4 @@ protected function getSession()
 
         return $this->container->get('session');
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedServices()
-    {
-        return array(
-            'session' => '?'.SessionInterface::class,
-        );
-    }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/TestSessionListener.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
 /**
  * Sets the session in the request.
@@ -22,7 +20,7 @@
  *
  * @final since version 3.3
  */
-class TestSessionListener extends AbstractTestSessionListener implements ServiceSubscriberInterface
+class TestSessionListener extends AbstractTestSessionListener
 {
     private $container;
 
@@ -39,14 +37,4 @@ protected function getSession()
 
         return $this->container->get('session');
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedServices()
-    {
-        return array(
-            'session' => '?'.SessionInterface::class,
-        );
-    }
 }
