Add missed fallback to generic language (in LanguageNegotiator) (#113)

willdurand · Jan 30, 2022 · 9785ce2 · 9785ce2
1 parent 450beae
commit 9785ce2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Negotiation/LanguageNegotiator.php b/src/Negotiation/LanguageNegotiator.php
@@ -30,7 +30,7 @@ protected function match(AcceptHeader $acceptLanguage, AcceptHeader $priority, $
         $baseEqual = !strcasecmp($ab, $pb);
         $subEqual  = !strcasecmp($as, $ps);
 
-        if (($ab == '*' || $baseEqual) && ($as === null || $subEqual)) {
+        if (($ab == '*' || $baseEqual) && ($as === null || $subEqual || null === $ps)) {
             $score = 10 * $baseEqual + $subEqual;
 
             return new AcceptMatch($acceptLanguage->getQuality() * $priority->getQuality(), $score, $index);

diff --git a/tests/Negotiation/Tests/LanguageNegotiatorTest.php b/tests/Negotiation/Tests/LanguageNegotiatorTest.php
@@ -51,6 +51,10 @@ public static function dataProviderForTestGetBest()
             array('fr, zh-Hans-CN;q=0.3', array('fr'), 'fr'),
             # Quality of source factors
             array('en;q=0.5,de', array('de;q=0.3', 'en;q=0.9'), 'en;q=0.9'),
+            # Generic fallback
+            array('fr-FR, en-US;q=0.8', array('fr'), 'fr'),
+            array('fr-FR, en-US;q=0.8', array('fr', 'en-US'), 'fr'),
+            array('fr-FR, en-US;q=0.8', array('fr-CA', 'en'), 'en'),
         );
     }
 
@@ -78,4 +82,20 @@ public static function dataProviderForTestParseHeader()
             array('en; q=0.1, fr; q=0.4, fu; q=0.9, de; q=0.2', array('en; q=0.1', 'fr; q=0.4', 'fu; q=0.9', 'de; q=0.2')),
         );
     }
+
+    /**
+     * Given a accept header containing specific languages (here 'en-US', 'fr-FR')
+     *  And priorities containing a generic version of that language
+     * Then the best language is mapped to the generic one here 'fr'
+     */
+    public function testSpecificLanguageAreMappedToGeneric()
+    {
+        $acceptLanguageHeader = 'fr-FR, en-US;q=0.8';
+        $priorities           = array('fr');
+
+        $acceptHeader = $this->negotiator->getBest($acceptLanguageHeader, $priorities);
+
+        $this->assertInstanceOf('Negotiation\AcceptHeader', $acceptHeader);
+        $this->assertEquals('fr', $acceptHeader->getValue());
+    }
 }