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

jfsimon · jfsimon · commit 839c78a4b0d4 · 2013-03-20T14:19:35.000+01:00
This reverts commit 70ec4f6, reversing changes made to 3a03f3e.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1309,21 +1309,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
@@ -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', '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 +969,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
`@@ -1309,21 +1309,14 @@ 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`		`- }`
`1317`	`1312`	`} else {`
`1318`	`1313`	`$lang .= '_'.strtoupper($codes[$i]);`
`1319`	`1314`	`}`
`1320`	`1315`	`}`
`1321`	`1316`	`}`
`1322`	`1317`	`}`
`1323`	`1318`
`1324`		`- if (!in_array($lang, $this->languages)) {`
`1325`		`- $this->languages[] = $lang;`
`1326`		`- }`
	`1319`	`+ $this->languages[] = $lang;`
`1327`	`1320`	`}`
`1328`	`1321`
`1329`	`1322`	`return $this->languages;`