Fix notice error when parsing input data.

Prevent error in CakeRequest from parsing input data in PUT and DELETE requests. Fixes #3002 Signed-off-by: mark_story <mark@mark-story.com>
cakephp · Jul 6, 2012 · e10f6f5 · e10f6f5
1 parent e61f636
commit e10f6f5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/lib/Cake/Network/CakeRequest.php b/lib/Cake/Network/CakeRequest.php
@@ -175,16 +175,16 @@ protected function _processPost() {
 		if (env('HTTP_X_HTTP_METHOD_OVERRIDE')) {
 			$this->data['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE');
 		}
-		if (isset($this->data['_method'])) {
+		$isArray = is_array($this->data);
+		if ($isArray && isset($this->data['_method'])) {
 			if (!empty($_SERVER)) {
 				$_SERVER['REQUEST_METHOD'] = $this->data['_method'];
 			} else {
 				$_ENV['REQUEST_METHOD'] = $this->data['_method'];
 			}
 			unset($this->data['_method']);
 		}
-
-		if (isset($this->data['data'])) {
+		if ($isArray && isset($this->data['data'])) {
 			$data = $this->data['data'];
 			if (count($this->data) <= 1) {
 				$this->data = $data;

diff --git a/lib/Cake/Test/Case/Network/CakeRequestTest.php b/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -300,6 +300,22 @@ public function testPutParsing() {
 		$this->assertEquals($data, $request->data);
 	}
 
+/**
+ * test parsing json PUT data into the object.
+ *
+ * @return void
+ */
+	public function testPutParsingJSON() {
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+
+		$request = $this->getMock('TestCakeRequest', array('_readInput'));
+		$request->expects($this->at(0))->method('_readInput')
+			->will($this->returnValue('{Article":["title"]}'));
+		$request->reConstruct();
+		$this->assertEquals('{Article":["title"]}', $request->data);
+	}
+
 /**
  * test parsing of FILES array
  *