Renaming option meant to avoid rule checking during the save process

cakephp · Dec 2, 2014 · 8ec2efd · 8ec2efd
1 parent 0f2ee80
commit 8ec2efd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -1188,7 +1188,7 @@ public function save(EntityInterface $entity, $options = []) {
 		$options = new \ArrayObject($options + [
 			'atomic' => true,
 			'associated' => true,
-			'domainCheck' => true
+			'checkRules' => true
 		]);
 
 		if ($entity->errors()) {
@@ -1231,7 +1231,7 @@ protected function _processSave($entity, $options) {
 			$entity->isNew(!$this->exists($conditions));
 		}
 
-		if ($options['domainCheck'] && !$this->checkDomainRules($entity)) {
+		if ($options['checkRules'] && !$this->checkDomainRules($entity)) {
 			return false;
 		}
 

diff --git a/tests/TestCase/ORM/RulesCheckerIntegrationTest.php b/tests/TestCase/ORM/RulesCheckerIntegrationTest.php
@@ -359,4 +359,23 @@ public function testExistsInDomainRuleWithObject() {
 		$this->assertEquals(['Nope'], $entity->errors('author_id'));
 	}
 
+/**
+ * Tests the checkRules save option
+ *
+ * @group save
+ * @return void
+ */
+	public function testSkipRulesChecking() {
+		$entity = new Entity([
+			'title' => 'An Article',
+			'author_id' => 500
+		]);
+
+		$table = TableRegistry::get('Articles');
+		$rules = $table->domainRules();
+		$rules->add($rules->existsIn('author_id', TableRegistry::get('Authors'), 'Nope'));
+
+		$this->assertSame($entity, $table->save($entity, ['checkRules' => false]));
+	}
+
 }