Also accept the wildcard accept header for application/json

sonata-project · Jul 23, 2020 · 75e66d6 · 75e66d6
1 parent dbd9087
commit 75e66d6
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/Controller/CRUDController.php b/src/Controller/CRUDController.php
@@ -1563,10 +1563,8 @@ private function setFormTheme(FormView $formView, ?array $theme = null): void
 
     private function handleXmlHttpRequestErrorResponse(Request $request, FormInterface $form): ?JsonResponse
     {
-        if (!\in_array('application/json', $request->getAcceptableContentTypes(), true)) {
-            @trigger_error('In next major version response will return 406 NOT ACCEPTABLE without `Accept: application/json`', E_USER_DEPRECATED);
-
-            return null;
+        if (0 === \count(array_intersect(['application/json', '*/*'], $request->getAcceptableContentTypes()))) {
+            return $this->renderJson([], Response::HTTP_NOT_ACCEPTABLE);
         }
 
         $errors = [];
@@ -1585,7 +1583,7 @@ private function handleXmlHttpRequestErrorResponse(Request $request, FormInterfa
      */
     private function handleXmlHttpRequestSuccessResponse(Request $request, $object): JsonResponse
     {
-        if (!\in_array('application/json', $request->getAcceptableContentTypes(), true)) {
+        if (0 === \count(array_intersect(['application/json', '*/*'], $request->getAcceptableContentTypes()))) {
             @trigger_error('In next major version response will return 406 NOT ACCEPTABLE without `Accept: application/json`', E_USER_DEPRECATED);
         }