Added support for lazy loaded validators in hasValidator().

Test added for hasValidator method.
cakephp · May 30, 2017 · ac02317 · ac02317
1 parent f59aae3
commit ac02317
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/Validation/ValidatorAwareTrait.php b/src/Validation/ValidatorAwareTrait.php
@@ -214,6 +214,11 @@ public function setValidator($name, Validator $validator)
      */
     public function hasValidator($name)
     {
+        $method = 'validation' . ucfirst($name);
+        if (method_exists($this, $method)) {
+            return true;
+        }
+
         return isset($this->_validators[$name]);
     }
 

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -3411,6 +3411,22 @@ public function testValidatorSetter()
         $this->assertSame($table, $validator->provider('table'));
     }
 
+    /**
+     * Tests hasValidator method.
+     *
+     * @return void
+     */
+    public function testHasValidator()
+    {
+        $table = new Table;
+        $this->assertTrue($table->hasValidator('default'));
+        $this->assertFalse($table->hasValidator('other'));
+
+        $validator = new \Cake\Validation\Validator;
+        $table->setValidator('other', $validator);
+        $this->assertTrue($table->hasValidator('other'));
+    }
+
     /**
      * Tests that the source of an existing Entity is the same as a new one
      *