Merge pull request #25 from Schoolrunner/feature/humanized_attribute_key

Allow turning humanized keys on/off.

Author: emsifa

src/Attribute.php

@@ -9,6 +9,8 @@ class Attribute
 
     protected $key;
 
+    protected $humanizedKey;
+
     protected $alias;
 
     protected $validation;
@@ -24,6 +26,7 @@ public function __construct(Validation $validation, $key, $alias = null, array $
         $this->validation = $validation;
         $this->alias = $alias;
         $this->key = $key;
+        $this->humanizedKey = ucfirst(str_replace('_', ' ', $key));
         foreach($rules as $rule) {
             $this->addRule($rule);
         }
@@ -94,6 +97,11 @@ public function getKey()
         return $this->key;
     }
 
+    public function getHumanizedKey()
+    {
+        return $this->humanizedKey;
+    }
+
     public function setAlias($alias)
     {
         $this->alias = $alias;

src/Validation.php

@@ -245,8 +245,10 @@ protected function resolveAttributeName(Attribute $attribute)
             return $this->aliases[$attribute->getKey()];
         } elseif($primaryAttribute AND isset($this->aliases[$primaryAttribute->getKey()])) {
             return $this->aliases[$primaryAttribute->getKey()];
+        } elseif ($this->validator->getUseHumanizedKeys()) {
+            return $attribute->getHumanizedKey();
         } else {
-            return ucfirst(str_replace('_', ' ', $attribute->getKey()));
+            return $attribute->getKey();
         }
     }
 

src/Validator.php

@@ -11,6 +11,8 @@ class Validator
 
     protected $allowRuleOverride = false;
 
+    protected $useHumanizedKeys = true;
+
     public function __construct(array $messages = [])
     {
         $this->messages = $messages;
@@ -124,4 +126,14 @@ public function allowRuleOverride($status = false)
     {
         $this->allowRuleOverride = $status;
     }
+
+    public function setUseHumanizedKeys($useHumanizedKeys = true)
+    {
+        $this->useHumanizedKeys = $useHumanizedKeys;
+    }
+
+    public function getUseHumanizedKeys()
+    {
+        return $this->useHumanizedKeys;
+    }
 }