bug #11408 [HttpFoundation] Update QUERY_STRING when overrideGlobals (yguedidi)

nicolas-grekas · nicolas-grekas · commit 511b20d837df · 2014-08-13T21:04:07.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpFoundation] Update QUERY_STRING when overrideGlobals | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 777666f [HttpFoundation] Update QUERY_STRING when overrideGlobals
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -479,6 +479,8 @@ public function __toString()
      */
     public function overrideGlobals()
     {
+        $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), null, '&')));
+
         $_GET = $this->query->all();
         $_POST = $this->request->all();
         $_SERVER = $this->server->all();
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -1009,6 +1009,15 @@ public function testOverrideGlobals()
 
         $this->assertArrayHasKey('HTTP_X_FORWARDED_PROTO', $_SERVER);
 
+        $request->initialize(array('foo' => 'bar', 'baz' => 'foo'));
+        $request->query->remove('baz');
+
+        $request->overrideGlobals();
+
+        $this->assertEquals(array('foo' => 'bar'), $_GET);
+        $this->assertEquals('foo=bar', $_SERVER['QUERY_STRING']);
+        $this->assertEquals('foo=bar', $request->server->get('QUERY_STRING'));
+
         // restore initial $_SERVER array
         $_SERVER = $server;
     }

Original file line number	Diff line number	Diff line change
`@@ -479,6 +479,8 @@ public function __toString()`
`479`	`479`	`*/`
`480`	`480`	`public function overrideGlobals()`
`481`	`481`	`{`
	`482`	`+ $this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), null, '&')));`
	`483`	`+`
`482`	`484`	`$_GET = $this->query->all();`
`483`	`485`	`$_POST = $this->request->all();`
`484`	`486`	`$_SERVER = $this->server->all();`