-
Notifications
You must be signed in to change notification settings - Fork 11.7k
[12.x] Move duplicated logic to separate method to be reusable #57564
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.
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
Merged
taylorotwell
merged 6 commits into
laravel:12.x
from
shaedrich:validator-replace-keep-case
Oct 29, 2025
Merged
[12.x] Move duplicated logic to separate method to be reusable #57564
taylorotwell
merged 6 commits into
laravel:12.x
from
shaedrich:validator-replace-keep-case
Oct 29, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
to be reusable
Contributor
|
Hey, just pointing out, your code introduces using |
Contributor
Author
|
@AndrewMast Thanks for the reminder 👍🏻 Yeah, I thought, I'd make it more robust but maybe, it's too much for one PR and should be done separately 🤔 |
Contributor
Author
|
Technically, this could also be used for
when modifying this: - function replaceKeepCase($message, $mapping)
+ function replaceKeepCase($message, $mapping, $wordSeparators = [])
{
- $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] ?? ' ') : ' '),
+ fn (string $placeholder, ?string $parameter = null) => $parameter !== null && array_key_exists($placeholder, $wordSeparators)
+ ? ucwords($parameter ?? $placeholder, $wordSeparators[$placeholder])
+ : ucfirst($parameter ?? $placeholder),
+ ];
$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)],
[],
);
$replacements = array_reduce(
- array_values($mapping),
+ array_keys($mapping),
- fn (array $carry, string $parameter) => [...$carry, ...array_map(fn (callable $fn) => $fn($parameter), $fn)],
+ fn (array $carry, string $placeholder) => [...$carry, ...array_map(fn (callable $fn) => $fn($placeholder, $mapping[$placeholder]), $fn)],
[],
);
return str_replace($cases, $replacements, $message);
} |
shaedrich
added a commit
to shaedrich/framework
that referenced
this pull request
Oct 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #57556 (comment)
✅ Improves readability by making the methods more compact without the "internal logic" in each of them
✅ Improves maintainability by having a single source of truth/failure
✅ Makes adapting this in new methods quite easy