Ignoring invalid parts in Accept: headers.

ChangeLog.md

@@ -1,12 +1,17 @@
 ChangeLog
 =========
 
+3.0.2 (2014-10-06)
+------------------
+
+* When parsing `Accept:` headers, we're ignoring invalid parts. Before we
+  would throw a PHP E_NOTICE.
+
 3.0.1 (2014-09-29)
 ------------------
 
 * Minor change in unittests.
 
-
 3.0.0 (2014-09-23)
 ------------------
 

lib/Util.php

@@ -126,6 +126,9 @@ static function negotiateContentType($acceptHeaderValue, array $availableOptions
 
         foreach($proposals as $proposal) {
 
+            // Ignoring broken values.
+            if (is_null($proposal)) continue;
+
             // If the quality is lower we don't have to bother comparing.
             if ($proposal['quality'] < $lastQuality) {
                 continue;
@@ -205,7 +208,13 @@ private static function parseMimeType($str) {
 
         // The first part is the mime-type.
         $mimeType = array_shift($parts);
-        list($type, $subType) = explode('/', trim($mimeType));
+
+        $mimeType = explode('/', trim($mimeType));
+        if (count($mimeType)!==2) {
+            // Illegal value
+            return null;
+        }
+        list($type, $subType) = $mimeType;
 
         foreach($parts as $part) {
 

lib/Version.php

@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.0.1';
+    const VERSION = '3.0.2';
 
 }