Merge pull request #3036 from tigrang/bug-fix-validate

Check `validate` option before validating
cakephp · Mar 17, 2014 · 2ab9feb · 2ab9feb
2 parents 2136783 + 6337937
commit 2ab9feb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1125,7 +1125,7 @@ protected function _processSave($entity, $options) {
 		$associated = $options['associated'];
 		$options['associated'] = [];
 
-		if (!$this->validate($entity, $options)) {
+		if ($options['validate'] && !$this->validate($entity, $options)) {
 			return false;
 		}
 

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -2778,15 +2778,7 @@ public function testSaveDeepAssociationOptions() {
 			->with($entity->author->supervisor, ['name' => 'Marc'])
 			->will($this->returnValue($entity->author->supervisor));
 
-		$options = new \ArrayObject([
-			'validate' => false,
-			'atomic' => false,
-			'associated' => []
-		]);
-		$supervisors->expects($this->once())
-			->method('validate')
-			->with($entity->author->supervisor, $options)
-			->will($this->returnValue(true));
+		$supervisors->expects($this->never())->method('validate');
 
 		$tags->expects($this->never())->method('_insert');