fix query merge from constructor and add additional tests for query a…

…nd data
pixelcog · Mar 20, 2013 · 4fff5b1 · 4fff5b1
1 parent 6bad147
commit 4fff5b1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/net/http/Message.php b/net/http/Message.php
@@ -83,7 +83,7 @@ public function __construct(array $config = array()) {
 			'auth' => null
 		);
 		$config += $defaults;
-		parent::__construct($config);
+
 		foreach (array_intersect_key(array_filter($config), $defaults) as $key => $value) {
 			$this->{$key} = $value;
 		}
@@ -92,6 +92,8 @@ public function __construct(array $config = array()) {
 		}
 		$this->path = str_replace('//', '/', "/{$this->path}");
 		$this->protocol = $this->protocol ?: "HTTP/{$this->version}";
+
+		parent::__construct($config);
 	}
 
 	/**

diff --git a/net/http/Request.php b/net/http/Request.php
@@ -84,6 +84,16 @@ public function __construct(array $config = array()) {
 			'followLocation' => true
 		);
 		parent::__construct($config + $defaults);
+	}
+
+	/**
+	 * Initialize request object method, content type, and headers
+	 *
+	 * @return void
+	 */
+	protected function _init() {
+		parent::_init();
+
 		$this->method = $this->method ?: $this->_config['method'];
 
 		$this->headers = array(

diff --git a/tests/cases/action/RequestTest.php b/tests/cases/action/RequestTest.php
@@ -19,15 +19,19 @@ class RequestTest extends \lithium\test\Unit {
 
 	protected $_get = array();
 
+	protected $_post = array();
+
 	public function setUp() {
 		$this->request = new Request(array('init' => false));
 		$this->_get = $_GET;
-		unset($_GET);
+		$this->_post = $_POST;
+		unset($_GET, $_POST);
 	}
 
 	public function tearDown() {
 		unset($this->request);
 		$_GET = $this->_get;
+		$_POST = $this->_post;
 	}
 
 	public function testInitData() {
@@ -871,6 +875,13 @@ public function testDataFromConstructor() {
 		$expected = array('name' => 'bob');
 		$result = $request->data;
 		$this->assertEqual($expected, $result);
+
+		$_POST['organization'] = 'Union of Rad';
+		$request = new Request(array('data' => array('name' => 'bob')));
+
+		$expected = array('name' => 'bob', 'organization' => 'Union of Rad');
+		$result = $request->data;
+		$this->assertEqual($expected, $result);
 	}
 
 	public function testQueryFromConstructor() {
@@ -879,6 +890,13 @@ public function testQueryFromConstructor() {
 		$expected = array('page' => 1);
 		$result = $request->query;
 		$this->assertEqual($expected, $result);
+
+		$_GET = array('limit' => 10);
+		$request = new Request(array('query' => array('page' => 1)));
+
+		$expected = array('page' => 1, 'limit' => 10);
+		$result = $request->query;
+		$this->assertEqual($expected, $result);
 	}
 
 	public function testMethodOverrideFromData() {

diff --git a/tests/cases/net/http/RequestTest.php b/tests/cases/net/http/RequestTest.php
@@ -15,7 +15,7 @@ class RequestTest extends \lithium\test\Unit {
 	public $request = null;
 
 	public function setUp() {
-		$this->request = new Request(array('init' => false));
+		$this->request = new Request();
 	}
 
 	public function testConstruct() {