Merge pull request #86 from neural-wetware/strict_media_types

Add $strict parameter to getBest()

Author: willdurand

src/Negotiation/AbstractNegotiator.php

@@ -13,7 +13,7 @@ abstract class AbstractNegotiator
      *
      * @return AcceptHeader|null best matching type
      */
-    public function getBest($header, array $priorities)
+    public function getBest($header, array $priorities, $strict = false)
     {
         if (empty($priorities)) {
             throw new InvalidArgument('A set of server priorities should be given.');
@@ -33,7 +33,9 @@ public function getBest($header, array $priorities)
             try {
                 $acceptedHeaders[] = $this->acceptFactory($h);
             } catch (Exception\Exception $e) {
-                // silently skip in case of invalid headers coming in from a client
+                if ($strict) {
+                    throw $e;
+                }
             }
         }
         $acceptedPriorities = array();

tests/Negotiation/Tests/NegotiatorTest.php

@@ -104,6 +104,17 @@ public function testGetBestRespectsQualityOfSource()
         $this->assertEquals('text/plain', $accept->getType());
     }
 
+   /**
+    * @expectedException Negotiation\Exception\InvalidMediaType
+    */
+    public function testGetBestInvalidMediaType()
+    {
+        $header = 'sdlfkj20ff; wdf';
+        $priorities = array('foo/qwer');
+
+        $this->negotiator->getBest($header, $priorities, true);
+    }
+
     /**
      * @dataProvider dataProviderForTestParseHeader
      */