use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
use Symfony\Component\HttpKernel\Event\PostResponseEvent;
-use Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException;
+use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
try {
return $this->handleRaw($request, $type);
} catch (\Exception $e) {
- if ($e instanceof ConflictingHeadersException) {
- $e = new BadRequestHttpException('The request headers contain conflicting information regarding the origin of this request.', $e);
+ if ($e instanceof RequestExceptionInterface) {
+ $e = new BadRequestHttpException($e->getMessage(), $e);
}
if (false === $catch) {
$this->finishRequest($request, $type);
}
/**
- * @throws \LogicException If the request stack is empty
- *
* @internal
*/
- public function terminateWithException(\Exception $exception)
+ public function terminateWithException(\Exception $exception, Request $request = null)
{
- if (!$request = $this->requestStack->getMasterRequest()) {
- throw new \LogicException('Request stack is empty', 0, $exception);
+ if (!$request = $request ?: $this->requestStack->getMasterRequest()) {
+ throw $exception;
}
$response = $this->handleException($exception, $request, self::MASTER_REQUEST);
$arguments = $event->getArguments();
// call controller
- $response = call_user_func_array($controller, $arguments);
+ $response = \call_user_func_array($controller, $arguments);
// view
if (!$response instanceof Response) {
// the developer asked for a specific status code
if ($response->headers->has('X-Status-Code')) {
+ @trigger_error(sprintf('Using the X-Status-Code header is deprecated since Symfony 3.3 and will be removed in 4.0. Use %s::allowCustomResponseCode() instead.', GetResponseForExceptionEvent::class), E_USER_DEPRECATED);
+
$response->setStatusCode($response->headers->get('X-Status-Code'));
$response->headers->remove('X-Status-Code');
- } elseif (!$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
+ } elseif (!$event->isAllowingCustomResponseCode() && !$response->isClientError() && !$response->isServerError() && !$response->isRedirect()) {
// ensure that we actually have an error response
if ($e instanceof HttpExceptionInterface) {
// keep the HTTP status code and headers