changed all listener classes so their names end with Listener

symfony · Jul 8, 2010 · 7e8d0d2 · 7e8d0d2
1 parent 6613555
commit 7e8d0d2
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 50 deletions.
diff --git a/...ponents/HttpKernel/Listener/EsiFilter.php → ...mponents/HttpKernel/Cache/EsiListener.php b/...ponents/HttpKernel/Listener/EsiFilter.php → ...mponents/HttpKernel/Cache/EsiListener.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Symfony\Components\HttpKernel\Listener;
+namespace Symfony\Components\HttpKernel\Cache;
 
 use Symfony\Components\HttpKernel\Response;
 use Symfony\Components\HttpKernel\HttpKernelInterface;
 use Symfony\Components\EventDispatcher\EventDispatcher;
-use Symfony\Components\HttpKernel\Cache\Esi;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,13 +16,13 @@
  */
 
 /**
- * EsiFilter adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
+ * EsiListener adds a Surrogate-Control HTTP header when the Response needs to be parsed for ESI.
  *
  * @package    Symfony
  * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class EsiFilter
+class EsiListener
 {
     protected $dispatcher;
     protected $esi;

diff --git a/...ponents/HttpKernel/Listener/Profiling.php → .../HttpKernel/Profiler/ProfilerListener.php b/...ponents/HttpKernel/Listener/Profiling.php → .../HttpKernel/Profiler/ProfilerListener.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Symfony\Components\HttpKernel\Listener;
+namespace Symfony\Components\HttpKernel\Profiler;
 
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
 use Symfony\Components\HttpKernel\Response;
 use Symfony\Components\HttpKernel\HttpKernelInterface;
-use Symfony\Components\HttpKernel\Profiler\Profiler;
 
 /*
  * This file is part of the Symfony framework.
@@ -18,13 +17,13 @@
  */
 
 /**
- * Profiling collects data for the current request by listening to the core.response event.
+ * ProfilerListener collects data for the current request by listening to the core.response event.
  *
  * @package    Symfony
  * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class Profiling
+class ProfilerListener
 {
     protected $profiler;
 

diff --git a/...s/HttpKernel/Listener/WebDebugToolbar.php → ...rnel/Profiler/WebDebugToolbarListener.php b/...s/HttpKernel/Listener/WebDebugToolbar.php → ...rnel/Profiler/WebDebugToolbarListener.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace Symfony\Components\HttpKernel\Listener;
+namespace Symfony\Components\HttpKernel\Profiler;
 
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
 use Symfony\Components\HttpKernel\Request;
 use Symfony\Components\HttpKernel\Response;
 use Symfony\Components\HttpKernel\HttpKernelInterface;
-use Symfony\Components\HttpKernel\Profiler\Profiler;
 
 /*
  * This file is part of the Symfony framework.
@@ -19,13 +18,13 @@
  */
 
 /**
- * WebDebugToolbar.
+ * WebDebugToolbarListener.
  *
  * @package    Symfony
  * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class WebDebugToolbar
+class WebDebugToolbarListener
 {
     protected $profiler;
 

diff --git a/...ts/HttpKernel/Listener/ResponseFilter.php → ...omponents/HttpKernel/ResponseListener.php b/...ts/HttpKernel/Listener/ResponseFilter.php → ...omponents/HttpKernel/ResponseListener.php
@@ -1,11 +1,9 @@
 <?php
 
-namespace Symfony\Components\HttpKernel\Listener;
+namespace Symfony\Components\HttpKernel;
 
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
-use Symfony\Components\HttpKernel\Response;
-use Symfony\Components\HttpKernel\HttpKernelInterface;
 
 /*
  * This file is part of the Symfony framework.
@@ -17,13 +15,13 @@
  */
 
 /**
- * ResponseFilter.
+ * ResponseListener.
  *
  * @package    Symfony
  * @subpackage Components_HttpKernel
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class ResponseFilter
+class ResponseListener
 {
     /**
      * Registers a core.response listener to change the Content-Type header based on the Request format.

diff --git a/src/Symfony/Foundation/DependencyInjection/KernelExtension.php b/src/Symfony/Foundation/DependencyInjection/KernelExtension.php
@@ -53,7 +53,7 @@ public function configLoad($config)
                 'Symfony\\Components\\HttpKernel\\HttpKernel',
                 'Symfony\\Components\\HttpKernel\\Request',
                 'Symfony\\Components\\HttpKernel\\Response',
-                'Symfony\\Components\\HttpKernel\\Listener\\ResponseFilter',
+                'Symfony\\Components\\HttpKernel\\ResponseListener',
                 'Symfony\\Components\\Templating\\Loader\\LoaderInterface',
                 'Symfony\\Components\\Templating\\Loader\\Loader',
                 'Symfony\\Components\\Templating\\Loader\\FilesystemLoader',
@@ -63,9 +63,9 @@ public function configLoad($config)
                 'Symfony\\Components\\Templating\\Renderer\\PhpRenderer',
                 'Symfony\\Components\\Templating\\Storage\\Storage',
                 'Symfony\\Components\\Templating\\Storage\\FileStorage',
+                'Symfony\\Framework\\FoundationBundle\\RequestListener',
                 'Symfony\\Framework\\FoundationBundle\\Controller',
-                'Symfony\\Framework\\FoundationBundle\\Listener\\RequestParser',
-                'Symfony\\Framework\\FoundationBundle\\Listener\\ControllerLoader',
+                'Symfony\\Framework\\FoundationBundle\\Controller\\ControllerLoaderListener',
                 'Symfony\\Framework\\FoundationBundle\\Templating\\Engine',
             );
         } else {

diff --git a/src/Symfony/Foundation/bootstrap.php b/src/Symfony/Foundation/bootstrap.php
@@ -212,7 +212,7 @@ public function configLoad($config)
                 'Symfony\\Components\\HttpKernel\\HttpKernel',
                 'Symfony\\Components\\HttpKernel\\Request',
                 'Symfony\\Components\\HttpKernel\\Response',
-                'Symfony\\Components\\HttpKernel\\Listener\\ResponseFilter',
+                'Symfony\\Components\\HttpKernel\\ResponseListener',
                 'Symfony\\Components\\Templating\\Loader\\LoaderInterface',
                 'Symfony\\Components\\Templating\\Loader\\Loader',
                 'Symfony\\Components\\Templating\\Loader\\FilesystemLoader',
@@ -222,9 +222,9 @@ public function configLoad($config)
                 'Symfony\\Components\\Templating\\Renderer\\PhpRenderer',
                 'Symfony\\Components\\Templating\\Storage\\Storage',
                 'Symfony\\Components\\Templating\\Storage\\FileStorage',
+                'Symfony\\Framework\\FoundationBundle\\RequestListener',
                 'Symfony\\Framework\\FoundationBundle\\Controller',
-                'Symfony\\Framework\\FoundationBundle\\Listener\\RequestParser',
-                'Symfony\\Framework\\FoundationBundle\\Listener\\ControllerLoader',
+                'Symfony\\Framework\\FoundationBundle\\Controller\\ControllerLoaderListener',
                 'Symfony\\Framework\\FoundationBundle\\Templating\\Engine',
             );
         } else {

diff --git a/...ationBundle/Listener/ControllerLoader.php → ...e/Controller/ControllerLoaderListener.php b/...ationBundle/Listener/ControllerLoader.php → ...e/Controller/ControllerLoaderListener.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Symfony\Framework\FoundationBundle\Listener;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
-use Symfony\Framework\FoundationBundle\Controller\ControllerManager;
 use Symfony\Components\HttpKernel\LoggerInterface;
 use Symfony\Components\EventDispatcher\EventDispatcher;
 use Symfony\Components\EventDispatcher\Event;
@@ -17,14 +16,14 @@
  */
 
 /**
- * ControllerLoader listen to the core.load_controller and finds the controller
+ * ControllerLoaderListener listen to the core.load_controller and finds the controller
  * to execute based on the request parameters.
  *
  * @package    Symfony
  * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class ControllerLoader
+class ControllerLoaderListener
 {
     protected $manager;
     protected $logger;

diff --git a/...ationBundle/Listener/ExceptionHandler.php → ...onBundle/Controller/ExceptionListener.php b/...ationBundle/Listener/ExceptionHandler.php → ...onBundle/Controller/ExceptionListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\FoundationBundle\Listener;
+namespace Symfony\Framework\FoundationBundle\Controller;
 
 use Symfony\Components\DependencyInjection\ContainerInterface;
 use Symfony\Components\EventDispatcher\EventDispatcher;
@@ -18,13 +18,13 @@
  */
 
 /**
- * ExceptionHandler.
+ * ExceptionListener.
  *
  * @package    Symfony
  * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class ExceptionHandler
+class ExceptionListener
 {
     protected $container;
     protected $controller;

diff --git a/...undationBundle/Listener/RequestParser.php → ...work/FoundationBundle/RequestListener.php b/...undationBundle/Listener/RequestParser.php → ...work/FoundationBundle/RequestListener.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Framework\FoundationBundle\Listener;
+namespace Symfony\Framework\FoundationBundle;
 
 use Symfony\Components\HttpKernel\LoggerInterface;
 use Symfony\Components\DependencyInjection\ContainerInterface;
@@ -19,13 +19,13 @@
  */
 
 /**
- * RequestParser.
+ * RequestListener.
  *
  * @package    Symfony
  * @subpackage Framework_FoundationBundle
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class RequestParser
+class RequestListener
 {
     protected $container;
     protected $router;

diff --git a/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/profiling.xml
@@ -9,7 +9,7 @@
         <parameter key="profiler.storage.class">Symfony\Components\HttpKernel\Profiler\ProfilerStorage</parameter>
         <parameter key="profiler.storage.file">%kernel.cache_dir%/profiler.db</parameter>
         <parameter key="profiler.storage.lifetime">86400</parameter>
-        <parameter key="profiling.class">Symfony\Components\HttpKernel\Listener\Profiling</parameter>
+        <parameter key="profiler_listener.class">Symfony\Components\HttpKernel\Profiler\ProfilerListener</parameter>
     </parameters>
 
     <services>
@@ -25,7 +25,7 @@
             <argument>%profiler.storage.lifetime%</argument>
         </service>
 
-        <service id="profiling" class="%profiling.class%">
+        <service id="profiler_listener" class="%profiler_listener.class%">
             <annotation name="kernel.listener" />
             <argument type="service" id="profiler" />
         </service>

diff --git a/src/Symfony/Framework/FoundationBundle/Resources/config/toolbar.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/toolbar.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="debug.toolbar.class">Symfony\Components\HttpKernel\Listener\WebDebugToolbar</parameter>
+        <parameter key="debug.toolbar.class">Symfony\Components\HttpKernel\Profiler\WebDebugToolbarListener</parameter>
     </parameters>
 
     <services>

diff --git a/src/Symfony/Framework/FoundationBundle/Resources/config/web.xml b/src/Symfony/Framework/FoundationBundle/Resources/config/web.xml
@@ -5,15 +5,15 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="request_parser.class">Symfony\Framework\FoundationBundle\Listener\RequestParser</parameter>
+        <parameter key="request_listener.class">Symfony\Framework\FoundationBundle\RequestListener</parameter>
         <parameter key="controller_manager.class">Symfony\Framework\FoundationBundle\Controller\ControllerManager</parameter>
-        <parameter key="controller_loader.class">Symfony\Framework\FoundationBundle\Listener\ControllerLoader</parameter>
+        <parameter key="controller_loader_listener.class">Symfony\Framework\FoundationBundle\Controller\ControllerLoaderListener</parameter>
         <parameter key="router.class">Symfony\Components\Routing\Router</parameter>
-        <parameter key="response_filter.class">Symfony\Components\HttpKernel\Listener\ResponseFilter</parameter>
-        <parameter key="exception_handler.class">Symfony\Framework\FoundationBundle\Listener\ExceptionHandler</parameter>
-        <parameter key="exception_handler.controller">FoundationBundle:Exception:exception</parameter>
+        <parameter key="response_listener.class">Symfony\Components\HttpKernel\ResponseListener</parameter>
+        <parameter key="exception_listener.class">Symfony\Framework\FoundationBundle\Controller\ExceptionListener</parameter>
+        <parameter key="exception_listener.controller">FoundationBundle:Exception:exception</parameter>
         <parameter key="esi.class">Symfony\Components\HttpKernel\Cache\Esi</parameter>
-        <parameter key="esi_filter.class">Symfony\Components\HttpKernel\Listener\EsiFilter</parameter>
+        <parameter key="esi_listener.class">Symfony\Components\HttpKernel\Cache\EsiListener</parameter>
     </parameters>
 
     <services>
@@ -22,13 +22,13 @@
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <service id="controller_loader" class="%controller_loader.class%">
+        <service id="controller_loader_listener" class="%controller_loader_listener.class%">
             <annotation name="kernel.listener" />
             <argument type="service" id="controller_manager" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
-        <service id="request_parser" class="%request_parser.class%">
+        <service id="request_listener" class="%request_listener.class%">
             <annotation name="kernel.listener" />
             <argument type="service" id="service_container" />
             <argument type="service" id="router" />
@@ -50,20 +50,20 @@
 
         <service id="esi" class="%esi.class%" />
 
-        <service id="esi_filter" class="%esi_filter.class%">
+        <service id="esi_listener" class="%esi_listener.class%">
           <annotation name="kernel.listener" />
           <argument type="service" id="esi" on-invalid="ignore" />
         </service>
 
-        <service id="response_filter" class="%response_filter.class%">
+        <service id="response_listener" class="%response_listener.class%">
             <annotation name="kernel.listener" />
         </service>
 
-        <service id="exception_handler" class="%exception_handler.class%">
+        <service id="exception_listener" class="%exception_listener.class%">
             <annotation name="kernel.listener" />
             <argument type="service" id="service_container" />
             <argument type="service" id="logger" on-invalid="null" />
-            <argument>%exception_handler.controller%</argument>
+            <argument>%exception_listener.controller%</argument>
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Framework/FoundationBundle/Tests/DependencyInjection/WebExtensionTest.php b/src/Symfony/Framework/FoundationBundle/Tests/DependencyInjection/WebExtensionTest.php
@@ -23,7 +23,7 @@ public function testConfigLoad()
         $loader = $this->getWebExtension();
 
         $configuration = $loader->configLoad(array(), $configuration);
-        $this->assertEquals('Symfony\\Framework\\FoundationBundle\\Listener\\RequestParser', $configuration->getParameter('request_parser.class'), '->webLoad() loads the web.xml file if not already loaded');
+        $this->assertEquals('Symfony\\Framework\\FoundationBundle\\RequestListener', $configuration->getParameter('request_listener.class'), '->webLoad() loads the web.xml file if not already loaded');
 
         $configuration = new BuilderConfiguration();
         $loader = $this->getWebExtension();
@@ -33,7 +33,7 @@ public function testConfigLoad()
         $this->assertFalse($configuration->hasParameter('debug.toolbar.class'), '->configLoad() does not load the toolbar.xml file');
 
         $configuration = $loader->configLoad(array('toolbar' => true), $configuration);
-        $this->assertEquals('Symfony\\Components\\HttpKernel\\Listener\\WebDebugToolbar', $configuration->getParameter('debug.toolbar.class'), '->configLoad() loads the collectors.xml file if the toolbar option is given');
+        $this->assertEquals('Symfony\\Components\\HttpKernel\\Profiler\\WebDebugToolbarListener', $configuration->getParameter('debug.toolbar.class'), '->configLoad() loads the collectors.xml file if the toolbar option is given');
     }
 
     public function testUserLoad()