Mark fields as not dirty when they are unset.

Leaving unset fields as dirty makes entity create null values when persisted. Refs #4288
cakephp · Aug 19, 2014 · 63e6d38 · 63e6d38
1 parent edd85f5
commit 63e6d38
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -308,6 +308,7 @@ public function unsetProperty($property) {
 		$property = (array)$property;
 		foreach ($property as $p) {
 			unset($this->_properties[$p]);
+			unset($this->_dirty[$p]);
 		}
 
 		return $this;

diff --git a/tests/TestCase/ORM/EntityTest.php b/tests/TestCase/ORM/EntityTest.php
@@ -287,6 +287,18 @@ public function testUnset() {
 		$this->assertFalse($entity->has('id'));
 	}
 
+/**
+ * Unsetting a property should not mark it as dirty.
+ *
+ * @return void
+ */
+	public function testUnsetMakesClean() {
+		$entity = new Entity(['id' => 1, 'name' => 'bar']);
+		$this->assertTrue($entity->dirty('name'));
+		$entity->unsetProperty('name');
+		$this->assertFalse($entity->dirty('name'), 'Removed properties are not dirty.');
+	}
+
 /**
  * Tests unsetProperty whith multiple properties
  *