Merge pull request #715 from dunglas/negotiation_compat

Compatbility with Negotiation 2.0.3

composer.json

@@ -21,7 +21,7 @@
         "symfony/http-kernel": "^2.7 || ^3.0",
         "symfony/property-info": "^3.1",
         "symfony/serializer": "^3.1",
-        "willdurand/negotiation": "^2.0"
+        "willdurand/negotiation": "^2.0.3"
     },
     "require-dev": {
         "behat/behat": "^3.1",

features/security/validate_response_types.feature

@@ -22,4 +22,4 @@ Feature: Validate response types
     And I send a "GET" request to "/dummies/1"
     Then the response status code should be 406
     And the header "Content-Type" should be equal to "application/problem+json; charset=utf-8"
-    And the JSON node "detail" should be equal to 'The "invalid" MIME type is invalid.'
+    And the JSON node "detail" should be equal to 'Requested format "invalid" is not supported. Supported MIME types are "application/ld+json", "application/hal+json", "application/xml", "text/xml", "application/json".'

src/EventListener/AddFormatListener.php

@@ -11,7 +11,6 @@
 
 namespace ApiPlatform\Core\EventListener;
 
-use Negotiation\Exception\InvalidMediaType;
 use Negotiation\Negotiator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
@@ -56,12 +55,8 @@ public function onKernelRequest(GetResponseEvent $event)
         // First, try to guess the format from the Accept header
         $accept = $request->headers->get('Accept');
         if (null !== $accept) {
-            try {
-                if (null === $acceptHeader = $this->negotiator->getBest($accept, $mimeTypes)) {
-                    throw $this->getNotAcceptableHttpException($accept, $mimeTypes);
-                }
-            } catch (InvalidMediaType $e) {
-                throw new NotAcceptableHttpException(sprintf('The "%s" MIME type is invalid.', $accept));
+            if (null === $acceptHeader = $this->negotiator->getBest($accept, $mimeTypes)) {
+                throw $this->getNotAcceptableHttpException($accept, $mimeTypes);
             }
 
             $request->setRequestFormat($request->getFormat($acceptHeader->getType()));

tests/EventListener/AddFormatListenerTest.php

@@ -142,7 +142,7 @@ public function testUnsupportedAcceptHeader()
 
     /**
      * @expectedException \Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException
-     * @expectedExceptionMessage The "invalid" MIME type is invalid.
+     * @expectedExceptionMessage Requested format "invalid" is not supported. Supported MIME types are "application/json".
      */
     public function testInvalidAcceptHeader()
     {