renamed RequestAttributeInitializingListener to RouterListener and

SessionInitializingListener to SessionListener
symfony · May 30, 2011 · 9698669 · 9698669
1 parent 971ff81
commit 9698669
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -129,7 +129,7 @@ public function load(array $configs, ContainerBuilder $container)
             'Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent',
             'Symfony\\Component\\HttpKernel\\Events',
 
-            'Symfony\\Bundle\\FrameworkBundle\\Listener\\RequestAttributeInitializingListener',
+            'Symfony\\Bundle\\FrameworkBundle\\Listener\\RouterListener',
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerNameParser',
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\ControllerResolver',
             'Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller',
@@ -296,7 +296,7 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
         $container->setParameter('session.storage.options', $options);
 
         $this->addClassesToCompile(array(
-            'Symfony\\Bundle\\FrameworkBundle\\Listener\\SessionInitializingListener',
+            'Symfony\\Bundle\\FrameworkBundle\\Listener\\SessionListener',
             'Symfony\\Component\\HttpFoundation\\SessionStorage\\SessionStorageInterface',
             $container->getDefinition('session')->getClass(),
         ));

diff --git a/.../RequestAttributeInitializingListener.php → ...ameworkBundle/Listener/RouterListener.php b/.../RequestAttributeInitializingListener.php → ...ameworkBundle/Listener/RouterListener.php
@@ -27,7 +27,7 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class RequestAttributeInitializingListener
+class RouterListener
 {
     private $router;
     private $logger;

diff --git a/.../Listener/SessionInitializingListener.php → ...meworkBundle/Listener/SessionListener.php b/.../Listener/SessionInitializingListener.php → ...meworkBundle/Listener/SessionListener.php
@@ -24,7 +24,7 @@
  *
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  */
-class SessionInitializingListener
+class SessionListener
 {
     private $container;
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml
@@ -5,8 +5,8 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="request_attribute_initializing_listener.class">Symfony\Bundle\FrameworkBundle\Listener\RequestAttributeInitializingListener</parameter>
-        <parameter key="session_initializing_listener.class">Symfony\Bundle\FrameworkBundle\Listener\SessionInitializingListener</parameter>
+        <parameter key="router_listener.class">Symfony\Bundle\FrameworkBundle\Listener\RouterListener</parameter>
+        <parameter key="session_listener.class">Symfony\Bundle\FrameworkBundle\Listener\SessionListener</parameter>
         <parameter key="controller_resolver.class">Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver</parameter>
         <parameter key="controller_name_converter.class">Symfony\Bundle\FrameworkBundle\Controller\ControllerNameParser</parameter>
         <parameter key="response_listener.class">Symfony\Component\HttpKernel\ResponseListener</parameter>
@@ -27,7 +27,7 @@
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <service id="request_attribute_initializing_listener" class="%request_attribute_initializing_listener.class%">
+        <service id="router_listener" class="%router_listener.class%">
             <tag name="kernel.listener" event="onCoreRequest" />
             <tag name="monolog.logger" channel="request" />
             <argument type="service" id="router" />
@@ -36,7 +36,7 @@
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <service id="session_initializing_listener" class="%session_initializing_listener.class%">
+        <service id="session_listener" class="%session_listener.class%">
             <tag name="kernel.listener" event="onCoreRequest" priority="255" />
             <argument type="service" id="service_container" />
         </service>

diff --git a/...uestAttributeInitializingListenerTest.php → ...dle/Tests/Listener/RouterListenerTest.php b/...uestAttributeInitializingListenerTest.php → ...dle/Tests/Listener/RouterListenerTest.php
@@ -11,13 +11,13 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests;
 
-use Symfony\Bundle\FrameworkBundle\Listener\RequestAttributeInitializingListener;
+use Symfony\Bundle\FrameworkBundle\Listener\RouterListener;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\Routing\RequestContext;
 
-class RequestAttributeInitializingListenerTest extends \PHPUnit_Framework_TestCase
+class RouterListenerTest extends \PHPUnit_Framework_TestCase
 {
     private $container;
     private $router;
@@ -34,7 +34,7 @@ protected function setUp()
      */
     public function testPort($defaultHttpPort, $defaultHttpsPort, $uri, $expectedHttpPort, $expectedHttpsPort)
     {
-        $listener = new RequestAttributeInitializingListener($this->router, $defaultHttpPort, $defaultHttpsPort);
+        $listener = new RouterListener($this->router, $defaultHttpPort, $defaultHttpsPort);
 
         $expectedContext = new RequestContext();
         $expectedContext->setHttpPort($expectedHttpPort);