Merge pull request #12 from rakit/bugfix-set-messages

Bugfix setMessages

Author: emsifa

src/Rules/Callable.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rakit\Validation\Rules;
+
+use Rakit\Validation\Rule;
+use InvalidArgumentException;
+
+class Callable extends Rule
+{
+
+    public function setParameters(array $params)
+    {
+        $this->params['callable'] = array_shift($params);
+        $this->params['parameters'] = $params;
+        return $this;
+    }
+
+    public function parameters(array $params)
+    {
+        $this->params['parameters'] = $params;
+    }
+
+    public function check($value)
+    {
+        $this->requireParameters(['callable']);
+
+        $callable = $this->parameter('callable');
+        if (! is_callable($callable)) {
+            throw new InvalidArgumentException("Parameter 1 in callable rule must be callable. ", 1);
+        }
+
+        $params
+
+        if (! is_string($value) && ! is_numeric($value)) {
+            return false;
+        }
+
+        return preg_match('/^[\pL\pM\pN_-]+$/u', $value) > 0;
+    }
+
+}

src/Validation.php

@@ -187,7 +187,7 @@ public function setMessage($key, $message)
 
     public function setMessages(array $messages)
     {
-        array_merge($this->messages, $messages);
+        $this->messages = array_merge($this->messages, $messages);
     }
 
     public function setAlias($attributeKey, $alias)

src/Validator.php

@@ -23,9 +23,9 @@ public function setMessage($key, $message)
         return $this->messages[$key] = $message;
     }
 
-    public function setMessages()
+    public function setMessages($messages)
     {
-        array_merge($this->messages, $messages);
+        $this->messages = array_merge($this->messages, $messages);
     }
 
     public function setValidator($key, Rule $rule)
@@ -46,7 +46,7 @@ public function validate(array $inputs, array $rules, array $messages = array())
         return $validation;
     }
 
-    public function make(array $inputs, array $rules, array $messages)
+    public function make(array $inputs, array $rules, array $messages = array())
     {
         $messages = array_merge($this->messages, $messages);
         return new Validation($this, $inputs, $rules, $messages); 

tests/ValidatorTest.php

@@ -124,36 +124,89 @@ public function testRulePresent()
         $this->assertTrue($v2->passes());
     }
 
-    public function testValidationMessages()
+    public function testSetCustomMessagesInValidator()
     {
-        $validation = $this->validator->make([
-            'email' => '',
-            'number' => 5
+        $this->validator->setMessages([
+            'required' => 'foo',
+            'email' => 'bar'
+        ]);
+
+        $this->validator->setMessage('numeric', 'baz');
+
+        $validation = $this->validator->validate([
+            'foo' => null,
+            'email' => 'invalid email',
+            'something' => 'not numeric'
         ], [
-            'email' => 'required|email',
-            'number' => 'min:6|max:4|between:1,4'
+            'foo' => 'required',
+            'email' => 'email',
+            'something' => 'numeric'
+        ]);
+
+        $errors = $validation->errors();
+        $this->assertEquals($errors->get('foo', 'required'), 'foo');
+        $this->assertEquals($errors->get('email', 'email'), 'bar');
+        $this->assertEquals($errors->get('something', 'numeric'), 'baz');
+    }
+
+    public function testSetCustomMessagesInValidation()
+    {
+        $validation = $this->validator->make([
+            'foo' => null,
+            'email' => 'invalid email',
+            'something' => 'not numeric'
         ], [
-            'email.required' => 'Kolom email tidak boleh kosong',
-            'required' => ':attribute harus diisi',
-            'number.max' => 'number > :max',
-            'number.min' => 'number < :min',
-            'number.between' => ':min - :max'
+            'foo' => 'required',
+            'email' => 'email',
+            'something' => 'numeric'
         ]);
 
-        $validation->setAlias('email', 'e-mail');
+        $validation->setMessages([
+            'required' => 'foo',
+            'email' => 'bar'
+        ]);
+
+        $validation->setMessage('numeric', 'baz');
+
         $validation->validate();
 
         $errors = $validation->errors();
+        $this->assertEquals($errors->get('foo', 'required'), 'foo');
+        $this->assertEquals($errors->get('email', 'email'), 'bar');
+        $this->assertEquals($errors->get('something', 'numeric'), 'baz');
+    }
 
-        $first_error = $errors->first('email');
-        $error_required = $errors->get('email', 'required');
-        
-        $this->assertEquals($first_error, 'Kolom email tidak boleh kosong');
-        $this->assertEquals($error_required, 'Kolom email tidak boleh kosong');
+    public function testSetAttributeAliases()
+    {
+        $validation = $this->validator->make([
+            'foo' => null,
+            'email' => 'invalid email',
+            'something' => 'not numeric'
+        ], [
+            'foo' => 'required',
+            'email' => 'email',
+            'something' => 'numeric'
+        ]);
+
+        $validation->setMessages([
+            'required' => ':attribute foo',
+            'email' => ':attribute bar',
+            'numeric' => ':attribute baz'
+        ]);
+
+        $validation->setAliases([
+            'foo' => 'Foo',
+            'email' => 'Bar',
+        ]);
+
+        $validation->setAlias('something', 'Baz');
 
-        $this->assertEquals($errors->get('number', 'max'), 'number > 4');
-        $this->assertEquals($errors->get('number', 'min'), 'number < 6');
-        $this->assertEquals($errors->get('number', 'between'), '1 - 4');
+        $validation->validate();
+
+        $errors = $validation->errors();
+        $this->assertEquals($errors->get('foo', 'required'), 'Foo foo');
+        $this->assertEquals($errors->get('email', 'email'), 'Bar bar');
+        $this->assertEquals($errors->get('something', 'numeric'), 'Baz baz');
     }
 
     /**