[HttpFoundation] moved the PUT magic dance in createFromGlobals()

fabpot · fabpot · commit 08846af9e23e · 2011-05-12T14:45:38.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -108,13 +108,6 @@ public function initialize(array $query = array(), array $request = array(), arr
         $this->server = new ServerBag($server);
         $this->headers = new HeaderBag($this->server->getHeaders());
 
-        if ('application/x-www-form-urlencoded' == $this->server->get('CONTENT_TYPE')
-            && in_array(strtoupper($this->server->get('REQUEST_METHOD', 'GET'), array('PUT', 'DELETE'))
-        ) {
-            parse_str($this->getContent(), $data);
-            $this->request = new ParameterBag($data);
-        }
-
         $this->content = $content;
         $this->languages = null;
         $this->charsets = null;
@@ -134,7 +127,16 @@ public function initialize(array $query = array(), array $request = array(), arr
      */
     static public function createFromGlobals()
     {
-        return new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
+        $request = new static($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
+
+        if ('application/x-www-form-urlencoded' == $request->server->get('CONTENT_TYPE')
+            && in_array(strtoupper($request->server->get('REQUEST_METHOD', 'GET'), array('PUT', 'DELETE'))
+        ) {
+            parse_str($this->getContent(), $data);
+            $request->request = new ParameterBag($data);
+        }
+
+        return $request;
     }
 
     /**
