Port changes done to Set into Hash

See #2722
cakephp · Mar 27, 2012 · c087576 · hiromi2424 · Mar 30, 2012 · lorenzo
1 parent 6e0e156
commit c087576
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/Utility/HashTest.php b/lib/Cake/Test/Case/Utility/HashTest.php
@@ -1113,6 +1113,28 @@ public function testInsertMulti() {
 		$this->assertEquals('value', $result[0]['Comment'][1]['insert']);
 	}
 
+/**
+ * Test that insert() can insert data over a string value.
+ *
+ * @return void
+ */
+	public function testInsertOverwriteStringValue() {
+		$data = array(
+			'Some' => array(
+				'string' => 'value'
+			)
+		);
+		$result = Set::insert($data, 'Some.string.value', array('values'));
+		$expected = array(
+			'Some' => array(
+				'string' => array(
+					'value' => array( 'values')
+				)
+			)
+		);
+		$this->assertEquals($expected, $result);
+	}
+
 /**
  * Test remove() method.
  *

diff --git a/lib/Cake/Utility/Hash.php b/lib/Cake/Utility/Hash.php
@@ -270,7 +270,7 @@ protected static function _simpleOp($op, $data, $path, $values = null) {
 					$_list =& $_list[$key];
 				}
 				if (!is_array($_list)) {
-					return array();
+					$_list = array();
 				}
 			}
 			if ($op === 'remove') {