Merge branch '2.8' into 3.3
* 2.8: Add application/ld+json format associated to json
This commit is contained in:
commit
770e51517f
@ -1966,6 +1966,7 @@ class Request
|
|||||||
'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
|
'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
|
||||||
'css' => array('text/css'),
|
'css' => array('text/css'),
|
||||||
'json' => array('application/json', 'application/x-json'),
|
'json' => array('application/json', 'application/x-json'),
|
||||||
|
'jsonld' => array('application/ld+json'),
|
||||||
'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
|
'xml' => array('text/xml', 'application/xml', 'application/x-xml'),
|
||||||
'rdf' => array('application/rdf+xml'),
|
'rdf' => array('application/rdf+xml'),
|
||||||
'atom' => array('application/atom+xml'),
|
'atom' => array('application/atom+xml'),
|
||||||
|
@ -372,6 +372,7 @@ class RequestTest extends TestCase
|
|||||||
array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')),
|
array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')),
|
||||||
array('css', array('text/css')),
|
array('css', array('text/css')),
|
||||||
array('json', array('application/json', 'application/x-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('xml', array('text/xml', 'application/xml', 'application/x-xml')),
|
||||||
array('rdf', array('application/rdf+xml')),
|
array('rdf', array('application/rdf+xml')),
|
||||||
array('atom', array('application/atom+xml')),
|
array('atom', array('application/atom+xml')),
|
||||||
|
Reference in New Issue
Block a user