[9.x] Fix TrimStrings middleware with non-UTF8 characters (#42065)

MrMicky-FR · web-flow · commit 4b233ad89aa3 · 2022-04-21T17:24:35.000-05:00
* Fix TrimStrings middleware with non-UTF8 values

* Whitespace
This will trigger the tests again
diff --git a/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php b/src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
@@ -49,11 +49,11 @@ public function handle($request, Closure $next)
      */
     protected function transform($key, $value)
     {
-        if (in_array($key, $this->except, true)) {
+        if (in_array($key, $this->except, true) || ! is_string($value)) {
             return $value;
         }
 
-        return is_string($value) ? preg_replace('~^[\s﻿]+|[\s﻿]+$~u', '', $value) : $value;
+        return preg_replace('~^[\s﻿]+|[\s﻿]+$~u', '', $value) ?? trim($value);
     }
 
     /**
diff --git a/tests/Foundation/Http/Middleware/TrimStringsTest.php b/tests/Foundation/Http/Middleware/TrimStringsTest.php
@@ -41,6 +41,7 @@ public function testTrimStringsNBSP()
             'foo' => 'ム',
             'bar' => '   だ    ',
             'baz' => '   ム    ',
+            'binary' => " \xE9  ",
         ]);
         $symfonyRequest->server->set('REQUEST_METHOD', 'GET');
         $request = Request::createFromBase($symfonyRequest);
@@ -52,6 +53,7 @@ public function testTrimStringsNBSP()
             $this->assertSame('ム', $request->get('foo'));
             $this->assertSame('だ', $request->get('bar'));
             $this->assertSame('ム', $request->get('baz'));
+            $this->assertSame("\xE9", $request->get('binary'));
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@ public function handle($request, Closure $next)`
`49`	`49`	`*/`
`50`	`50`	`protected function transform($key, $value)`
`51`	`51`	`{`
`52`		`- if (in_array($key, $this->except, true)) {`
	`52`	`+ if (in_array($key, $this->except, true) \|\| ! is_string($value)) {`
`53`	`53`	`return $value;`
`54`	`54`	`}`
`55`	`55`
`56`		`- return is_string($value) ? preg_replace('~^[\s]+\|[\s]+$~u', '', $value) : $value;`
	`56`	`+ return preg_replace('~^[\s]+\|[\s]+$~u', '', $value) ?? trim($value);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`