Skip to content

Commit

Permalink
[11.x] feat: refine return type for throw_if and throw_unless to …
Browse files Browse the repository at this point in the history
…reflect actual behavior with "falsey" values (laravel#53154)

* let return type reflect actual behavior with falsey values

* let type assertions reflect actual behavior with falsey values
  • Loading branch information
crishoj authored and timacdonald committed Oct 15, 2024
1 parent bddb5ce commit 5c9dc3b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/Illuminate/Support/helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ function tap($value, $callback = null)
* @param TValue $condition
* @param TException|class-string<TException>|string $exception
* @param mixed ...$parameters
* @return ($condition is true ? never : TValue)
* @return ($condition is non-empty-mixed ? never : TValue)
*
* @throws TException
*/
Expand Down Expand Up @@ -421,7 +421,7 @@ function throw_if($condition, $exception = 'RuntimeException', ...$parameters)
* @param TValue $condition
* @param TException|class-string<TException>|string $exception
* @param mixed ...$parameters
* @return ($condition is true ? TValue : never)
* @return ($condition is non-empty-mixed ? TValue : never)
*
* @throws TException
*/
Expand Down
13 changes: 6 additions & 7 deletions types/Support/Helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@ function testThrowIf(float|int $foo): void
assertType('never', throw_if(true, Exception::class));
assertType('bool', throw_if(false, Exception::class));
assertType('false', throw_if(empty($foo)));
throw_if(is_float($foo));
assertType('int', $foo);
throw_if($foo == false);
assertType('int<min, -1>|int<1, max>', $foo);
assertType('null', throw_if(null, Exception::class));
assertType('string', throw_if('', Exception::class));
assertType('never', throw_if('foo', Exception::class));
}

function testThrowUnless(float|int $foo): void
Expand All @@ -58,9 +57,9 @@ function testThrowUnless(float|int $foo): void
assertType('never', throw_unless(false, Exception::class));
assertType('true', throw_unless(empty($foo)));
throw_unless(is_int($foo));
assertType('int', $foo);
throw_unless($foo == false);
assertType('0', $foo);
assertType('never', throw_unless(null, Exception::class));
assertType('never', throw_unless('', Exception::class));
assertType('string', throw_unless('foo', Exception::class));
}

assertType('int', transform('filled', fn () => 1, true));
Expand Down

0 comments on commit 5c9dc3b

Please sign in to comment.