Skip to content

[5.4] Update Request::intersect to use array_intersect_key #15758

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

Closed
wants to merge 1 commit into from
Closed

[5.4] Update Request::intersect to use array_intersect_key #15758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Http/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ public function except($keys)
*/
public function intersect($keys)
{
return array_filter($this->only(is_array($keys) ? $keys : func_get_args()));
return array_intersect_key($this->all(), array_flip($keys));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/Http/HttpRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ public function testExceptMethod()

public function testIntersectMethod()
{
$request = Request::create('/', 'GET', ['name' => 'Taylor', 'age' => null]);
$this->assertEquals(['name' => 'Taylor'], $request->intersect('name', 'age', 'email'));
$request = Request::create('/', 'GET', ['a' => 'a', 'b' => '', 'c' => null, 'd' => false, 'e' => 0, 'f' => 'foo']);
$this->assertEquals(['a' => 'a', 'b' => '', 'c' => null, 'd' => false, 'e' => 0], $request->intersect(['a', 'b', 'c', 'd', 'e']));
}

public function testQueryMethod()
Expand Down