Merge pull request FriendsOfSymfony#24 from GromNaN/patch-1

willdurand · willdurand · commit f890a3c2c088 · 2013-06-26T07:35:24.000-07:00
Remove charset from the response content-type
diff --git a/lib/OAuth2/OAuth2.php b/lib/OAuth2/OAuth2.php
@@ -1250,7 +1250,7 @@ protected function getAuthorizationHeader(Request $request) {
    */
   private function getJsonHeaders() {
     return array(
-      'Content-Type' => 'application/json;charset=UTF-8',
+      'Content-Type' => 'application/json',
       'Cache-Control' => 'no-store',
       'Pragma' => 'no-cache',
     );
diff --git a/tests/OAuth2Test.php b/tests/OAuth2Test.php
@@ -358,7 +358,7 @@ public function testGrantAccessTokenWithGrantUser() {
     )));
 
     $this->assertSame(array(
-      'content-type' => array('application/json;charset=UTF-8'),
+      'content-type' => array('application/json'),
       'cache-control' => array('no-store, private'),
       'pragma' => array('no-cache'),
     ), array_diff_key(
@@ -423,7 +423,7 @@ public function testGrantAccessTokenWithGrantUserWithScope() {
     )));
 
     $this->assertSame(array(
-      'content-type' => array('application/json;charset=UTF-8'),
+      'content-type' => array('application/json'),
       'cache-control' => array('no-store, private'),
       'pragma' => array('no-cache'),
     ), array_diff_key(
@@ -457,7 +457,7 @@ public function testGrantAccessTokenWithGrantUserWithReducedScope() {
     )));
 
     $this->assertSame(array(
-      'content-type' => array('application/json;charset=UTF-8'),
+      'content-type' => array('application/json'),
       'cache-control' => array('no-store, private'),
       'pragma' => array('no-cache'),
     ), array_diff_key(
@@ -516,7 +516,7 @@ public function testGrantAccessTokenWithGrantExtension() {
     )));
 
     $this->assertSame(array(
-      'content-type' => array('application/json;charset=UTF-8'),
+      'content-type' => array('application/json'),
       'cache-control' => array('no-store, private'),
       'pragma' => array('no-cache'),
     ), array_diff_key(
