Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/Illuminate/Foundation/Http/Middleware/TrimStrings.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected function transform($key, $value)
return $value;
}

return is_string($value) ? preg_replace('~^\s+|\s+$~iu', '', $value) : $value;
return is_string($value) ? preg_replace('~^[\s]+|[\s]+$~iu', '', $value) : $value;
}

/**
Expand Down
3 changes: 3 additions & 0 deletions tests/Foundation/Http/Middleware/TrimStringsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ public function testTrimStringsNBSP()
$middleware = new TrimStrings;
$symfonyRequest = new SymfonyRequest([
// Here has some NBSP, but it still display to space.
// Please note, do not edit in browser
'abc' => '  123   ',
'zwnbsp' => ' ha ',
'xyz' => 'だ',
'foo' => 'ム',
'bar' => '  だ   ',
Expand All @@ -45,6 +47,7 @@ public function testTrimStringsNBSP()

$middleware->handle($request, function (Request $request) {
$this->assertSame('123', $request->get('abc'));
$this->assertSame('ha', $request->get('zwnbsp'));
$this->assertSame('だ', $request->get('xyz'));
$this->assertSame('ム', $request->get('foo'));
$this->assertSame('だ', $request->get('bar'));
Expand Down