Skip to content

[12.x] Use ReplacesAttributes::replaceWhileKeepingCase() also for imploded parameters #57576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 13 commits into
base: 12.x
Choose a base branch
from
+51 −62
Draft

[12.x] Use ReplacesAttributes::replaceWhileKeepingCase() also for imploded parameters #57576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f755ac1
use `ReplacesAttributes::replaceKeepCase()` also for imploded parameters
shaedrich Oct 29, 2025
a44d1dd
StyleCI
shaedrich Oct 29, 2025
3072085
Fix static analysis
shaedrich Oct 29, 2025
886713b
Update method name in call
shaedrich Oct 29, 2025
eb8f9f7
Fix argument order in method call
shaedrich Oct 29, 2025
768dac7
Separate ucwords() logic for cases and replacements
shaedrich Oct 29, 2025
24785e7
StyleCI
shaedrich Oct 29, 2025
e594617
Fix
shaedrich Oct 29, 2025
5c75f2d
Type
shaedrich Oct 29, 2025
4b1d736
Allow array replacements
shaedrich Oct 29, 2025
e9fcf5e
StyleCI
shaedrich Oct 29, 2025
94bdfa2
Fix casing
shaedrich Oct 29, 2025
261450b
Fix
shaedrich Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 42 additions & 53 deletions src/Illuminate/Validation/Concerns/ReplacesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,10 @@ protected function replaceMissingUnless($message, $attribute, $rule, $parameters
*/
protected function replaceMissingWith($message, $attribute, $rule, $parameters)
{
return str_replace(
[':values', ':VALUES', ':Values'],
[
implode(' / ', $this->getAttributeList($parameters)),
Str::upper(implode(' / ', $this->getAttributeList($parameters))),
implode(' / ', array_map(Str::ucfirst(...), $this->getAttributeList($parameters))),
],
$message
return $this->replaceWhileKeepingCase(
$message,
['values' => $this->getAttributeList($parameters)],
['values' => ' / '],
);
}

Expand Down Expand Up @@ -295,14 +291,10 @@ protected function replaceIn($message, $attribute, $rule, $parameters)
$parameter = $this->getDisplayableValue($attribute, $parameter);
}

return str_replace(
[':values', ':VALUES', ':Values'],
[
implode(', ', $parameters),
Str::upper(implode(', ', $parameters)),
implode(', ', array_map(Str::ucfirst(...), $parameters)),
],
return $this->replaceWhileKeepingCase(
$message,
['values' => $parameters],
['values' => ', '],
);
}

Expand Down Expand Up @@ -431,14 +423,10 @@ protected function replacePresentUnless($message, $attribute, $rule, $parameters
*/
protected function replacePresentWith($message, $attribute, $rule, $parameters)
{
return str_replace(
[':values', ':VALUES', ':Values'],
[
implode(' / ', $this->getAttributeList($parameters)),
Str::upper(implode(' / ', $this->getAttributeList($parameters))),
implode(' / ', array_map(Str::ucfirst(...), $this->getAttributeList($parameters))),
],
return $this->replaceWhileKeepingCase(
$message,
['values' => $this->getAttributeList($parameters)],
['values' => ' / '],
);
}

Expand Down Expand Up @@ -467,14 +455,10 @@ protected function replacePresentWithAll($message, $attribute, $rule, $parameter
*/
protected function replaceRequiredWith($message, $attribute, $rule, $parameters)
{
return str_replace(
[':values', ':VALUES', ':Values'],
[
implode(' / ', $this->getAttributeList($parameters)),
Str::upper(implode(' / ', $this->getAttributeList($parameters))),
implode(' / ', array_map(Str::ucfirst(...), $this->getAttributeList($parameters))),
],
return $this->replaceWhileKeepingCase(
$message,
['values' => $this->getAttributeList($parameters)],
['values' => ' / '],
);
}

Expand Down Expand Up @@ -657,17 +641,10 @@ protected function replaceRequiredUnless($message, $attribute, $rule, $parameter
$values[] = $this->getDisplayableValue($parameters[0], $value);
}

return str_replace(
[':other', ':OTHER', ':Other', ':values', ':VALUES', ':Values'],
[
$other,
Str::upper($other),
Str::ucfirst($other),
implode(', ', $values),
Str::upper(implode(', ', $values)),
implode(', ', array_map(Str::ucfirst(...), $values)),
],
$message
return $this->replaceWhileKeepingCase(
$message,
['other' => $other, 'values' => $values],
['values' => ', '],
);
}

Expand Down Expand Up @@ -738,14 +715,10 @@ protected function replaceProhibitedUnless($message, $attribute, $rule, $paramet
*/
protected function replaceProhibits($message, $attribute, $rule, $parameters)
{
return str_replace(
[':other', ':OTHER', ':Other'],
[
implode(' / ', $this->getAttributeList($parameters)),
Str::upper(implode(' / ', $this->getAttributeList($parameters))),
implode(' / ', array_map(Str::ucfirst(...), $this->getAttributeList($parameters))),
],
$message
return $this->replaceWhileKeepingCase(
$message,
['other' => $this->getAttributeList($parameters)],
['other' => ' / '],
);
}

Expand Down Expand Up @@ -935,20 +908,36 @@ protected function replaceDoesntContain($message, $attribute, $rule, $parameters
* Replace the given string while maintaining different casing variants.
*
* @param array<string, string> $mapping
* @param array<string, string> $wordSeparators
*/
private function replaceWhileKeepingCase(string $message, array $mapping): string
private function replaceWhileKeepingCase(string $message, array $mapping, array $wordSeparators = []): string
{
$fn = [Str::lower(...), Str::upper(...), Str::ucfirst(...)];
$fn = [
Str::lower(...),
Str::upper(...),
//fn (string $placeholder, ?string $parameter = null) => ucwords($parameter ?? $placeholder, $parameter !== null ? ($wordSeparators[$placeholder] ?? ' ') : ' '),
];

$ucwordsReplacement = fn (string $parameter, string $placeholder) => array_key_exists($placeholder, $wordSeparators)
? ucwords($parameter, $wordSeparators[$placeholder])
: ucfirst($parameter);

$cases = array_reduce(
array_keys($mapping),
fn (array $carry, string $placeholder) => [...$carry, ...array_map(fn (callable $fn) => ':'.$fn($placeholder), $fn)],
fn (array $carry, string $placeholder) => [...$carry, ...array_map(fn (callable $fn) => ':'.$fn($placeholder), [...$fn, ucfirst(...)])],
[],
);

$replacements = array_reduce(
array_values($mapping),
fn (array $carry, string $parameter) => [...$carry, ...array_map(fn (callable $fn) => $fn($parameter), $fn)],
array_keys($mapping),
fn (array $carry, string $placeholder) => [...$carry, ...array_map(function (callable $fn) use ($placeholder, $mapping, $wordSeparators) {
$parameter = $mapping[$placeholder];
if (is_array($parameter) && array_is_list($parameter) && array_key_exists($placeholder, $wordSeparators)) {
$parameter = implode($wordSeparators[$placeholder], $parameter);
}

return $fn($parameter, $placeholder);
}, [...$fn, $ucwordsReplacement])],
[],
);

Expand Down
18 changes: 9 additions & 9 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,12 +816,12 @@ public function testDisplayableValuesAreReplaced()
// in:foo,bar,...
$trans = $this->getIlluminateArrayTranslator();
$trans->addLines(['validation.in' => ':attribute must be included in :values.'], 'en');
$trans->addLines(['validation.values.type.5' => 'Short'], 'en');
$trans->addLines(['validation.values.type.300' => 'Long'], 'en');
$trans->addLines(['validation.values.type.5' => 'short'], 'en');
$trans->addLines(['validation.values.type.300' => 'long'], 'en');
$v = new Validator($trans, ['type' => '4'], ['type' => 'in:5,300']);
$this->assertFalse($v->passes());
$v->messages()->setFormat(':message');
$this->assertSame('type must be included in Short, Long.', $v->messages()->first('type'));
$this->assertSame('type must be included in short, long.', $v->messages()->first('type'));

// date_equals:tomorrow
$trans = $this->getIlluminateArrayTranslator();
Expand All @@ -837,30 +837,30 @@ public function testDisplayableValuesAreReplaced()
$trans->addLines(['validation.in' => ':attribute must be included in :values.'], 'en');
$customValues = [
'type' => [
'5' => 'Short',
'300' => 'Long',
'5' => 'short',
'300' => 'long',
],
];
$v = new Validator($trans, ['type' => '4'], ['type' => 'in:5,300']);
$v->addCustomValues($customValues);
$this->assertFalse($v->passes());
$v->messages()->setFormat(':message');
$this->assertSame('type must be included in Short, Long.', $v->messages()->first('type'));
$this->assertSame('type must be included in short, long.', $v->messages()->first('type'));

// set custom values by setter
$trans = $this->getIlluminateArrayTranslator();
$trans->addLines(['validation.in' => ':attribute must be included in :values.'], 'en');
$customValues = [
'type' => [
'5' => 'Short',
'300' => 'Long',
'5' => 'short',
'300' => 'long',
],
];
$v = new Validator($trans, ['type' => '4'], ['type' => 'in:5,300']);
$v->setValueNames($customValues);
$this->assertFalse($v->passes());
$v->messages()->setFormat(':message');
$this->assertSame('type must be included in Short, Long.', $v->messages()->first('type'));
$this->assertSame('type must be included in short, long.', $v->messages()->first('type'));
}

public function testDisplayableAttributesAreReplacedInCustomReplacers()
Expand Down
Loading