From 1056bf200cb92cf7528f0f97ad156c9063b88f3f Mon Sep 17 00:00:00 2001 From: Vincent CHALAMON Date: Sun, 24 Dec 2017 21:43:35 +0100 Subject: [PATCH 1/2] Add application/ld+json format associated to json --- src/Symfony/Component/HttpFoundation/Request.php | 2 +- src/Symfony/Component/HttpFoundation/Tests/RequestTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index 83b62142c9c47..3d119d2975dc6 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -1875,7 +1875,7 @@ protected static function initializeFormats() 'txt' => array('text/plain'), 'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'), 'css' => array('text/css'), - 'json' => array('application/json', 'application/x-json'), + 'json' => array('application/json', 'application/x-json', 'application/ld+json'), 'xml' => array('text/xml', 'application/xml', 'application/x-xml'), 'rdf' => array('application/rdf+xml'), 'atom' => array('application/atom+xml'), diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php index ed4224c4fd38f..f926c4eb2ac3a 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php @@ -333,7 +333,7 @@ public function getFormatToMimeTypeMapProvider() array('txt', array('text/plain')), array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')), array('css', array('text/css')), - array('json', array('application/json', 'application/x-json')), + array('json', array('application/json', 'application/x-json', 'application/ld+json')), array('xml', array('text/xml', 'application/xml', 'application/x-xml')), array('rdf', array('application/rdf+xml')), array('atom', array('application/atom+xml')), From 3132624acdc11c948684309ccd12665660ad241a Mon Sep 17 00:00:00 2001 From: Vincent CHALAMON Date: Mon, 25 Dec 2017 10:17:42 +0100 Subject: [PATCH 2/2] Add jsonld format --- src/Symfony/Component/HttpFoundation/Request.php | 3 ++- src/Symfony/Component/HttpFoundation/Tests/RequestTest.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index 3d119d2975dc6..7a24f1cf85568 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -1875,7 +1875,8 @@ protected static function initializeFormats() 'txt' => array('text/plain'), 'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'), 'css' => array('text/css'), - 'json' => array('application/json', 'application/x-json', 'application/ld+json'), + 'json' => array('application/json', 'application/x-json'), + 'jsonld' => array('application/ld+json'), 'xml' => array('text/xml', 'application/xml', 'application/x-xml'), 'rdf' => array('application/rdf+xml'), 'atom' => array('application/atom+xml'), diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php index f926c4eb2ac3a..4524f8b2347fe 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php @@ -333,7 +333,8 @@ public function getFormatToMimeTypeMapProvider() array('txt', array('text/plain')), array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')), array('css', array('text/css')), - array('json', array('application/json', 'application/x-json', 'application/ld+json')), + array('json', array('application/json', 'application/x-json')), + array('jsonld', array('application/ld+json')), array('xml', array('text/xml', 'application/xml', 'application/x-xml')), array('rdf', array('application/rdf+xml')), array('atom', array('application/atom+xml')),