merged branch jfsimon/issue-7378 (PR #7438)

fabpot · fabpot · commit 19955c5a3c00 · 2013-03-20T15:33:09.000+01:00
This PR was merged into the 2.1 branch. Commits ------- c928ddc [HttpFoudantion] fixed Request::getPreferredLanguage() 839c78a Revert "merged branch jfsimon/issue-6928 (PR #7378)" Discussion ---------- [HttpFoundation] fixed Request::getPreferredLanguage() Previous PR #7378 was wrong and adding BC break. Resolution for short languages codes is now done in `Request::getPreferredLanguage()` method. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7378
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1275,7 +1275,18 @@ public function getPreferredLanguage(array $locales = null)
             return $locales[0];
         }
 
-        $preferredLanguages = array_values(array_intersect($preferredLanguages, $locales));
+        $extendedPreferredLanguages = array();
+        foreach ($preferredLanguages as $language) {
+            $extendedPreferredLanguages[] = $language;
+            if (false !== $position = strpos($language, '_')) {
+                $superLanguage = substr($language, 0, $position);
+                if (!in_array($superLanguage, $preferredLanguages)) {
+                    $extendedPreferredLanguages[] = $superLanguage;
+                }
+            }
+        }
+
+        $preferredLanguages = array_values(array_intersect($extendedPreferredLanguages, $locales));
 
         return isset($preferredLanguages[0]) ? $preferredLanguages[0] : $locales[0];
     }
@@ -1309,21 +1320,14 @@ public function getLanguages()
                     for ($i = 0, $max = count($codes); $i < $max; $i++) {
                         if ($i == 0) {
                             $lang = strtolower($codes[0]);
-                            // First segment of compound language codes
-                            // is added to supported languages list
-                            if (!in_array($lang, $this->languages)) {
-                                $this->languages[] = $lang;
-                            }
                         } else {
                             $lang .= '_'.strtoupper($codes[$i]);
                         }
                     }
                 }
             }
 
-            if (!in_array($lang, $this->languages)) {
-                $this->languages[] = $lang;
-            }
+            $this->languages[] = $lang;
         }
 
         return $this->languages;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -881,6 +881,14 @@ public function testGetPreferredLanguage()
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
         $this->assertEquals('en', $request->getPreferredLanguage(array('fr', 'en')));
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8');
+        $this->assertEquals('en', $request->getPreferredLanguage(array('fr', 'en')));
+
+        $request = new Request();
+        $request->headers->set('Accept-language', 'zh, en-us; q=0.8, fr-fr; q=0.6, fr; q=0.5');
+        $this->assertEquals('en', $request->getPreferredLanguage(array('fr', 'en')));
     }
 
     public function testIsXmlHttpRequest()
@@ -951,8 +959,8 @@ public function testGetLanguages()
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.8, en; q=0.6');
-        $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages());
-        $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages());
+        $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
+        $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
@@ -969,10 +977,6 @@ public function testGetLanguages()
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, i-cherokee; q=0.6');
         $this->assertEquals(array('zh', 'cherokee'), $request->getLanguages());
-
-        $request = new Request();
-        $request->headers->set('Accept-language', 'en-us');
-        $this->assertEquals(array('en', 'en_US'), $request->getLanguages());
     }
 
     public function testGetRequestFormat()

Original file line number	Diff line number	Diff line change
`@@ -1275,7 +1275,18 @@ public function getPreferredLanguage(array $locales = null)`
`1275`	`1275`	`return $locales[0];`
`1276`	`1276`	`}`
`1277`	`1277`
`1278`		`- $preferredLanguages = array_values(array_intersect($preferredLanguages, $locales));`
	`1278`	`+ $extendedPreferredLanguages = array();`
	`1279`	`+ foreach ($preferredLanguages as $language) {`
	`1280`	`+ $extendedPreferredLanguages[] = $language;`
	`1281`	`+ if (false !== $position = strpos($language, '_')) {`
	`1282`	`+ $superLanguage = substr($language, 0, $position);`
	`1283`	`+ if (!in_array($superLanguage, $preferredLanguages)) {`
	`1284`	`+ $extendedPreferredLanguages[] = $superLanguage;`
	`1285`	`+ }`
	`1286`	`+ }`
	`1287`	`+ }`
	`1288`	`+`
	`1289`	`+ $preferredLanguages = array_values(array_intersect($extendedPreferredLanguages, $locales));`
`1279`	`1290`
`1280`	`1291`	`return isset($preferredLanguages[0]) ? $preferredLanguages[0] : $locales[0];`
`1281`	`1292`	`}`
`@@ -1309,21 +1320,14 @@ public function getLanguages()`
`1309`	`1320`	`for ($i = 0, $max = count($codes); $i < $max; $i++) {`
`1310`	`1321`	`if ($i == 0) {`
`1311`	`1322`	`$lang = strtolower($codes[0]);`
`1312`		`- // First segment of compound language codes`
`1313`		`- // is added to supported languages list`
`1314`		`- if (!in_array($lang, $this->languages)) {`
`1315`		`- $this->languages[] = $lang;`
`1316`		`- }`
`1317`	`1323`	`} else {`
`1318`	`1324`	`$lang .= '_'.strtoupper($codes[$i]);`
`1319`	`1325`	`}`
`1320`	`1326`	`}`
`1321`	`1327`	`}`
`1322`	`1328`	`}`
`1323`	`1329`
`1324`		`- if (!in_array($lang, $this->languages)) {`
`1325`		`- $this->languages[] = $lang;`
`1326`		`- }`
	`1330`	`+ $this->languages[] = $lang;`
`1327`	`1331`	`}`
`1328`	`1332`
`1329`	`1333`	`return $this->languages;`