Merge pull request #693 from kohana/3.3/bugfix/always-parse-get

Always parse query string, on the main request or on sub-requests
kohana · Jul 25, 2016 · 277f6d7 · 277f6d7
2 parents 6546952 + 0505301
commit 277f6d7
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php
@@ -667,13 +667,9 @@ public function __construct($uri, $client_params = array(), $allow_external = TR
 		$split_uri = explode('?', $uri);
 		$uri = array_shift($split_uri);
 
-		// Initial request has global $_GET already applied
-		if (Request::$initial === NULL)
+		if ($split_uri)
 		{
-			if ($split_uri)
-			{
-				parse_str($split_uri[0], $this->_get);
-			}
+			parse_str($split_uri[0], $this->_get);
 		}
 
 		// Detect protocol (if present)

diff --git a/tests/kohana/RequestTest.php b/tests/kohana/RequestTest.php
@@ -620,7 +620,7 @@ public function provider_query_parameter_parsing()
 	{
 		return array(
 			array(
-				new Request('foo/bar'),
+				'foo/bar',
 				array(
 					'foo'   => 'bar',
 					'sna'   => 'fu'
@@ -631,7 +631,7 @@ public function provider_query_parameter_parsing()
 				),
 			),
 			array(
-				new Request('foo/bar?john=wayne&peggy=sue'),
+				'foo/bar?john=wayne&peggy=sue',
 				array(
 					'foo'   => 'bar',
 					'sna'   => 'fu'
@@ -644,7 +644,7 @@ public function provider_query_parameter_parsing()
 				),
 			),
 			array(
-				new Request('http://host.tld/foo/bar?john=wayne&peggy=sue'),
+				'http://host.tld/foo/bar?john=wayne&peggy=sue',
 				array(
 					'foo'   => 'bar',
 					'sna'   => 'fu'
@@ -664,13 +664,41 @@ public function provider_query_parameter_parsing()
 	 * 
 	 * @dataProvider provider_query_parameter_parsing
 	 *
-	 * @param   Request   request 
+	 * @param   string    url
 	 * @param   array     query 
 	 * @param   array    expected 
 	 * @return  void
 	 */
-	public function test_query_parameter_parsing(Request $request, $query, $expected)
+	public function test_query_parameter_parsing($url, $query, $expected)
+	{
+		Request::$initial = NULL;
+
+		$request = new Request($url);
+
+		foreach ($query as $key => $value)
+		{
+			$request->query($key, $value);
+		}
+
+		$this->assertSame($expected, $request->query());
+	}
+
+	/**
+	 * Tests that query parameters are parsed correctly
+	 *
+	 * @dataProvider provider_query_parameter_parsing
+	 *
+	 * @param   string    url
+	 * @param   array     query
+	 * @param   array    expected
+	 * @return  void
+	 */
+	public function test_query_parameter_parsing_in_subrequest($url, $query, $expected)
 	{
+		Request::$initial = new Request(TRUE);
+
+		$request = new Request($url);
+
 		foreach ($query as $key => $value)
 		{
 			$request->query($key, $value);