[HttpFoundation] Request::getRealMethod() now returns UPPERCASE

symfony · Nov 30, 2012 · bad50ac · bad50ac
1 parent 50a62da
commit bad50ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1064,7 +1064,7 @@ public function getMethod()
      */
     public function getRealMethod()
     {
-        return $this->server->get('REQUEST_METHOD', 'GET');
+        return strtoupper($this->server->get('REQUEST_METHOD', 'GET'));
     }
 
     /**

diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -770,6 +770,10 @@ public function provideOverloadedMethods()
             array('PUT'),
             array('DELETE'),
             array('PATCH'),
+            array('put'),
+            array('delete'),
+            array('patch'),
+
         );
     }
 
@@ -778,6 +782,8 @@ public function provideOverloadedMethods()
      */
     public function testCreateFromGlobals($method)
     {
+        $normalizedMethod = strtoupper($method);
+
         $_GET['foo1']    = 'bar1';
         $_POST['foo2']   = 'bar2';
         $_COOKIE['foo3'] = 'bar3';
@@ -796,18 +802,19 @@ public function testCreateFromGlobals($method)
         $_SERVER['REQUEST_METHOD'] = $method;
         $_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
         $request = RequestContentProxy::createFromGlobals();
-        $this->assertEquals($method, $request->getMethod());
+        $this->assertEquals($normalizedMethod, $request->getMethod());
         $this->assertEquals('mycontent', $request->request->get('content'));
 
         unset($_SERVER['REQUEST_METHOD'], $_SERVER['CONTENT_TYPE']);
 
-        $request = Request::createFromGlobals();
+        Request::createFromGlobals();
         Request::enableHttpMethodParameterOverride();
         $_POST['_method']   = $method;
         $_POST['foo6']      = 'bar6';
-        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_SERVER['REQUEST_METHOD'] = 'PoSt';
         $request = Request::createFromGlobals();
-        $this->assertEquals($method, $request->getMethod());
+        $this->assertEquals($normalizedMethod, $request->getMethod());
+        $this->assertEquals('POST', $request->getRealMethod());
         $this->assertEquals('bar6', $request->request->get('foo6'));
 
         unset($_POST['_method'], $_POST['foo6'], $_SERVER['REQUEST_METHOD']);