Merge branch '1.0' into 1.1

willdurand · May 16, 2014 · 2f4d964 · 2f4d964
2 parents a9f4fbc + 94733e9
commit 2f4d964
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Negotiation/FormatNegotiator.php b/src/Negotiation/FormatNegotiator.php
@@ -86,7 +86,9 @@ public function getBestFormat($acceptHeader, array $priorities = array())
         $mimeTypes = $this->normalizePriorities($priorities);
 
         if (null !== $accept = $this->getBest($acceptHeader, $mimeTypes)) {
-            if (null !== $format = $this->getFormat($accept->getValue())) {
+            if (0.0 < $accept->getQuality() &&
+                null !== $format = $this->getFormat($accept->getValue())
+            ) {
                 if (in_array($format, $priorities) || $this->isCatchAllEnabled($priorities)) {
                     return $format;
                 }

diff --git a/tests/Negotiation/Tests/FormatNegotiatorTest.php b/tests/Negotiation/Tests/FormatNegotiatorTest.php
@@ -254,6 +254,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; q=0.0', array(), null),
         );
     }