Merge branch '2.7' into 2.8

* 2.7:
  Add application/ld+json format associated to json

Author: nicolas-grekas

src/Symfony/Component/HttpFoundation/Request.php

@@ -1855,6 +1855,7 @@ protected static function initializeFormats()
             'js' => array('application/javascript', 'application/x-javascript', 'text/javascript'),
             'css' => array('text/css'),
             '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'),

src/Symfony/Component/HttpFoundation/Tests/RequestTest.php

@@ -334,6 +334,7 @@ public function getFormatToMimeTypeMapProvider()
             array('js', array('application/javascript', 'application/x-javascript', 'text/javascript')),
             array('css', array('text/css')),
             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')),