From d9154bffbf7b0031e5bd3ed1f68db3fae6ab5959 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Wed, 15 Aug 2018 12:10:39 +0100 Subject: [PATCH] FIX text/json is not a valid mimetype --- src/Control/PjaxResponseNegotiator.php | 2 +- src/Forms/GridField/GridFieldAddExistingAutocompleter.php | 2 +- tests/php/Control/PjaxResponseNegotiatorTest.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Control/PjaxResponseNegotiator.php b/src/Control/PjaxResponseNegotiator.php index 9066857c6..53557a7ea 100644 --- a/src/Control/PjaxResponseNegotiator.php +++ b/src/Control/PjaxResponseNegotiator.php @@ -103,7 +103,7 @@ class PjaxResponseNegotiator } } $response->setBody(Convert::raw2json($responseParts)); - $response->addHeader('Content-Type', 'text/json'); + $response->addHeader('Content-Type', 'application/json'); return $response; } diff --git a/src/Forms/GridField/GridFieldAddExistingAutocompleter.php b/src/Forms/GridField/GridFieldAddExistingAutocompleter.php index ee4cb4051..48a45a945 100644 --- a/src/Forms/GridField/GridFieldAddExistingAutocompleter.php +++ b/src/Forms/GridField/GridFieldAddExistingAutocompleter.php @@ -263,7 +263,7 @@ class GridFieldAddExistingAutocompleter implements GridField_HTMLProvider, GridF } Config::unnest(); $response = new HTTPResponse(Convert::array2json($json)); - $response->addHeader('Content-Type', 'text/json'); + $response->addHeader('Content-Type', 'application/json'); return $response; } diff --git a/tests/php/Control/PjaxResponseNegotiatorTest.php b/tests/php/Control/PjaxResponseNegotiatorTest.php index 92ce24d45..5d3bd68c5 100644 --- a/tests/php/Control/PjaxResponseNegotiatorTest.php +++ b/tests/php/Control/PjaxResponseNegotiatorTest.php @@ -62,7 +62,7 @@ class PjaxResponseNegotiatorTest extends SapphireTest $request = new HTTPRequest('GET', '/'); $request->setSession(new Session([])); $request->addHeader('X-Pjax', 'myfragment,otherfragment'); - $request->addHeader('Accept', 'text/json'); + $request->addHeader('Accept', 'application/json'); $response = $negotiator->respond($request); $json = json_decode($response->getBody()); $this->assertObjectHasAttribute('myfragment', $json); @@ -87,7 +87,7 @@ class PjaxResponseNegotiatorTest extends SapphireTest $request = new HTTPRequest('GET', '/'); $request->setSession(new Session([])); $request->addHeader('X-Pjax', 'alpha'); - $request->addHeader('Accept', 'text/json'); + $request->addHeader('Accept', 'application/json'); $response = $negotiator->setFragmentOverride(array('beta'))->respond($request); $json = json_decode($response->getBody());