@@ -1988,45 +1988,59 @@ protected function replaceBetween($message, $attribute, $rule, $parameters)
19881988 }
19891989
19901990 /**
1991- * Replace all place-holders for the digits rule.
1991+ * Replace all place-holders for the date_format rule.
19921992 *
19931993 * @param string $message
19941994 * @param string $attribute
19951995 * @param string $rule
19961996 * @param array $parameters
19971997 * @return string
19981998 */
1999- protected function replaceDigits ($ message , $ attribute , $ rule , $ parameters )
1999+ protected function replaceDateFormat ($ message , $ attribute , $ rule , $ parameters )
20002000 {
2001- return str_replace (':digits ' , $ parameters [0 ], $ message );
2001+ return str_replace (':format ' , $ parameters [0 ], $ message );
20022002 }
20032003
20042004 /**
2005- * Replace all place-holders for the digits (between) rule.
2005+ * Replace all place-holders for the different rule.
20062006 *
20072007 * @param string $message
20082008 * @param string $attribute
20092009 * @param string $rule
20102010 * @param array $parameters
20112011 * @return string
20122012 */
2013- protected function replaceDigitsBetween ($ message , $ attribute , $ rule , $ parameters )
2013+ protected function replaceDifferent ($ message , $ attribute , $ rule , $ parameters )
20142014 {
2015- return $ this ->replaceBetween ($ message , $ attribute , $ rule , $ parameters );
2015+ return $ this ->replaceSame ($ message , $ attribute , $ rule , $ parameters );
20162016 }
20172017
20182018 /**
2019- * Replace all place-holders for the size rule.
2019+ * Replace all place-holders for the digits rule.
20202020 *
20212021 * @param string $message
20222022 * @param string $attribute
20232023 * @param string $rule
20242024 * @param array $parameters
20252025 * @return string
20262026 */
2027- protected function replaceSize ($ message , $ attribute , $ rule , $ parameters )
2027+ protected function replaceDigits ($ message , $ attribute , $ rule , $ parameters )
20282028 {
2029- return str_replace (':size ' , $ parameters [0 ], $ message );
2029+ return str_replace (':digits ' , $ parameters [0 ], $ message );
2030+ }
2031+
2032+ /**
2033+ * Replace all place-holders for the digits (between) rule.
2034+ *
2035+ * @param string $message
2036+ * @param string $attribute
2037+ * @param string $rule
2038+ * @param array $parameters
2039+ * @return string
2040+ */
2041+ protected function replaceDigitsBetween ($ message , $ attribute , $ rule , $ parameters )
2042+ {
2043+ return $ this ->replaceBetween ($ message , $ attribute , $ rule , $ parameters );
20302044 }
20312045
20322046 /**
@@ -2175,6 +2189,20 @@ protected function replaceRequiredWithoutAll($message, $attribute, $rule, $param
21752189 return $ this ->replaceRequiredWith ($ message , $ attribute , $ rule , $ parameters );
21762190 }
21772191
2192+ /**
2193+ * Replace all place-holders for the size rule.
2194+ *
2195+ * @param string $message
2196+ * @param string $attribute
2197+ * @param string $rule
2198+ * @param array $parameters
2199+ * @return string
2200+ */
2201+ protected function replaceSize ($ message , $ attribute , $ rule , $ parameters )
2202+ {
2203+ return str_replace (':size ' , $ parameters [0 ], $ message );
2204+ }
2205+
21782206 /**
21792207 * Replace all place-holders for the required_if rule.
21802208 *
@@ -2223,34 +2251,6 @@ protected function replaceSame($message, $attribute, $rule, $parameters)
22232251 return str_replace (':other ' , $ this ->getAttribute ($ parameters [0 ]), $ message );
22242252 }
22252253
2226- /**
2227- * Replace all place-holders for the different rule.
2228- *
2229- * @param string $message
2230- * @param string $attribute
2231- * @param string $rule
2232- * @param array $parameters
2233- * @return string
2234- */
2235- protected function replaceDifferent ($ message , $ attribute , $ rule , $ parameters )
2236- {
2237- return $ this ->replaceSame ($ message , $ attribute , $ rule , $ parameters );
2238- }
2239-
2240- /**
2241- * Replace all place-holders for the date_format rule.
2242- *
2243- * @param string $message
2244- * @param string $attribute
2245- * @param string $rule
2246- * @param array $parameters
2247- * @return string
2248- */
2249- protected function replaceDateFormat ($ message , $ attribute , $ rule , $ parameters )
2250- {
2251- return str_replace (':format ' , $ parameters [0 ], $ message );
2252- }
2253-
22542254 /**
22552255 * Replace all place-holders for the before rule.
22562256 *
0 commit comments