Skip to content

Commit 997e0c7

Browse files
Refactor duplicated logic in ReplacesAttributes (#56792)
1 parent 54211a1 commit 997e0c7

File tree

1 file changed

+7
-35
lines changed

1 file changed

+7
-35
lines changed

src/Illuminate/Validation/Concerns/ReplacesAttributes.php

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -328,11 +328,7 @@ protected function replaceInArray($message, $attribute, $rule, $parameters)
328328
*/
329329
protected function replaceInArrayKeys($message, $attribute, $rule, $parameters)
330330
{
331-
foreach ($parameters as &$parameter) {
332-
$parameter = $this->getDisplayableValue($attribute, $parameter);
333-
}
334-
335-
return str_replace(':values', implode(', ', $parameters), $message);
331+
return $this->replaceIn($message, $attribute, $rule, $parameters);
336332
}
337333

338334
/**
@@ -346,11 +342,7 @@ protected function replaceInArrayKeys($message, $attribute, $rule, $parameters)
346342
*/
347343
protected function replaceRequiredArrayKeys($message, $attribute, $rule, $parameters)
348344
{
349-
foreach ($parameters as &$parameter) {
350-
$parameter = $this->getDisplayableValue($attribute, $parameter);
351-
}
352-
353-
return str_replace(':values', implode(', ', $parameters), $message);
345+
return $this->replaceIn($message, $attribute, $rule, $parameters);
354346
}
355347

356348
/**
@@ -847,11 +839,7 @@ protected function replaceDimensions($message, $attribute, $rule, $parameters)
847839
*/
848840
protected function replaceEndsWith($message, $attribute, $rule, $parameters)
849841
{
850-
foreach ($parameters as &$parameter) {
851-
$parameter = $this->getDisplayableValue($attribute, $parameter);
852-
}
853-
854-
return str_replace(':values', implode(', ', $parameters), $message);
842+
return $this->replaceIn($message, $attribute, $rule, $parameters);
855843
}
856844

857845
/**
@@ -865,11 +853,7 @@ protected function replaceEndsWith($message, $attribute, $rule, $parameters)
865853
*/
866854
protected function replaceDoesntEndWith($message, $attribute, $rule, $parameters)
867855
{
868-
foreach ($parameters as &$parameter) {
869-
$parameter = $this->getDisplayableValue($attribute, $parameter);
870-
}
871-
872-
return str_replace(':values', implode(', ', $parameters), $message);
856+
return $this->replaceIn($message, $attribute, $rule, $parameters);
873857
}
874858

875859
/**
@@ -883,11 +867,7 @@ protected function replaceDoesntEndWith($message, $attribute, $rule, $parameters
883867
*/
884868
protected function replaceStartsWith($message, $attribute, $rule, $parameters)
885869
{
886-
foreach ($parameters as &$parameter) {
887-
$parameter = $this->getDisplayableValue($attribute, $parameter);
888-
}
889-
890-
return str_replace(':values', implode(', ', $parameters), $message);
870+
return $this->replaceIn($message, $attribute, $rule, $parameters);
891871
}
892872

893873
/**
@@ -901,11 +881,7 @@ protected function replaceStartsWith($message, $attribute, $rule, $parameters)
901881
*/
902882
protected function replaceDoesntStartWith($message, $attribute, $rule, $parameters)
903883
{
904-
foreach ($parameters as &$parameter) {
905-
$parameter = $this->getDisplayableValue($attribute, $parameter);
906-
}
907-
908-
return str_replace(':values', implode(', ', $parameters), $message);
884+
return $this->replaceIn($message, $attribute, $rule, $parameters);
909885
}
910886

911887
/**
@@ -919,10 +895,6 @@ protected function replaceDoesntStartWith($message, $attribute, $rule, $paramete
919895
*/
920896
protected function replaceDoesntContain($message, $attribute, $rule, $parameters)
921897
{
922-
foreach ($parameters as &$parameter) {
923-
$parameter = $this->getDisplayableValue($attribute, $parameter);
924-
}
925-
926-
return str_replace(':values', implode(', ', $parameters), $message);
898+
return $this->replaceIn($message, $attribute, $rule, $parameters);
927899
}
928900
}

0 commit comments

Comments
 (0)