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

[11.x] feat: narrow types for throw_if and throw_unless #53005

Merged
merged 1 commit into from
Oct 1, 2024
Merged
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
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 TValue
* @return ($condition is true ? 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 TValue
* @return ($condition is true ? TValue : never)
*
* @throws TException
*/
Expand Down
22 changes: 20 additions & 2 deletions types/Support/Helpers.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,27 @@
}));
assertType('Illuminate\Support\HigherOrderTapProxy', tap(new User()));

assertType('bool', throw_if(true, Exception::class));
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('bool', throw_unless(true, Exception::class));
function testThrowUnless(float|int $foo): void
{
assertType('bool', throw_unless(true, Exception::class));
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('int', transform('filled', fn () => 1, true));
assertType('int', transform(['filled'], fn () => 1));
Expand Down