Added validation to Marshaller::merge()

Author: lorenzo

src/ORM/Marshaller.php

@@ -307,16 +307,22 @@ protected function _loadBelongsToMany($assoc, $ids) {
  * @return \Cake\Datasource\EntityInterface
  */
 	public function merge(EntityInterface $entity, array $data, array $options = []) {
+		$options += ['validate' => true];
 		$propertyMap = $this->_buildPropertyMap($options);
 		$tableName = $this->_table->alias();
 
 		if (isset($data[$tableName])) {
 			$data = $data[$tableName];
 		}
 
+		$errors = $this->_validate($data, $options, false);
 		$schema = $this->_table->schema();
 		$properties = [];
 		foreach ($data as $key => $value) {
+			if (!empty($errors[$key])) {
+				continue;
+			}
+
 			$columnType = $schema->columnType($key);
 			$original = $entity->get($key);
 
@@ -340,6 +346,7 @@ public function merge(EntityInterface $entity, array $data, array $options = [])
 
 		if (!isset($options['fieldList'])) {
 			$entity->set($properties);
+			$entity->errors($errors);
 			return $entity;
 		}
 
@@ -349,6 +356,7 @@ public function merge(EntityInterface $entity, array $data, array $options = [])
 			}
 		}
 
+		$entity->errors($errors);
 		return $entity;
 	}
 

tests/TestCase/ORM/MarshallerTest.php

@@ -1603,4 +1603,40 @@ public function testPassingCustomValidator() {
 		$this->assertNotEmpty($entity->errors('thing'));
 	}
 
+/**
+ * Test merge with validation error
+ *
+ * @return void
+ */
+	public function testMergeWithValidation() {
+		$data = [
+			'title' => 'My title',
+			'author_id' => 'foo',
+		];
+		$marshall = new Marshaller($this->articles);
+		$entity = new Entity([
+			'title' => 'Foo',
+			'body' => 'My Content',
+			'author_id' => 1
+		]);
+		$entity->accessible('*', true);
+		$entity->isNew(false);
+		$entity->clean();
+
+		$this->articles->validator()
+			->requirePresence('thing', 'update')
+			->add('author_id', 'numeric', ['rule' => 'numeric']);
+
+		$expected = clone $entity;
+		$result = $marshall->merge($expected, $data, []);
+
+		$this->assertSame($expected, $result);
+		$this->assertSame(1, $result->author_id);
+		$this->assertNotEmpty($result->errors('thing'));
+
+		$this->articles->validator()->requirePresence('thing', 'create');
+		$result = $marshall->merge($entity, $data, []);
+		$this->assertEmpty($result->errors('thing'));
+	}
+
 }