Skip to content

Commit e2e7b4f

Browse files
Refactor duplicated logic in ReplacesAttributes (#56790)
1 parent 40cd770 commit e2e7b4f

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/Illuminate/Validation/Concerns/ReplacesAttributes.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,7 @@ protected function replaceRequiredIfAccepted($message, $attribute, $rule, $param
638638
*/
639639
public function replaceRequiredIfDeclined($message, $attribute, $rule, $parameters)
640640
{
641-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
642-
643-
return str_replace([':other'], $parameters, $message);
641+
return $this->replaceRequiredIfAccepted($message, $attribute, $rule, $parameters);
644642
}
645643

646644
/**
@@ -694,9 +692,7 @@ protected function replaceProhibitedIf($message, $attribute, $rule, $parameters)
694692
*/
695693
protected function replaceProhibitedIfAccepted($message, $attribute, $rule, $parameters)
696694
{
697-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
698-
699-
return str_replace([':other'], $parameters, $message);
695+
return $this->replaceRequiredIfAccepted($message, $attribute, $rule, $parameters);
700696
}
701697

702698
/**
@@ -710,9 +706,7 @@ protected function replaceProhibitedIfAccepted($message, $attribute, $rule, $par
710706
*/
711707
public function replaceProhibitedIfDeclined($message, $attribute, $rule, $parameters)
712708
{
713-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
714-
715-
return str_replace([':other'], $parameters, $message);
709+
return $this->replaceRequiredIfAccepted($message, $attribute, $rule, $parameters);
716710
}
717711

718712
/**

0 commit comments

Comments
 (0)