Skip to content
Open
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 @@ -78,7 +78,7 @@ protected function transform($key, $value)
*/
protected function shouldSkip($key, $except)
{
return in_array($key, $except, true);
return Str::is($except, $key);
}

/**
Expand Down
51 changes: 51 additions & 0 deletions tests/Http/Middleware/TrimStringsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,55 @@ public function test_combination_of_leading_and_trailing_multiple_invisible_char
$this->assertEquals('This title contains a combination of a invisible character at beginning and the end', $req->title);
});
}

public function test_trim_strings_can_ignore_nested_attributes_using_wildcards()
{
$request = new Request;

$request->merge([
'users' => [
['name' => ' foo ', 'role' => ' admin '],
['name' => ' bar ', 'role' => ' editor '],
],
'teams' => [
['name' => ' team '],
],
'orders' => [
[
'items' => [
['meta' => ['title' => ' foo ', 'sku' => ' SKU-1 ', 'tags' => [' alpha ']]],
],
],
[
'items' => [
['meta' => ['title' => ' bar ', 'sku' => ' SKU-2 ', 'tags' => [' beta ']]],
],
],
],
]);

$middleware = new class extends TrimStrings
{
protected $except = [
'users.*.name',
'orders.*.items.*.meta.title',
'orders.*.items.*.meta.tags.*',
];
};

$middleware->handle($request, function ($req) {
$this->assertSame(' foo ', $req->input('users.0.name'));
$this->assertSame(' bar ', $req->input('users.1.name'));
$this->assertSame('admin', $req->input('users.0.role'));
$this->assertSame('editor', $req->input('users.1.role'));
$this->assertSame('team', $req->input('teams.0.name'));
$this->assertSame(' foo ', $req->input('orders.0.items.0.meta.title'));
$this->assertSame('SKU-1', $req->input('orders.0.items.0.meta.sku'));
$this->assertSame(' alpha ', $req->input('orders.0.items.0.meta.tags.0'));

$this->assertSame(' bar ', $req->input('orders.1.items.0.meta.title'));
$this->assertSame('SKU-2', $req->input('orders.1.items.0.meta.sku'));
$this->assertSame(' beta ', $req->input('orders.1.items.0.meta.tags.0'));
});
}
}
Loading