[HttpKernel] renamed the kernel finished event

fabpot · fabpot · commit f9b10ba1d571 · 2013-09-07T21:43:50.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Event/FinishRequestEvent.php b/src/Symfony/Component/HttpKernel/Event/FinishRequestEvent.php
@@ -16,6 +16,6 @@
  *
  * @author Benjamin Eberlei <kontakt@beberlei.de>
  */
-class RequestFinishedEvent extends KernelEvent
+class FinishRequestEvent extends KernelEvent
 {
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -12,7 +12,7 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\RequestFinishedEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\RequestContext;
 use Symfony\Component\HttpFoundation\Request;
@@ -46,7 +46,7 @@ public function onKernelRequest(GetResponseEvent $event)
         $this->setRouterContext($request);
     }
 
-    public function onKernelRequestFinished(RequestFinishedEvent $event)
+    public function onKernelFinishRequest(FinishRequestEvent $event)
     {
         $this->resetRouterContext();
     }
@@ -85,7 +85,7 @@ public static function getSubscribedEvents()
         return array(
             // must be registered after the Router to have access to the _locale
             KernelEvents::REQUEST => array(array('onKernelRequest', 16)),
-            KernelEvents::REQUEST_FINISHED => array(array('onKernelRequestFinished', 0)),
+            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
         );
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
@@ -13,7 +13,7 @@
 
 use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\Event\RequestFinishedEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -83,7 +83,7 @@ private function populateRoutingContext(Request $request = null)
         $this->request = $request;
     }
 
-     public function onKernelRequestFinished(RequestFinishedEvent $event)
+     public function onKernelFinishRequest(FinishRequestEvent $event)
      {
          $this->populateRoutingContext($this->kernelContext->getParentRequest());
      }
@@ -148,7 +148,7 @@ public static function getSubscribedEvents()
     {
         return array(
             KernelEvents::REQUEST => array(array('onKernelRequest', 32)),
-            KernelEvents::REQUEST_FINISHED => array(array('onKernelRequestFinished', 0)),
+            KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),
         );
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -16,7 +16,7 @@
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\Event\FilterControllerEvent;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
-use Symfony\Component\HttpKernel\Event\RequestFinishedEvent;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@@ -183,7 +183,7 @@ private function filterResponse(Response $response, Request $request, $type)
      */
     private function finishRequest(Request $request, $type)
     {
-        $this->dispatcher->dispatch(KernelEvents::REQUEST_FINISHED, new RequestFinishedEvent($this, $request, $type));
+        $this->dispatcher->dispatch(KernelEvents::FINISH_REQUEST, new FinishRequestEvent($this, $request, $type));
         $this->requestStack->pop();
     }
 
diff --git a/src/Symfony/Component/HttpKernel/KernelEvents.php b/src/Symfony/Component/HttpKernel/KernelEvents.php
@@ -111,5 +111,5 @@ final class KernelEvents
      *
      * @var string
      */
-    const REQUEST_FINISHED = 'kernel.request_finished';
+    const FINISH_REQUEST = 'kernel.finish_request';
 }
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -65,7 +65,7 @@ public function testLocaleSetForRoutingContext()
         $listener->onKernelRequest($this->getEvent($request));
     }
 
-    public function testRouterResetWithParentRequestOnKernelRequestFinished()
+    public function testRouterResetWithParentRequestOnKernelFinishRequest()
     {
         if (!class_exists('Symfony\Component\Routing\Router')) {
             $this->markTestSkipped('The "Routing" component is not available');
@@ -83,10 +83,10 @@ public function testRouterResetWithParentRequestOnKernelRequestFinished()
 
         $this->context->expects($this->once())->method('getParentRequest')->will($this->returnValue($parentRequest));
 
-        $event = $this->getMock('Symfony\Component\HttpKernel\Event\RequestFinishedEvent', array(), array(), '', false);
+        $event = $this->getMock('Symfony\Component\HttpKernel\Event\FinishRequestEvent', array(), array(), '', false);
 
         $listener = new LocaleListener('fr', $this->context, $router);
-        $listener->onKernelRequestFinished($event);
+        $listener->onKernelFinishRequest($event);
     }
 
     public function testRequestLocaleIsNotOverridden()

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Benjamin Eberlei <kontakt@beberlei.de>`
`18`	`18`	`*/`
`19`		`-class RequestFinishedEvent extends KernelEvent`
	`19`	`+class FinishRequestEvent extends KernelEvent`
`20`	`20`	`{`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\HttpKernel\EventListener;`
`13`	`13`
`14`	`14`	`use Symfony\Component\HttpKernel\Event\GetResponseEvent;`
`15`		`-use Symfony\Component\HttpKernel\Event\RequestFinishedEvent;`
	`15`	`+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;`
`16`	`16`	`use Symfony\Component\HttpKernel\KernelEvents;`
`17`	`17`	`use Symfony\Component\HttpKernel\RequestContext;`
`18`	`18`	`use Symfony\Component\HttpFoundation\Request;`
`@@ -46,7 +46,7 @@ public function onKernelRequest(GetResponseEvent $event)`
`46`	`46`	`$this->setRouterContext($request);`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function onKernelRequestFinished(RequestFinishedEvent $event)`
	`49`	`+ public function onKernelFinishRequest(FinishRequestEvent $event)`
`50`	`50`	`{`
`51`	`51`	`$this->resetRouterContext();`
`52`	`52`	`}`
`@@ -85,7 +85,7 @@ public static function getSubscribedEvents()`
`85`	`85`	`return array(`
`86`	`86`	`// must be registered after the Router to have access to the _locale`
`87`	`87`	`KernelEvents::REQUEST => array(array('onKernelRequest', 16)),`
`88`		`- KernelEvents::REQUEST_FINISHED => array(array('onKernelRequestFinished', 0)),`
	`88`	`+ KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),`
`89`	`89`	`);`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Psr\Log\LoggerInterface;`
`15`	`15`	`use Symfony\Component\HttpKernel\Event\GetResponseEvent;`
`16`		`-use Symfony\Component\HttpKernel\Event\RequestFinishedEvent;`
	`16`	`+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;`
`17`	`17`	`use Symfony\Component\HttpKernel\KernelEvents;`
`18`	`18`	`use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;`
`19`	`19`	`use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;`
`@@ -83,7 +83,7 @@ private function populateRoutingContext(Request $request = null)`
`83`	`83`	`$this->request = $request;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public function onKernelRequestFinished(RequestFinishedEvent $event)`
	`86`	`+ public function onKernelFinishRequest(FinishRequestEvent $event)`
`87`	`87`	`{`
`88`	`88`	`$this->populateRoutingContext($this->kernelContext->getParentRequest());`
`89`	`89`	`}`
`@@ -148,7 +148,7 @@ public static function getSubscribedEvents()`
`148`	`148`	`{`
`149`	`149`	`return array(`
`150`	`150`	`KernelEvents::REQUEST => array(array('onKernelRequest', 32)),`
`151`		`- KernelEvents::REQUEST_FINISHED => array(array('onKernelRequestFinished', 0)),`
	`151`	`+ KernelEvents::FINISH_REQUEST => array(array('onKernelFinishRequest', 0)),`
`152`	`152`	`);`
`153`	`153`	`}`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,5 +111,5 @@ final class KernelEvents`
`111`	`111`	`*`
`112`	`112`	`* @var string`
`113`	`113`	`*/`
`114`		`- const REQUEST_FINISHED = 'kernel.request_finished';`
	`114`	`+ const FINISH_REQUEST = 'kernel.finish_request';`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function testLocaleSetForRoutingContext()`
`65`	`65`	`$listener->onKernelRequest($this->getEvent($request));`
`66`	`66`	`}`
`67`	`67`
`68`		`- public function testRouterResetWithParentRequestOnKernelRequestFinished()`
	`68`	`+ public function testRouterResetWithParentRequestOnKernelFinishRequest()`
`69`	`69`	`{`
`70`	`70`	`if (!class_exists('Symfony\Component\Routing\Router')) {`
`71`	`71`	`$this->markTestSkipped('The "Routing" component is not available');`
`@@ -83,10 +83,10 @@ public function testRouterResetWithParentRequestOnKernelRequestFinished()`
`83`	`83`
`84`	`84`	`$this->context->expects($this->once())->method('getParentRequest')->will($this->returnValue($parentRequest));`
`85`	`85`
`86`		`- $event = $this->getMock('Symfony\Component\HttpKernel\Event\RequestFinishedEvent', array(), array(), '', false);`
	`86`	`+ $event = $this->getMock('Symfony\Component\HttpKernel\Event\FinishRequestEvent', array(), array(), '', false);`
`87`	`87`
`88`	`88`	`$listener = new LocaleListener('fr', $this->context, $router);`
`89`		`- $listener->onKernelRequestFinished($event);`
	`89`	`+ $listener->onKernelFinishRequest($event);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public function testRequestLocaleIsNotOverridden()`