namespace Symfony\Component\HttpKernel;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolver;
+use Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
+use Symfony\Component\HttpKernel\Event\FilterControllerArgumentsEvent;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
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;
protected $dispatcher;
protected $resolver;
protected $requestStack;
+ private $argumentResolver;
- /**
- * Constructor.
- *
- * @param EventDispatcherInterface $dispatcher An EventDispatcherInterface instance
- * @param ControllerResolverInterface $resolver A ControllerResolverInterface instance
- * @param RequestStack $requestStack A stack for master/sub requests
- */
- public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null)
+ public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null, ArgumentResolverInterface $argumentResolver = null)
{
$this->dispatcher = $dispatcher;
$this->resolver = $resolver;
$this->requestStack = $requestStack ?: new RequestStack();
+ $this->argumentResolver = $argumentResolver;
+
+ if (null === $this->argumentResolver) {
+ @trigger_error(sprintf('As of 3.1 an %s is used to resolve arguments. In 4.0 the $argumentResolver becomes the %s if no other is provided instead of using the $resolver argument.', ArgumentResolverInterface::class, ArgumentResolver::class), E_USER_DEPRECATED);
+ // fallback in case of deprecations
+ $this->argumentResolver = $resolver;
+ }
}
/**
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);
$controller = $event->getController();
// controller arguments
- $arguments = $this->resolver->getArguments($request, $controller);
+ $arguments = $this->argumentResolver->getArguments($request, $controller);
+
+ $event = new FilterControllerArgumentsEvent($this, $controller, $arguments, $request, $type);
+ $this->dispatcher->dispatch(KernelEvents::CONTROLLER_ARGUMENTS, $event);
+ $controller = $event->getController();
+ $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