From 6d4e69cc78e170b84b238338be10a50cef6637b4 Mon Sep 17 00:00:00 2001 From: grohiro Date: Wed, 3 Apr 2024 19:25:51 +0900 Subject: [PATCH 1/2] extract method --- .../Foundation/Http/Middleware/TrimStrings.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php index b82bdbfa8127..4702e476f9f0 100644 --- a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php +++ b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php @@ -62,13 +62,21 @@ protected function transform($key, $value) { $except = array_merge($this->except, static::$neverTrim); - if (in_array($key, $except, true) || ! is_string($value)) { + if ($this->skipTrim($key, $except) || ! is_string($value)) { return $value; } return Str::trim($value); } + /** + * Determine if the given key should be skipped. + */ + protected function skipTrim($key, $except) + { + return in_array($key, $except, true); + } + /** * Indicate that the given attributes should never be trimmed. * From 60a97f74df595e727e8ee20fd5485ae84a2ce295 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 3 Apr 2024 10:14:58 -0500 Subject: [PATCH 2/2] formatting --- src/Illuminate/Foundation/Http/Middleware/TrimStrings.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php index 4702e476f9f0..80be7a476e90 100644 --- a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php +++ b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php @@ -62,7 +62,7 @@ protected function transform($key, $value) { $except = array_merge($this->except, static::$neverTrim); - if ($this->skipTrim($key, $except) || ! is_string($value)) { + if ($this->shouldSkip($key, $except) || ! is_string($value)) { return $value; } @@ -71,8 +71,12 @@ protected function transform($key, $value) /** * Determine if the given key should be skipped. + * + * @param string $key + * @param array $except + * @return bool */ - protected function skipTrim($key, $except) + protected function shouldSkip($key, $except) { return in_array($key, $except, true); }