Ensuring request method is not improperly overwritten in `\action\Req…

…uest`.
UnionOfRAD · Oct 1, 2012 · 5e0ad63 · 5e0ad63
1 parent 8306219
commit 5e0ad63
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/net/http/Request.php b/net/http/Request.php
@@ -36,7 +36,7 @@ class Request extends \lithium\net\http\Message {
 	 *
 	 * @var string
 	 */
-	public $method = 'GET';
+	public $method;
 
 	/**
 	 * Cookies.
@@ -84,7 +84,8 @@ public function __construct(array $config = array()) {
 			'followLocation' => true
 		);
 		parent::__construct($config + $defaults);
-		$this->method = $this->_config['method'];
+		$this->method = $this->method ?: $this->_config['method'];
+
 		$this->headers = array(
 			'Host' => $this->port ? "{$this->host}:{$this->port}" : $this->host,
 			'Connection' => 'Close',

diff --git a/tests/cases/action/RequestTest.php b/tests/cases/action/RequestTest.php
@@ -1076,6 +1076,18 @@ public function testConvertToUrl2() {
 		$expected = 'https://foo.com/the/base/path/posts?some=query&parameter=values';
 		$this->assertEqual($expected, $request->to('url'));
 	}
+
+	/**
+	 * Tests that the HTTP request method set by `Request` from the server information is not
+	 * overwritten in a parent class.
+	 */
+	public function testRequesMethodConfiguration() {
+		$request = new Request(array('env' => array('REQUEST_METHOD' => 'POST')));
+		$this->assertEqual('POST', $request->method);
+
+		$request = new Request(array('env' => array('REQUEST_METHOD' => 'PATCH')));
+		$this->assertEqual('PATCH', $request->method);
+	}
 }
 
 ?>