Filter out null from callback in when method (#1604)

larastan · Jul 16, 2023 · 8b35c10 · 8b35c10
1 parent b39dbed
commit 8b35c10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/stubs/Conditionable.stub b/stubs/Conditionable.stub
@@ -12,7 +12,7 @@ trait Conditionable
      * @template TWhenParameter
      * @template TWhenReturnType
      *
-     * @param  (\Closure($this): TWhenParameter)|TWhenParameter  $value
+     * @param  (\Closure($this): TWhenParameter)|TWhenParameter|null  $value
      * @param  (callable($this, TWhenParameter): TWhenReturnType)|null  $callback
      * @param  (callable($this, TWhenParameter): TWhenReturnType)|null  $default
      * @return (TWhenReturnType is void|null ? $this : TWhenReturnType)

diff --git a/tests/Type/data/conditionable.php b/tests/Type/data/conditionable.php
@@ -25,6 +25,11 @@ class Foo
     return rand();
 }));
 
+// Test to make sure the callback has a non-null value.
+(new Foo())->when(User::first(), function (Foo $foo, $user): void {
+    assertType(User::class, $user);
+});
+
 assertType('ConditionableStubs\Foo', (new Foo())->unless(true, function (Foo $foo) {
     // do nothing
 }));