when() accept callable first parameter (#54005)

laravel · Dec 27, 2024 · f0bf46d · f0bf46d
1 parent 91c72ac
commit f0bf46d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Illuminate/Collections/helpers.php b/src/Illuminate/Collections/helpers.php
@@ -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);
         }

diff --git a/tests/Support/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
@@ -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()