Skip to content

Commit 95eeea4

Browse files
Refactor duplicated logic in ReplacesAttributes (#56789)
1 parent e2e7b4f commit 95eeea4

File tree

1 file changed

+5
-24
lines changed

1 file changed

+5
-24
lines changed

src/Illuminate/Validation/Concerns/ReplacesAttributes.php

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ protected function replaceAcceptedIf($message, $attribute, $rule, $parameters)
3535
*/
3636
protected function replaceDeclinedIf($message, $attribute, $rule, $parameters)
3737
{
38-
$parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
39-
40-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
41-
42-
return str_replace([':other', ':value'], $parameters, $message);
38+
return $this->replaceAcceptedIf($message, $attribute, $rule, $parameters);
4339
}
4440

4541
/**
@@ -213,11 +209,7 @@ protected function replaceMaxDigits($message, $attribute, $rule, $parameters)
213209
*/
214210
protected function replaceMissingIf($message, $attribute, $rule, $parameters)
215211
{
216-
$parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
217-
218-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
219-
220-
return str_replace([':other', ':value'], $parameters, $message);
212+
return $this->replaceAcceptedIf($message, $attribute, $rule, $parameters);
221213
}
222214

223215
/**
@@ -400,10 +392,7 @@ protected function replaceMimes($message, $attribute, $rule, $parameters)
400392
*/
401393
protected function replacePresentIf($message, $attribute, $rule, $parameters)
402394
{
403-
$parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
404-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
405-
406-
return str_replace([':other', ':value'], $parameters, $message);
395+
return $this->replaceAcceptedIf($message, $attribute, $rule, $parameters);
407396
}
408397

409398
/**
@@ -604,11 +593,7 @@ protected function replaceLte($message, $attribute, $rule, $parameters)
604593
*/
605594
protected function replaceRequiredIf($message, $attribute, $rule, $parameters)
606595
{
607-
$parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
608-
609-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
610-
611-
return str_replace([':other', ':value'], $parameters, $message);
596+
return $this->replaceAcceptedIf($message, $attribute, $rule, $parameters);
612597
}
613598

614599
/**
@@ -674,11 +659,7 @@ protected function replaceRequiredUnless($message, $attribute, $rule, $parameter
674659
*/
675660
protected function replaceProhibitedIf($message, $attribute, $rule, $parameters)
676661
{
677-
$parameters[1] = $this->getDisplayableValue($parameters[0], Arr::get($this->data, $parameters[0]));
678-
679-
$parameters[0] = $this->getDisplayableAttribute($parameters[0]);
680-
681-
return str_replace([':other', ':value'], $parameters, $message);
662+
return $this->replaceAcceptedIf($message, $attribute, $rule, $parameters);
682663
}
683664

684665
/**

0 commit comments

Comments
 (0)