Merge pull request #74 from rakit/messages-trait

Messages getter and setter using trait
rakit · Nov 29, 2018 · 75dc5bd · 75dc5bd
2 parents 86a13f9 + 84411a8
commit 75dc5bd
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 54 deletions.
diff --git a/src/Traits/MessagesTrait.php b/src/Traits/MessagesTrait.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Rakit\Validation\Traits;
+
+trait MessagesTrait
+{
+
+    /** @var array */
+    protected $messages = [];
+
+    /**
+     * Given $key and $message to set message
+     *
+     * @param mixed $key
+     * @param mixed $message
+     * @return void
+     */
+    public function setMessage(string $key, string $message)
+    {
+        $this->messages[$key] = $message;
+    }
+
+    /**
+     * Given $messages and set multiple messages
+     *
+     * @param array $messages
+     * @return void
+     */
+    public function setMessages(array $messages)
+    {
+        $this->messages = array_merge($this->messages, $messages);
+    }
+
+    /**
+     * Given message from given $key
+     *
+     * @param string $key
+     * @return string
+     */
+    public function getMessage(string $key): string
+    {
+        return array_key_exists($key, $this->messages) ? $this->messages[$key] : $key;
+    }
+
+    /**
+     * Get all $messages
+     *
+     * @return array
+     */
+    public function getMessages(): array
+    {
+        return $this->messages;
+    }
+}
diff --git a/src/Validation.php b/src/Validation.php
@@ -9,7 +9,7 @@
 
 class Validation
 {
-    use Traits\TranslationsTrait;
+    use Traits\TranslationsTrait, Traits\MessagesTrait;
 
     /** @var mixed */
     protected $validator;
@@ -20,9 +20,6 @@ class Validation
     /** @var array */
     protected $attributes = [];
 
-    /** @var array */
-    protected $messages = [];
-
     /** @var array */
     protected $aliases = [];
 
@@ -523,29 +520,6 @@ protected function parseRule(string $rule): array
         return [$rulename, $params];
     }
 
-    /**
-     * Set message
-     *
-     * @param mixed $key
-     * @param mixed $message
-     * @return void
-     */
-    public function setMessage(string $key, string $message)
-    {
-        $this->messages[$key] = $message;
-    }
-
-    /**
-     * Set multiple messages
-     *
-     * @param array $messages
-     * @return void
-     */
-    public function setMessages(array $messages)
-    {
-        $this->messages = array_merge($this->messages, $messages);
-    }
-
     /**
      * Given $attributeKey and $alias then assign alias
      *

diff --git a/src/Validator.php b/src/Validator.php
@@ -4,10 +4,7 @@
 
 class Validator
 {
-    use Traits\TranslationsTrait;
-
-    /** @var array */
-    protected $messages = [];
+    use Traits\TranslationsTrait, Traits\MessagesTrait;
 
     /** @var translations */
     protected $translations = [];
@@ -33,29 +30,6 @@ public function __construct(array $messages = [])
         $this->registerBaseValidators();
     }
 
-    /**
-     * Given $key and $message to set message
-     *
-     * @param mixed $key
-     * @param mixed $message
-     * @return void
-     */
-    public function setMessage(string $key, string $message)
-    {
-        $this->messages[$key] = $message;
-    }
-
-    /**
-     * Given $messages and set multiple messages
-     *
-     * @param array $messages
-     * @return void
-     */
-    public function setMessages(array $messages)
-    {
-        $this->messages = array_merge($this->messages, $messages);
-    }
-
     /**
      * Register or override existing validator
      *