Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit 56432ffabc35 · 2025-11-16T11:24:03.000+01:00
* 7.4:
  fix merge
diff --git a/Controller/ControllerHelper.php b/Controller/ControllerHelper.php
@@ -148,6 +148,10 @@ public function json(mixed $data, int $status = 200, array $headers = [], array
             return new JsonResponse($json, $status, $headers, true);
         }
 
+        if (null === $data) {
+            return new JsonResponse('null', $status, $headers, true);
+        }
+
         return new JsonResponse($data, $status, $headers);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,10 @@ public function json(mixed $data, int $status = 200, array $headers = [], array`
`148`	`148`	`return new JsonResponse($json, $status, $headers, true);`
`149`	`149`	`}`
`150`	`150`
	`151`	`+ if (null === $data) {`
	`152`	`+ return new JsonResponse('null', $status, $headers, true);`
	`153`	`+ }`
	`154`	`+`
`151`	`155`	`return new JsonResponse($data, $status, $headers);`
`152`	`156`	`}`
`153`	`157`