Fix constructor options completely overwriting defaults.

Constructor arguments should augment not replace the defaults.
cakephp · Dec 31, 2012 · 37b9527 · 37b9527
1 parent 99a5f72
commit 37b9527
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/Cake/Network/Http/Client.php b/lib/Cake/Network/Http/Client.php
@@ -129,7 +129,7 @@ public function __construct($config = []) {
 			$adapter = $config['adapter'];
 			unset($config['adapter']);
 		}
-		$this->_config = $config;
+		$this->config($config);
 
 		if (is_string($adapter)) {
 			$adapter = new $adapter();

diff --git a/lib/Cake/Test/TestCase/Network/Http/ClientTest.php b/lib/Cake/Test/TestCase/Network/Http/ClientTest.php
@@ -34,7 +34,10 @@ public function testConstructConfig() {
 			'host' => 'example.org',
 		];
 		$http = new Client($config);
-		$this->assertEquals($config, $http->config());
+		$result = $http->config();
+		foreach ($config as $key => $val) {
+			$this->assertEquals($val, $result[$key]);
+		}
 
 		$result = $http->config([
 			'auth' => ['username' => 'mark', 'password' => 'secret']
@@ -47,7 +50,9 @@ public function testConstructConfig() {
 			'host' => 'example.org',
 			'auth' => ['username' => 'mark', 'password' => 'secret']
 		];
-		$this->assertEquals($expected, $result);
+		foreach ($config as $key => $val) {
+			$this->assertEquals($val, $result[$key]);
+		}
 	}
 
 /**