Fix failing tests.

cakephp · Dec 29, 2012 · c22d6d1 · c22d6d1
1 parent b9d1512
commit c22d6d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/Cake/Network/Http/Adapter/Stream.php b/lib/Cake/Network/Http/Adapter/Stream.php
@@ -120,15 +120,15 @@ protected function _buildHeaders(Request $request, $options) {
 /**
  * Builds the request content based on the request object.
  *
- * If the $request->content() is a string, it will be used as is.
+ * If the $request->body() is a string, it will be used as is.
  * Array data will be processed with Cake\Network\Http\FormData
  *
  * @param Cake\Network\Http\Request $request The request being sent.
  * @param array $options Array of options to use.
  * @return void
  */
 	protected function _buildContent(Request $request, $options) {
-		$content = $request->content();
+		$content = $request->body();
 		if (empty($content)) {
 			return;
 		}

diff --git a/lib/Cake/Network/Http/Message.php b/lib/Cake/Network/Http/Message.php
@@ -36,14 +36,14 @@ class Message {
  *
  * @var array
  */
-	protected $_headers;
+	protected $_headers = [];
 
 /**
  * The array of cookies in the response.
  *
  * @var array
  */
-	protected $_cookies;
+	protected $_cookies = [];
 
 /**
  * HTTP Version being used.

diff --git a/lib/Cake/Test/TestCase/Network/Http/Adapter/StreamTest.php b/lib/Cake/Test/TestCase/Network/Http/Adapter/StreamTest.php
@@ -92,7 +92,7 @@ public function testSendContextContentString() {
 			->header([
 				'Content-Type' => 'application/json'
 			])
-			->content($content);
+			->body($content);
 
 		$options = [
 			'redirect' => 20
@@ -119,7 +119,7 @@ public function testSendContextContentArray() {
 			->header([
 				'Content-Type' => 'application/json'
 			])
-			->content(['a' => 'my value']);
+			->body(['a' => 'my value']);
 
 		$this->stream->send($request, []);
 		$result = $this->stream->contextOptions();