Merge branch '1.0'

willdurand · Feb 6, 2014 · e46ea11 · e46ea11
2 parents fddd63b + 8f8c85f
commit e46ea11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Negotiation/Negotiator.php b/src/Negotiation/Negotiator.php
@@ -145,6 +145,10 @@ protected function parseParameters($value)
         foreach ($parts as $part) {
             $part = explode('=', $part);
 
+            if (2 !== count($part)) {
+                continue;
+            }
+
             if ('q' !== $key = strtolower($part[0])) {
                 $parameters[$key] = $part[1];
             }

diff --git a/tests/Negotiation/Tests/NegotiatorTest.php b/tests/Negotiation/Tests/NegotiatorTest.php
@@ -303,6 +303,10 @@ public static function dataProviderForParseParameters()
                 'application/json;q=1.0',
                 array(),
             ),
+            array(
+                'application/json;foo',
+                array(),
+            ),
         );
     }
 }