Merge pull request #39 from TheDMSGroup/ENG-190-exception

[ENG-190] Prevent exception when multiple validations fail.

Author: heathdutton

Helper/FilterHelper.php

@@ -182,9 +182,10 @@ protected function evaluate($rule, array $context = [])
 
         $result = $this->evaluateRuleAgainstContext($rule, $contextValue, $ruleValue);
         if (!$result) {
-            $val = $contextValue ? '"'.$contextValue.'"' : 'empty';
+            $contextValue = $contextValue ? '"'.$contextValue.'"' : 'empty';
+            $ruleValue    = $ruleValue ? '"'.$ruleValue.'"' : 'empty';
             $this->setError(
-                'Validation rule: '.$rule->field.' '.$rule->operator.' '.$ruleValue.' (actual value was '.$val.')'
+                $rule->field.' must '.rtrim($rule->operator, 's').' '.$ruleValue.' (value was '.$contextValue.').'
             );
         }
 

Model/ApiPayloadResponse.php

@@ -369,17 +369,25 @@ public function validate()
             }
 
             // Standard success definition validation.
-            $e      = false;
             $filter = new FilterHelper();
             try {
                 $this->valid = $filter->filter($this->successDefinition, $this->responseActual);
             } catch (\Exception $e) {
+                throw new ContactClientException(
+                    'Error in validation: '.$e->getMessage(),
+                    0,
+                    $e,
+                    Stat::TYPE_REJECT,
+                    false,
+                    null,
+                    $filter->getErrors()
+                );
             }
-            if (!$this->valid || $e) {
+            if (!$this->valid && !isset($e)) {
                 throw new ContactClientException(
-                    'Response did not pass validation.'.$e ? ' '.$e->getMessage() : null,
+                    'Failed validation: '.implode(', ', $filter->getErrors()),
                     0,
-                    $e ? $e : null,
+                    null,
                     Stat::TYPE_REJECT,
                     false,
                     null,