Skip to content

Commit 8aa0659

Browse files
committed
Merge branch '7.x-call-method-once' into 7.x
2 parents f2eb9ab + c15fb3c commit 8aa0659

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Illuminate/Validation/Validator.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,9 @@ protected function validateUsingCustomRule($attribute, $value, $rule)
697697
if (! $rule->passes($attribute, $value)) {
698698
$this->failedRules[$attribute][get_class($rule)] = [];
699699

700-
$messages = $rule->message() ? (array) $rule->message() : [get_class($rule)];
700+
$messages = $rule->message();
701+
702+
$messages = $messages ? (array) $messages : [get_class($rule)];
701703

702704
foreach ($messages as $message) {
703705
$this->messages->add($attribute, $this->makeReplacements(

0 commit comments

Comments
 (0)