Revert "Add $strict parameter to getBest() to enable exceptions f…

…or invalid media types." This reverts commit 56f51ee.
willdurand · Oct 14, 2016 · 1f210db · 1f210db
1 parent 348c740
commit 1f210db
Show file tree

Hide file tree

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

diff --git a/tests/Negotiation/Tests/NegotiatorTest.php b/tests/Negotiation/Tests/NegotiatorTest.php
@@ -104,17 +104,6 @@ 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
      */