Adding a default scope

cakephp · Nov 20, 2013 · 0a3960d · 0a3960d
1 parent c4e0c52
commit 0a3960d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Cake/ORM/Validator.php b/Cake/ORM/Validator.php
@@ -109,6 +109,9 @@ public function scope($name, $object = null) {
 			if (isset($this->_scopes[$name])) {
 				return $this->_scopes[$name];
 			}
+			if ($name === 'default') {
+				return $this->_scopes[$name] = '\Cake\Utility\Validation';
+			}
 			return null;
 		}
 		$this->_scopes[$name] = $object;

diff --git a/Cake/Test/TestCase/ORM/ValidatorTest.php b/Cake/Test/TestCase/ORM/ValidatorTest.php
@@ -221,6 +221,8 @@ public function testScope() {
 		$another = new \stdClass;
 		$this->assertSame($validator, $validator->scope('bar', $another));
 		$this->assertSame($another, $validator->scope('bar'));
+
+		$this->assertEquals('\Cake\Utility\Validation', $validator->scope('default'));
 	}
 
 }