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

fabpot · fabpot · commit 70ec4f6c61a1 · 2013-03-18T14:41:52.000+01:00
This PR was squashed before being merged into the 2.1 branch (closes #7378). Commits ------- 17dc2ff [HttpRequest] fixes Request::getLanguages() bug Discussion ---------- [HttpRequest] fixes Request::getLanguages() bug This PR adds to suported languages the first segment of all compouds languages codes. When receiving `Accept-Language: en-us` header, accepted languages will now be `en, en_US`. This should not be a BC break as most browsers already send the long **and** short versions of language codes... but some dont. | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6928
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1309,14 +1309,21 @@ 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]);
                         }
                     }
                 }
             }
 
-            $this->languages[] = $lang;
+            if (!in_array($lang, $this->languages)) {
+                $this->languages[] = $lang;
+            }
         }
 
         return $this->languages;
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -951,8 +951,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_US', 'en'), $request->getLanguages());
-        $this->assertEquals(array('zh', 'en_US', 'en'), $request->getLanguages());
+        $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages());
+        $this->assertEquals(array('zh', 'en', 'en_US'), $request->getLanguages());
 
         $request = new Request();
         $request->headers->set('Accept-language', 'zh, en-us; q=0.6, en; q=0.8');
@@ -969,6 +969,10 @@ 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
`@@ -1309,14 +1309,21 @@ public function getLanguages()`
`1309`	`1309`	`for ($i = 0, $max = count($codes); $i < $max; $i++) {`
`1310`	`1310`	`if ($i == 0) {`
`1311`	`1311`	`$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`	`+ }`
`1312`	`1317`	`} else {`
`1313`	`1318`	`$lang .= '_'.strtoupper($codes[$i]);`
`1314`	`1319`	`}`
`1315`	`1320`	`}`
`1316`	`1321`	`}`
`1317`	`1322`	`}`
`1318`	`1323`
`1319`		`- $this->languages[] = $lang;`
	`1324`	`+ if (!in_array($lang, $this->languages)) {`
	`1325`	`+ $this->languages[] = $lang;`
	`1326`	`+ }`
`1320`	`1327`	`}`
`1321`	`1328`
`1322`	`1329`	`return $this->languages;`