Fix Set::insert() not overwriting values.

Set::insert() failed to overwrite values that were previously defined as strings. Remove test in SessionComponentTest that was ensuring this bug stuck around. Fixes #2722
cakephp · Mar 27, 2012 · b3d886f · b3d886f
1 parent 08f0811
commit b3d886f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 2 deletions.
diff --git a/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php b/lib/Cake/Test/Case/Controller/Component/SessionComponentTest.php
@@ -191,7 +191,6 @@ public function testSessionReadWrite() {
 
 		$this->assertTrue($Session->write('Test', 'some value'));
 		$this->assertEquals('some value', $Session->read('Test'));
-		$this->assertFalse($Session->write('Test.key', 'some value'));
 		$Session->delete('Test');
 
 		$this->assertTrue($Session->write('Test.key.path', 'some value'));

diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php
@@ -281,6 +281,22 @@ public function testWriteEmptyKey() {
 		$this->assertFalse(TestCakeSession::write(''));
 	}
 
+/**
+ * Test overwriting a string value as if it were an array.
+ *
+ * @return void
+ */
+	public function testWriteOverwriteStringValue() {
+		TestCakeSession::write('Some.string', 'value');
+		$this->assertEquals('value', TestCakeSession::read('Some.string'));
+
+		TestCakeSession::write('Some.string.array', array('values'));
+		$this->assertEquals(
+			array('values'),
+			TestCakeSession::read('Some.string.array')
+		);
+	}
+
 /**
  * testId method
  *

diff --git a/lib/Cake/Test/Case/Utility/SetTest.php b/lib/Cake/Test/Case/Utility/SetTest.php
@@ -1700,6 +1700,28 @@ public function testInsert() {
 		$this->assertEquals($expected, $result);
 	}
 
+/**
+ * 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);
+	}
+
 /**
  * testRemove method
  *

diff --git a/lib/Cake/Utility/Set.php b/lib/Cake/Utility/Set.php
@@ -686,7 +686,7 @@ public static function insert($list, $path, $data = null) {
 				$_list =& $_list[$key];
 			}
 			if (!is_array($_list)) {
-				return array();
+				$_list = array();
 			}
 		}
 		return $list;