When both of query string and cookie exists, query string wins.

Signed-off-by: Hidehito Nozawa <[email protected]>
shouldbee · May 18, 2015 · 70b2749 · 70b2749
1 parent cc1a1dc
commit 70b2749
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/ShouldBee/Translation/Negotiation.php b/src/ShouldBee/Translation/Negotiation.php
@@ -13,8 +13,8 @@ public static function negotiate(array $availableLanguages)
     {
         $language = $availableLanguages[0];
         $language = self::negotiateByAcceptLanguage($availableLanguages, $language);
-        $language = self::negotiateByQueryString($availableLanguages, $language);
         $language = self::negotiateByCookie($availableLanguages, $language);
+        $language = self::negotiateByQueryString($availableLanguages, $language);
 
         return $language;
     }

diff --git a/tests/ShouldBee/Translation/NegotiationTest.php b/tests/ShouldBee/Translation/NegotiationTest.php
@@ -17,14 +17,14 @@ public function testNegotiation()
         $language = Negotiation::negotiate($availableLanguages);
         $this->assertSame('ja', $language);
 
-        // set query string.
-        $_GET['language'] = 'ko';
-        $language = Negotiation::negotiate($availableLanguages);
-        $this->assertSame('ko', $language);
-
         // set cookie.
         $_COOKIE['language'] = 'zh';
         $language = Negotiation::negotiate($availableLanguages);
         $this->assertSame('zh', $language);
+
+        // set query string.
+        $_GET['language'] = 'ko';
+        $language = Negotiation::negotiate($availableLanguages);
+        $this->assertSame('ko', $language);
     }
 }