Create getLabel method in Model.php and fix bug in Field.php if label does not exist for attribute

Author: thecodeholic

core/Model.php

@@ -44,6 +44,11 @@ public function labels()
         return [];
     }
 
+    public function getLabel($attribute)
+    {
+        return $this->labels()[$attribute] ?? $attribute;
+    }
+
     public function rules()
     {
         return [];
@@ -59,19 +64,19 @@ public function validate()
                     $ruleName = $rule[0];
                 }
                 if ($ruleName === self::RULE_REQUIRED && !$value) {
-                    $this->addError($attribute, self::RULE_REQUIRED);
+                    $this->addErrorByRule($attribute, self::RULE_REQUIRED);
                 }
                 if ($ruleName === self::RULE_EMAIL && !filter_var($value, FILTER_VALIDATE_EMAIL)) {
-                    $this->addError($attribute, self::RULE_EMAIL);
+                    $this->addErrorByRule($attribute, self::RULE_EMAIL);
                 }
                 if ($ruleName === self::RULE_MIN && strlen($value) < $rule['min']) {
-                    $this->addError($attribute, self::RULE_MIN, ['min' => $rule['min']]);
+                    $this->addErrorByRule($attribute, self::RULE_MIN, ['min' => $rule['min']]);
                 }
                 if ($ruleName === self::RULE_MAX && strlen($value) > $rule['max']) {
-                    $this->addError($attribute, self::RULE_MAX);
+                    $this->addErrorByRule($attribute, self::RULE_MAX);
                 }
                 if ($ruleName === self::RULE_MATCH && $value !== $this->{$rule['match']}) {
-                    $this->addError($attribute, self::RULE_MATCH, ['match' => $rule['match']]);
+                    $this->addErrorByRule($attribute, self::RULE_MATCH, ['match' => $rule['match']]);
                 }
                 if ($ruleName === self::RULE_UNIQUE) {
                     $className = $rule['class'];
@@ -83,7 +88,7 @@ public function validate()
                     $statement->execute();
                     $record = $statement->fetchObject();
                     if ($record) {
-                        $this->addError($attribute, self::RULE_UNIQUE);
+                        $this->addErrorByRule($attribute, self::RULE_UNIQUE);
                     }
                 }
             }
@@ -108,7 +113,7 @@ public function errorMessage($rule)
         return $this->errorMessages()[$rule];
     }
 
-    public function addError(string $attribute, string $rule, $params = [])
+    protected function addErrorByRule(string $attribute, string $rule, $params = [])
     {
         $params['field'] ??= $attribute;
         $errorMessage = $this->errorMessage($rule);
@@ -118,6 +123,11 @@ public function addError(string $attribute, string $rule, $params = [])
         $this->errors[$attribute][] = $errorMessage;
     }
 
+    public function addError(string $attribute, string $message)
+    {
+        $this->errors[$attribute][] = $message;
+    }
+
     public function hasError($attribute)
     {
         return $this->errors[$attribute] ?? false;

core/form/Field.php

@@ -47,7 +47,7 @@ public function __toString()
                     %s
                 </div>
             </div>',
-            $this->model->labels()[$this->attribute],
+            $this->model->getLabel($this->attribute),
             $this->type,
             $this->model->hasError($this->attribute) ? ' is-invalid' : '',
             $this->attribute,