[LanguageNegotiator] More tests

willdurand · Jan 20, 2014 · 786405c · 786405c
1 parent 208ad27
commit 786405c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/Negotiation/LanguageNegotiator.php b/src/Negotiation/LanguageNegotiator.php
@@ -50,6 +50,8 @@ protected function parseHeader($header)
      */
     protected function match(array $acceptHeaders, array $priorities = array())
     {
+        $wildcardAccept  = null;
+
         $prioritiesSet   = array();
         $prioritiesSet[] = $priorities;
         $prioritiesSet[] = array_map(function ($priority) {

diff --git a/tests/Negotiation/Tests/LanguageNegotiatorTest.php b/tests/Negotiation/Tests/LanguageNegotiatorTest.php
@@ -74,6 +74,28 @@ public function testGenericLanguageAreMappedToSpecific()
         $this->assertEquals('en-US', $acceptHeader->getValue());
     }
 
+    public function testGetBestWithWildcard()
+    {
+        $acceptLanguageHeader = 'en, *;q=0.9';
+        $priorities           = array('fr');
+
+        $acceptHeader = $this->negotiator->getBest($acceptLanguageHeader, $priorities);
+
+        $this->assertInstanceOf('Negotiation\AcceptHeader', $acceptHeader);
+        $this->assertEquals('fr', $acceptHeader->getValue());
+    }
+
+    public function testGetBestDoesNotMatchPriorities()
+    {
+        $acceptLanguageHeader = 'en, de';
+        $priorities           = array('fr');
+
+        $acceptHeader = $this->negotiator->getBest($acceptLanguageHeader, $priorities);
+
+        $this->assertInstanceOf('Negotiation\AcceptHeader', $acceptHeader);
+        $this->assertEquals('en', $acceptHeader->getValue());
+    }
+
     public static function dataProviderForGetBest()
     {
         return array(