Fixed Marshaller::merge() when passing data that needs to be converted

src/ORM/Marshaller.php

@@ -244,16 +244,24 @@ public function merge(EntityInterface $entity, array $data, array $include = [])
 			$data = $data[$tableName];
 		}
 
+		$schema = $this->_table->schema();
 		$properties = [];
 		foreach ($data as $key => $value) {
+			$columnType = $schema->columnType($key);
 			$original = $entity->get($key);
+
 			if (isset($propertyMap[$key])) {
 				$assoc = $propertyMap[$key]['association'];
 				$nested = $propertyMap[$key]['nested'];
 				$value = $this->_mergeAssociation($original, $assoc, $value, $nested);
-			} elseif ($original == $value) {
-				continue;
+			} elseif ($columnType) {
+				$converter = Type::build($columnType);
+				$value = $converter->marshal($value);
+				if ($original == $value) {
+					continue;
+				}
 			}
+
 			$properties[$key] = $value;
 		}
 

tests/TestCase/ORM/MarshallerTest.php

@@ -907,4 +907,27 @@ public function testMergeManyWithAppend() {
 		$this->assertEquals('Changed 2', $result[0]->comment);
 	}
 
+/**
+ * Tests merge with data types that need to be marshalled
+ *
+ * @return void
+ */
+	public function testMergeComplexType() {
+		$entity = new Entity(
+			['comment' => 'My Comment text'],
+			['markNew' => false, 'markClean' => true]
+		);
+		$data = [
+			'created' => [
+				'year' => '2014',
+				'month' => '2',
+				'day' => 14
+			]
+		];
+		$marshall = new Marshaller($this->comments);
+		$result = $marshall->merge($entity, $data);
+		$this->assertInstanceOf('DateTime', $entity->created);
+		$this->assertEquals('2014-02-14', $entity->created->format('Y-m-d'));
+	}
+
 }