Skip to content
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.

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

[12.x] Allow when() helper to accept Closure condition parameter #54005

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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: 2 additions & 0 deletions src/Illuminate/Collections/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ function value($value, ...$args)
*/
function when($condition, $value, $default = null)
{
$condition = $condition instanceof Closure ? $condition() : $condition;

if ($condition) {
return value($value, $condition);
}
Expand Down
2 changes: 2 additions & 0 deletions tests/Support/SupportHelpersTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ public function testWhen()
$this->assertEquals('False', when([], 'True', 'False')); // Empty Array = Falsy
$this->assertTrue(when(true, fn ($value) => $value, fn ($value) => ! $value)); // lazy evaluation
$this->assertTrue(when(false, fn ($value) => $value, fn ($value) => ! $value)); // lazy evaluation
$this->assertEquals('Hello', when(fn () => true, 'Hello')); // lazy evaluation condition
$this->assertEquals('World', when(fn () => false, 'Hello', 'World')); // lazy evaluation condition
}

public function testFilled()
Expand Down
Loading