From cb9e6e25e06856ed349463edb9f5fcc4f27ad92d Mon Sep 17 00:00:00 2001 From: Jakub Augustynowicz Date: Fri, 3 Mar 2017 13:44:29 +0100 Subject: [PATCH] Patch for conditional rule parser. (validator sometimes) --- src/Javascript/RuleParser.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Javascript/RuleParser.php b/src/Javascript/RuleParser.php index 0853263..a843217 100644 --- a/src/Javascript/RuleParser.php +++ b/src/Javascript/RuleParser.php @@ -2,6 +2,7 @@ namespace Proengsoft\JsValidation\Javascript; +use Illuminate\Validation\ValidationRuleParser; use Proengsoft\JsValidation\Support\RuleListTrait; use Proengsoft\JsValidation\Support\DelegatedValidator; use Proengsoft\JsValidation\Support\UseDelegatedValidatorTrait; @@ -93,8 +94,8 @@ public function addConditionalRules($attribute, $rules = []) { foreach ((array) $attribute as $key) { $current = isset($this->conditional[$key]) ? $this->conditional[$key] : []; - $merge = head($this->validator->explodeRules((array) $rules)); - $this->conditional[$key] = array_merge($current, $merge); + $merge = (new ValidationRuleParser([]))->explode((array) $rules); + $this->conditional[$key] = array_merge($current, head($merge->rules)); } }