Added option to pass a validation object to the marshaller

src/ORM/Marshaller.php

@@ -114,13 +114,7 @@ public function one(array $data, array $options = []) {
 			}
 		}
 
-		$errors = [];
-		if ($options['validate']) {
-			$type = is_string($options['validate']) ? $options['validate'] : 'default';
-			$validator = $this->_table->validator($type);
-			$errors = $validator->errors($data, $entity->isNew());
-		}
-
+		$errors = $this->_validate($data, $options, true);
 		$primaryKey = $schema->primaryKey();
 		$properties = [];
 		foreach ($data as $key => $value) {
@@ -157,6 +151,30 @@ public function one(array $data, array $options = []) {
 		return $entity;
 	}
 
+/**
+ * Returns the validation errors for a data set based on the passed options
+ *
+ * @param array $data The data to validate.
+ * @param array $options The options passed to this marshaller.
+ * @param bool $isNew Whether it is a new entity or one to be updated.
+ * @return array The list of validation errors.
+ */
+	protected function _validate($data, $options, $isNew) {
+		if (!$options['validate']) {
+			return [];
+		}
+
+		if ($options['validate'] === true) {
+			$options['validate'] = $this->_table->validator('default');
+		}
+
+		if (is_string($options['validate'])) {
+			$options['validate'] = $this->_table->validator($options['validate']);
+		}
+
+		return $options['validate']->errors($data, $isNew);
+	}
+
 /**
  * Create a new sub-marshaller and marshal the associated data.
  *

tests/TestCase/ORM/MarshallerTest.php

@@ -1585,4 +1585,22 @@ public function testSkipValidation() {
 		$this->assertEmpty($entity->user->errors('thing'));
 	}
 
+/**
+ * Tests that it is possible to pass a validator directly in the options
+ *
+ * @return void
+ */
+	public function testPassingCustomValidator() {
+		$data = [
+			'title' => 'Thing',
+			'body' => 'hey'
+		];
+
+		$validator = clone $this->articles->validator();
+		$validator->requirePresence('thing');
+		$marshall = new Marshaller($this->articles);
+		$entity = $marshall->one($data, ['validate' => $validator]);
+		$this->assertNotEmpty($entity->errors('thing'));
+	}
+
 }