Skip to content

[11.x] Allow customizing TrimStrings::$except #50901

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

Merged
merged 2 commits into from
Apr 3, 2024
Merged

[11.x] Allow customizing TrimStrings::$except #50901

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d4e69c
extract method
grohiro Apr 3, 2024
60a97f7
formatting
taylorotwell Apr 3, 2024
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
14 changes: 13 additions & 1 deletion src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,25 @@ protected function transform($key, $value)
{
$except = array_merge($this->except, static::$neverTrim);

if (in_array($key, $except, true) || ! is_string($value)) {
if ($this->shouldSkip($key, $except) || ! is_string($value)) {
return $value;
}

return Str::trim($value);
}

/**
* Determine if the given key should be skipped.
*
* @param string $key
* @param array $except
* @return bool
*/
protected function shouldSkip($key, $except)
{
return in_array($key, $except, true);
}

/**
* Indicate that the given attributes should never be trimmed.
*
Expand Down