Merge branch '4.4' into 5.1

fabpot · fabpot · commit e9d23677a718 · 2020-10-14T09:58:47.000+02:00
* 4.4:
  Fix tests
  Remove content-type check on toArray methods
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -143,12 +143,6 @@ public function toArray(bool $throw = true): array
             return $this->jsonData;
         }
 
-        $contentType = $this->headers['content-type'][0] ?? 'application/json';
-
-        if (!preg_match('/\bjson\b/i', $contentType)) {
-            throw new JsonException(sprintf('Response content-type is "%s" while a JSON-compatible one was expected for "%s".', $contentType, $this->getInfo('url')));
-        }
-
         try {
             $content = json_decode($content, true, 512, \JSON_BIGINT_AS_STRING | (\PHP_VERSION_ID >= 70300 ? \JSON_THROW_ON_ERROR : 0));
         } catch (\JsonException $e) {
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -41,12 +41,6 @@ public function toArrayErrors()
             'message' => 'Response body is empty.',
         ];
 
-        yield [
-            'content' => '{}',
-            'responseHeaders' => ['content-type' => 'plain/text'],
-            'message' => 'Response content-type is "plain/text" while a JSON-compatible one was expected for "https://example.com/file.json".',
-        ];
-
         yield [
             'content' => 'not json',
             'responseHeaders' => [],
