[GH-7707] Fix bug with order of RequestFinished event + handling duri…

…ng exception.
symfony · beberlei · Apr 18, 2013 · Apr 18, 2013 · Apr 30, 2013 · Apr 30, 2013
commit ec539ae599bd3890372b791c1592acb2219a0373
diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php
@@ -76,6 +76,8 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
        try {
            return $this->handleRaw($request, $type);
        } catch (\Exception $e) {
+            $this->finishRequest($request, $type);
+
            if (false === $catch) {
                throw $e;
            }
@@ -174,13 +176,29 @@ private function filterResponse(Response $response, Request $request, $type)

        $this->dispatcher->dispatch(KernelEvents::RESPONSE, $event);

-        $this->requestStack->pop();
-
-        $this->dispatcher->dispatch(KernelEvents::REQUEST_FINISHED, new RequestFinishedEvent($this, $request, $type));
+        $this->finishRequest($request, $type);

        return $event->getResponse();
    }

+    /**
+     * Publish event finished event, then pop the request from the stack.
+     *
+     * Note: Order of the operations is important here, otherwise operations
+     * such as {@link RequestStack::getParentRequest()} can lead to weird
+     * results.
+     *
+     * @param Request $request
+     * @param int $type
+     *
+     * @return void
+     */
+    private function finishRequest(Request $request, $type)
+    {
+        $this->dispatcher->dispatch(KernelEvents::REQUEST_FINISHED, new RequestFinishedEvent($this, $request, $type));
+        $this->requestStack->pop();
+    }
+
    /**
     * Handles an exception by trying to convert it to a Response.
     *

diff --git a/src/Symfony/Component/HttpKernel/RequestStack.php b/src/Symfony/Component/HttpKernel/RequestStack.php
@@ -52,7 +52,7 @@ public function getMasterRequest()
    /**
     * Return the parent request of the current.
     *
-     * If current Request ist the master request, method returns null.
+     * If current Request is the master request, method returns null.
     *
     * @return Request
     */