Merge branch 'dev'

gte451f · Sep 7, 2017 · aaf51f7 · aaf51f7
2 parents f2cd9a0 + b89d958
commit aaf51f7
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Result/Adapters/ActiveModel/Result.php b/src/Result/Adapters/ActiveModel/Result.php
@@ -94,11 +94,18 @@ protected function formatFailure($result)
             $errorBlock = [];
             if ($error->validationList) {
                 foreach ($error->validationList as $validation) {
-                    $field = $inflector->normalize($validation->getField(), $appConfig['propertyFormatTo']);
-                    if (!isset($errorBlock[$field])) {
-                        $errorBlock[$field] = [];
+                    if (is_array($validation->getField())) {
+                        $fields = $validation->getField();
+                    } else {
+                        $fields = [$validation->getField()];
+                    }
+                    foreach($fields as $fieldName) {
+                        $field = $inflector->normalize($fieldName, $appConfig['propertyFormatTo']);
+                        if (!isset($errorBlock[$field])) {
+                            $errorBlock[$field] = [];
+                        }
+                        $errorBlock[$field][] = $validation->getMessage();
                     }
-                    $errorBlock[$field][] = $validation->getMessage();
                 }
             }