Merge pull request #213 from ricardoriogo/master

Added the possibility to define custom attributes's names on models
laravel-ardent · Sep 7, 2015 · c655360 · c655360
2 parents 51b99b4 + f649633
commit c655360
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/LaravelBook/Ardent/Ardent.php b/src/LaravelBook/Ardent/Ardent.php
@@ -46,6 +46,13 @@ abstract class Ardent extends Model {
     public static $customMessages = array();
 
     /**
+     * The array of custom attributes.
+     *
+     * @var array
+     */
+    public static $customAttributes = array();
+
+	/**
      * The validator object in case you need it externally (say, for a form builder).
      *
      * @see getValidator()
@@ -513,26 +520,28 @@ public static function configureAsExternal(array $connection, $lang = 'en') {
      * @param $data
      * @param $rules
      * @param $customMessages
+     * @param $customAttributes
      * @return \Illuminate\Validation\Validator
      * @see Ardent::$externalValidator
      */
-    protected static function makeValidator($data, $rules, $customMessages) {
+    protected static function makeValidator($data, $rules, $customMessages, $customAttributes) {
         if (self::$externalValidator) {
-            return self::$validationFactory->make($data, $rules, $customMessages);
+            return self::$validationFactory->make($data, $rules, $customMessages, $customAttributes);
         } else {
-            return Validator::make($data, $rules, $customMessages);
+            return Validator::make($data, $rules, $customMessages, $customAttributes);
         }
     }
 
     /**
      * Validate the model instance
      *
-     * @param array $rules          Validation rules
-     * @param array $customMessages Custom error messages
+     * @param array $rules            Validation rules
+     * @param array $customMessages   Custom error messages
+     * @param array $customAttributes Custom attributes
      * @return bool
      * @throws InvalidModelException
      */
-    public function validate(array $rules = array(), array $customMessages = array()) {
+    public function validate(array $rules = array(), array $customMessages = array(), array $customAttributes = array()) {
         if ($this->fireModelEvent('validating') === false) {
             if ($this->throwOnValidation) {
                 throw new InvalidModelException($this);
@@ -553,6 +562,7 @@ public function validate(array $rules = array(), array $customMessages = array()
             $success = true;
         } else {
 			$customMessages = (empty($customMessages))? static::$customMessages : $customMessages;
+			$customAttributes = (empty($customAttributes))? static::$customAttributes : $customAttributes;
 
 			if ($this->forceEntityHydrationFromInput || (empty($this->attributes) && $this->autoHydrateEntityFromInput)) {
 				$this->fill(Input::all());
@@ -561,7 +571,7 @@ public function validate(array $rules = array(), array $customMessages = array()
 			$data = $this->getAttributes(); // the data under validation
 
 			// perform validation
-			$this->validator = static::makeValidator($data, $rules, $customMessages);
+			$this->validator = static::makeValidator($data, $rules, $customMessages, $customAttributes);
 			$success   = $this->validator->passes();
 
 			if ($success) {