From 7a8d67f1e2d2307105f8f2eb9d06f61258392340 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Fri, 4 Mar 2022 15:14:05 +0000
Subject: [PATCH] [CORE][Controller] Fix bug where a JSON request could not
 recieve a redirect response

---
 src/Core/Controller.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Core/Controller.php b/src/Core/Controller.php
index e3ea25cd5b..e460a4cc75 100644
--- a/src/Core/Controller.php
+++ b/src/Core/Controller.php
@@ -81,7 +81,6 @@ abstract class Controller extends AbstractController implements EventSubscriberI
      */
     public function __invoke(Request $request)
     {
-        $this->request = $request;
         $class         = static::class;
         $method        = 'on' . ucfirst(mb_strtolower($request->getMethod()));
         $attributes    = array_diff_key($request->attributes->get('_route_params'), array_flip(['_format', '_fragment', '_locale', 'template', 'accept', 'is_system_path']));
@@ -156,10 +155,10 @@ abstract class Controller extends AbstractController implements EventSubscriberI
             'vars' => $this->vars,
             'response' => &$potential_response,
         ]) !== Event::stop) {
-            if ($format === 'json') {
-                $event->setResponse(new JsonResponse($response));
-            } elseif ($redirect !== false) {
+            if ($redirect !== false) {
                 $event->setResponse(new RedirectResponse($redirect));
+            } elseif ($format === 'json') {
+                $event->setResponse(new JsonResponse($response));
             } elseif (!\is_null($template)) {
                 $event->setResponse($this->render($template, $this->vars));
             } else {