Add support for testing field matches in validation

popphp · Mar 24, 2016 · eca212c · eca212c
1 parent bbf2af9
commit eca212c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Element/AbstractElement.php b/src/Element/AbstractElement.php
@@ -467,10 +467,11 @@ public function addValidators(array $validators)
     /**
      * Validate the form element object
      *
+     * @param  array $fields
      * @throws Exception
      * @return boolean
      */
-    public function validate()
+    public function validate(array $fields = [])
     {
         $this->errors = [];
 
@@ -504,7 +505,12 @@ public function validate()
 
                 // If Pop\Validator\*
                 if ($validator instanceof \Pop\Validator\ValidatorInterface) {
-                    if ('Pop\Validator\NotEmpty' == get_class($validator)) {
+                    if (('Pop\Validator\Equal' == get_class($validator)) && array_key_exists($validator->getValue(), $fields)) {
+                        $validator->setValue($fields[$validator->getValue()]);
+                        if (!$validator->evaluate($curElemValue)) {
+                            $this->errors[] = $validator->getMessage();
+                        }
+                    } else if ('Pop\Validator\NotEmpty' == get_class($validator)) {
                         if (!$validator->evaluate($curElemValue)) {
                             $this->errors[] = $validator->getMessage();
                         }

diff --git a/src/Form.php b/src/Form.php
@@ -640,7 +640,7 @@ public function isValid()
 
         // Check each element for validators, validate them and return the result.
         foreach ($children as $child) {
-            if ($child->validate() == false) {
+            if ($child->validate($this->fields) == false) {
                 $noErrors = false;
             }
         }