Merge pull request #4329 from cakephp/issue-4307

Fix 0/'0' not being patched properly.
cakephp · Aug 22, 2014 · 43f0ca0 · 43f0ca0
2 parents e9dd234 + b2ed6a2
commit 43f0ca0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -285,7 +285,11 @@ public function merge(EntityInterface $entity, array $data, array $options = [])
 			} elseif ($columnType) {
 				$converter = Type::build($columnType);
 				$value = $converter->marshal($value);
-				if ($original == $value) {
+				$isObject = is_object($value);
+				if (
+					(!$isObject && $original === $value) ||
+					($isObject && $original == $value)
+				) {
 					continue;
 				}
 			}

diff --git a/tests/TestCase/ORM/MarshallerTest.php b/tests/TestCase/ORM/MarshallerTest.php
@@ -549,6 +549,34 @@ public function testMergeSimple() {
 		$this->assertFalse($result->isNew(), 'Should not change the entity state');
 	}
 
+/**
+ * Provides empty values.
+ *
+ * @return array
+ */
+	public function emptyProvider() {
+		return [
+			[0],
+			['0'],
+		];
+	}
+
+/**
+ * Test merging empty values into an entity.
+ *
+ * @dataProvider emptyProvider
+ * @return void
+ */
+	public function testMergeFalseyValues($value) {
+		$marshall = new Marshaller($this->articles);
+		$entity = new Entity();
+		$entity->accessible('*', true);
+
+		$entity = $marshall->merge($entity, ['author_id' => $value]);
+		$this->assertTrue($entity->dirty('author_id'), 'Field should be dirty');
+		$this->assertSame(0, $entity->get('author_id'), 'Value should be zero');
+	}
+
 /**
  * Tests that merge respects the entity accessible methods
  *