Removing some validation logic out of the Table object

cakephp · Nov 16, 2014 · 604b336 · 604b336
1 parent 6953d13
commit 604b336
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 583 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1178,7 +1178,6 @@ public function exists($conditions) {
 	public function save(EntityInterface $entity, $options = []) {
 		$options = new \ArrayObject($options + [
 			'atomic' => true,
-			'validate' => true,
 			'associated' => true
 		]);
 
@@ -1223,11 +1222,6 @@ protected function _processSave($entity, $options) {
 		}
 
 		$options['associated'] = $this->_associations->normalizeKeys($options['associated']);
-		$validate = $options['validate'];
-
-		if ($validate && !$this->validate($entity, $options)) {
-			return false;
-		}
 		$event = $this->dispatchEvent('Model.beforeSave', compact('entity', 'options'));
 
 		if ($event->isStopped()) {
@@ -1238,7 +1232,7 @@ protected function _processSave($entity, $options) {
 			$this,
 			$entity,
 			$options['associated'],
-			['validate' => false] + $options->getArrayCopy()
+			$options->getArrayCopy()
 		);
 
 		if (!$saved && $options['atomic']) {
@@ -1259,7 +1253,7 @@ protected function _processSave($entity, $options) {
 				$this,
 				$entity,
 				$options['associated'],
-				['validate' => (bool)$validate] + $options->getArrayCopy()
+				$options->getArrayCopy()
 			);
 			if ($success || !$options['atomic']) {
 				$entity->clean();

diff --git a/tests/TestCase/ORM/MarshallerTest.php b/tests/TestCase/ORM/MarshallerTest.php
@@ -1491,4 +1491,5 @@ public function testMergeJoinDataWithFieldList() {
 		$this->assertTrue($entity->tags[1]->dirty('_joinData'));
 	}
 
+
 }