merged branch drak/ismethod (PR symfony#3800)

fabpot · fabpot · commit c392f747b82a · 2012-04-06T14:11:35.000+02:00
Commits ------- 33881dd [HttpFoundation] Add more tests for casing aec1339 [HttpFoundation] Coding standards. bf33bd4 update changelog 3dc72cd Add isMethod() to Request object Discussion ---------- [HttpFoundation] Add isMethod() to Request object. Bug fix: no Feature addition: yes Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Todo: - Justification is for convenience. --------------------------------------------------------------------------- by hhamon at 2012-04-06T07:14:44Z +1
diff --git a/CHANGELOG-2.1.md b/CHANGELOG-2.1.md
@@ -325,6 +325,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
    to the client.
  * Request::getClientIp() method doesn't take a parameter anymore but bases
    itself on the trustProxy parameter.
+ * Added isMethod() to Request object.
 
 ### HttpKernel
 
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1016,6 +1016,18 @@ public function getLocale()
         return null === $this->locale ? $this->defaultLocale : $this->locale;
     }
 
+    /**
+     * Checks if the request method is of specified type.
+     *
+     * @param string $method Uppercase request method (GET, POST etc).
+     *
+     * @return Boolean
+     */
+    public function isMethod($method)
+    {
+        return $this->getMethod() === strtoupper($method);
+    }
+
     /**
      * Checks whether the method is safe or not.
      *
diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -925,6 +925,22 @@ public function testIsProxyTrusted()
         $this->assertFalse(Request::isProxyTrusted());
     }
 
+    public function testIsMethod()
+    {
+        $request = new Request();
+        $request->setMethod('POST');
+        $this->assertTrue($request->isMethod('POST'));
+        $this->assertTrue($request->isMethod('post'));
+        $this->assertFalse($request->isMethod('GET'));
+        $this->assertFalse($request->isMethod('get'));
+
+        $request->setMethod('GET');
+        $this->assertTrue($request->isMethod('GET'));
+        $this->assertTrue($request->isMethod('get'));
+        $this->assertFalse($request->isMethod('POST'));
+        $this->assertFalse($request->isMethod('post'));
+    }
+
     private function startTrustingProxyData()
     {
         Request::trustProxyData();
