Bug fixes

unicframework · May 2, 2021 · 678ec50 · 678ec50
1 parent 0172fe8
commit 678ec50
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Validator.php b/src/Validator.php
@@ -77,7 +77,11 @@ public static function make(array $rules, array $messages=[]) {
         return trim($value);
       }, explode(',', $data_key));
       foreach($tmp_data_key as $data_key) {
-        $parsed_rules[$data_key] = $parsed_data_rules;
+        if(array_key_exists($data_key, $parsed_rules)) {
+          $parsed_rules[$data_key] = array_merge($parsed_rules[$data_key], $parsed_data_rules);
+        } else {
+          $parsed_rules[$data_key] = $parsed_data_rules;
+        }
       }
     }
     self::$rules = $parsed_rules;
@@ -110,7 +114,11 @@ public static function make(array $rules, array $messages=[]) {
         return trim($value);
       }, explode(',', $data_key));
       foreach($tmp_data_key as $data_key) {
-        $parsed_messages[$data_key] = $parsed_data_messages;
+        if(array_key_exists($data_key, $parsed_messages)) {
+          $parsed_messages[$data_key] = array_merge($parsed_messages[$data_key], $parsed_data_messages);
+        } else {
+          $parsed_messages[$data_key] = $parsed_data_messages;
+        }
       }
     }
     self::$messages = $parsed_messages;