From 05932253dc3cb6877da00486b0fcae59385a8273 Mon Sep 17 00:00:00 2001 From: webafra Date: Thu, 6 May 2021 05:05:10 +0430 Subject: [PATCH 1/2] fix: custom message error in lumen --- src/ValidationMessages.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ValidationMessages.php b/src/ValidationMessages.php index 97d0ee1..1704908 100644 --- a/src/ValidationMessages.php +++ b/src/ValidationMessages.php @@ -33,7 +33,7 @@ class ValidationMessages * @author Shahrokh Niakan * @since Sep 21, 2016 */ - public function __construct() + public function __construct() { $this->lang = App::getLocale(); @@ -51,14 +51,17 @@ public function __construct() * @since Jun 6, 2017 */ public static function setCustomMessages( $validator ) - { + { self::$app = include __DIR__ . '/Config.php'; if ( $validator ) { - if ( round((int)App::version(), 1) > self::$app['version'] ) { + if ( round(App::version(), 1) > self::$app['version'] ) { self::$messages = $validator->customMessages; } else { - self::$messages = $validator->getCustomMessages(); + if(method_exists($validator, 'getCustomMessages')) { + self::$messages = $validator->getCustomMessages(); + } + self::$messages = $validator->customMessages; } } } From d473d978f9e07bf26269c64a8b55feb9730db215 Mon Sep 17 00:00:00 2001 From: webafra Date: Thu, 6 May 2021 05:08:51 +0430 Subject: [PATCH 2/2] fix: custom message error in lumen --- src/ValidationMessages.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ValidationMessages.php b/src/ValidationMessages.php index 1704908..6601017 100644 --- a/src/ValidationMessages.php +++ b/src/ValidationMessages.php @@ -33,7 +33,7 @@ class ValidationMessages * @author Shahrokh Niakan * @since Sep 21, 2016 */ - public function __construct() + public function __construct() { $this->lang = App::getLocale(); @@ -51,17 +51,18 @@ public function __construct() * @since Jun 6, 2017 */ public static function setCustomMessages( $validator ) - { + { self::$app = include __DIR__ . '/Config.php'; if ( $validator ) { - if ( round(App::version(), 1) > self::$app['version'] ) { + if ( round((int)App::version(), 1) > self::$app['version'] ) { self::$messages = $validator->customMessages; } else { - if(method_exists($validator, 'getCustomMessages')) { - self::$messages = $validator->getCustomMessages(); - } - self::$messages = $validator->customMessages; + if(method_exists($validator, 'getCustomMessages')) { + self::$messages = $validator->getCustomMessages(); + } else { + self::$messages = $validator->customMessages; + } } } }