Merge branch '1.0' into 1.2

willdurand · Feb 11, 2014 · 84c855a · 84c855a
2 parents 8b32a05 + 8f8c85f
commit 84c855a
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
@@ -157,6 +157,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
@@ -274,6 +274,10 @@ public static function dataProviderForParseParameters()
                 'application/json;q=1.0',
                 array(),
             ),
+            array(
+                'application/json;foo',
+                array(),
+            ),
         );
     }
 }