Merge pull request #14 from SimonSimCity/null-for-inacceptable-mimetype

Fail if the Accept-header doesn’t match one of the supported mime types
willdurand · Jan 9, 2014 · 8b32a05 · 8b32a05
2 parents 1757fc4 + a1511ae
commit 8b32a05
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Negotiation/FormatNegotiator.php b/src/Negotiation/FormatNegotiator.php
@@ -68,7 +68,12 @@ public function getBest($header, array $priorities = array())
             }
         }
 
-        return array_shift($acceptHeaders) ?: null;
+        // If $priorities is empty or contains a catch-all mime type
+        if ($catchAllEnabled) {
+            return array_shift($acceptHeaders) ?: null;
+        }
+
+        return null;
     }
 
     /**

diff --git a/tests/Negotiation/Tests/FormatNegotiatorTest.php b/tests/Negotiation/Tests/FormatNegotiatorTest.php
@@ -244,6 +244,14 @@ public static function dataProviderForGetBest()
                     'parameters' => array(),
                 ),
             ),
+            // Incompatible
+            array(
+                'text/html',
+                array(
+                    'application/rss'
+                ),
+                null
+            ),
         );
     }
 
@@ -263,6 +271,7 @@ public static function dataProviderForGetBestFormat()
             array('text/html,application/xhtml+xml,application/xml', array('json'), null),
             array('text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c', array('*/*'), 'html'),
             array('text/html, application/json;q=0.8, text/csv;q=0.7', array(), 'html'),
+            array('text/html', array('text/xml'), null),
         );
     }