Format like in jquery

Author: eclemens

src/PHPValidation/Rules/Max.php

@@ -9,7 +9,7 @@
  */
 class Max extends Base
 {
-    public $message = "Please enter a value less than or equal to %s.";
+    public $message = "Please enter a value less than or equal to {0}.";
 
     /**
      * Makes the element require a given maximum.

src/PHPValidation/Rules/MaxWords.php

@@ -7,7 +7,7 @@
  */
 class MaxWords extends Base
 {
-    public $message = "Please enter %s words or less.";
+    public $message = "Please enter {0} words or less.";
 
     /**
      * @param  mixed $value

src/PHPValidation/Rules/Maxlength.php

@@ -9,7 +9,7 @@
  */
 class Maxlength extends Base
 {
-    public $message = "Please enter no more than %s characters.";
+    public $message = "Please enter no more than {0} characters.";
 
     /**
      * Makes the element require a given maxmimum length.

src/PHPValidation/Rules/Min.php

@@ -9,7 +9,7 @@
  */
 class Min extends Base
 {
-    public $message = "Please enter a value greater than or equal to %s.";
+    public $message = "Please enter a value greater than or equal to {0}.";
 
     /**
      * Makes the element require a given minimum.

src/PHPValidation/Rules/MinWords.php

@@ -7,7 +7,7 @@
  */
 class MinWords extends Base
 {
-    public $message = "Please enter at least %s words.";
+    public $message = "Please enter at least {0} words.";
 
     /**
      * @param  mixed $value

src/PHPValidation/Rules/Minlength.php

@@ -9,7 +9,7 @@
  */
 class Minlength extends Base
 {
-    public $message = "Please enter at least %s characters.";
+    public $message = "Please enter at least {0} characters.";
 
     /**
      * Makes the element require a given minimum length.

src/PHPValidation/Rules/Range.php

@@ -9,7 +9,7 @@
  */
 class Range extends Base
 {
-    public $message = "Please enter a value between %s and %s.";
+    public $message = "Please enter a value between {0} and {1}.";
 
     /**
      * Makes the element require a given value range.

src/PHPValidation/Rules/RangeWords.php

@@ -7,7 +7,7 @@
  */
 class RangeWords extends Base
 {
-    public $message = "Please enter between %s and %s words.";
+    public $message = "Please enter between {0} and {1} words.";
 
     /**
      * @param  mixed $value

src/PHPValidation/Rules/Rangelength.php

@@ -9,7 +9,7 @@
  */
 class Rangelength extends Base
 {
-    public $message = "Please enter a value between %s and %s characters long.";
+    public $message = "Please enter a value between {0} and {1} characters long.";
 
     /**
      * Makes the element require a given value range.

src/PHPValidation/Rules/Strippedminlength.php

@@ -7,7 +7,7 @@
  */
 class Strippedminlength extends Base
 {
-    public $message = "Please enter at least %s characters.";
+    public $message = "Please enter at least {0} characters.";
 
     /**
      * TODO check if value starts with <, otherwise don't try stripping anything

src/PHPValidation/Validation.php

@@ -7,7 +7,6 @@ class Validation
 
     protected $methods = [];
     protected $rules   = [];
-    protected $ignore  = [];
 
     protected $params = [];
     protected $errors = [];
@@ -31,7 +30,7 @@ public function __construct() {}
      */
     public function messages(array $messages)
     {
-        $this->messages = array_merge($this->messages, $messages);
+        $this->messages = array_replace_recursive($this->messages, $messages);
     }
 
     /**
@@ -49,16 +48,6 @@ public function rules(array $rules)
         $this->rules = $rules;
     }
 
-    /**
-     * Elements to ignore when validating, simply filtering them out.
-     *
-     * @param  array   $fields
-     */
-    public function ignore(array $fields)
-    {
-        $this->ignore = $fields;
-    }
-
     /**
      * Add a custom validation method.
      * It must consist of a name, a lambda function and a default string message.
@@ -73,7 +62,7 @@ public function addMethod($name, $method, $message = null)
             return false;
         }
 
-        $rule = new \PHPValidation\Rules\Custom($this);
+        $rule         = new \PHPValidation\Rules\Custom($this);
         $rule->method = $method;
         if (!is_null($message)) {
             $rule->message = $message;
@@ -202,14 +191,36 @@ protected function error($value, $rule, $options = null, $field = null)
         }
 
         if (isset($message) && is_string($message)) {
-            if (is_array($options)) {
-                $message = @vsprintf($message, $options) ?: $message;
-            } else {
-                $message = @sprintf($message, $options) ?: $message;
-            }
+            $message = $this->format($message, $options);
+        }
+
+        return is_scalar($message) ? $message : '';
+    }
+
+    /**
+     * Replaces {n} placeholders with arguments.
+     */
+    protected function format($source, $params)
+    {
+        $argsv = func_get_args();
+        $argsc = func_num_args();
+
+        if ($argsc > 2 && !is_array($params)) {
+            $params = array_slice($argsv, 1);
+        }
+        if (!is_array($params)) {
+            $params = [$params];
+        }
+        foreach ($params as $i => $n) {
+            $source = preg_replace("/\{" . preg_quote($i) . "\}/", $n, $source);
         }
 
-        return is_string($message) ? $message : '';
+        return $source;
+    }
+
+    public function param($name)
+    {
+        return @$this->params[$name];
     }
 
     /*=============================
@@ -252,9 +263,4 @@ public function depend($options, $value = null)
 
         return true;
     }
-
-    public function param($name)
-    {
-        return @$this->params[$name];
-    }
 }