Fix incorrect behavior related to priorities

Fix #24
willdurand · Feb 26, 2014 · cda64e2 · cda64e2
1 parent 1fb776e
commit cda64e2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/Negotiation/FormatNegotiator.php b/src/Negotiation/FormatNegotiator.php
@@ -28,10 +28,15 @@ public function getBest($header, array $priorities = array())
         $acceptHeaders   = $this->parseHeader($header);
         $priorities      = $this->sanitize($priorities);
         $catchAllEnabled = $this->isCatchAllEnabled($priorities);
+        $catchAllHeader  = null;
 
         foreach ($acceptHeaders as $accept) {
             $mimeType = $accept->getValue();
 
+            if (self::CATCH_ALL_VALUE === $mimeType) {
+                $catchAllHeader = $accept;
+            }
+
             if ('/*' !== substr($mimeType, -2)) {
                 if (in_array($mimeType, $priorities)) {
                     return $accept;
@@ -68,6 +73,20 @@ public function getBest($header, array $priorities = array())
             }
         }
 
+        // if client sends `*/*` in Accept header, and nothing has been negotiated before
+        // then, return the first priority value if available
+        if (null !== $catchAllHeader) {
+            $value = array_shift($priorities);
+
+            if (null !== $value && self::CATCH_ALL_VALUE !== $value) {
+                return new AcceptHeader(
+                    $value,
+                    $catchAllHeader->getQuality(),
+                    $this->parseParameters($catchAllHeader->getValue())
+                );
+            }
+        }
+
         // if `$priorities` is empty or contains a catch-all mime type
         if ($catchAllEnabled) {
             return array_shift($acceptHeaders) ?: null;

diff --git a/tests/Negotiation/Tests/FormatNegotiatorTest.php b/tests/Negotiation/Tests/FormatNegotiatorTest.php
@@ -144,7 +144,7 @@ public static function dataProviderForGetBest()
                     'application/rss+xml',
                     '*/*',
                 ),
-                'text/html'
+                'application/rss+xml'
             ),
             // See: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
             array(
@@ -297,7 +297,7 @@ public static function dataProviderForGetBestFormat()
             array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array(), 'html'),
             array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array('html', 'json', '*/*'), 'html'),
             array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array('html', 'json', '*/*'), 'html'),
-            array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array('rss', '*/*'), 'html'),
+            array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array('rss', '*/*'), 'rss'),
             array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array('xml'), 'xml'),
             // This shows clearly that the acceptheader is leading over server priorities
             array('text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8', array('xml', 'html'), 'html'),