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.

Sign up for GitHub

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: refine return type for throw_if and throw_unless to reflect actual behavior with "falsey" values #53154

Merged
merged 2 commits into from
Oct 14, 2024
Merged

[11.x] feat: refine return type for throw_if and throw_unless to reflect actual behavior with "falsey" values #53154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f81bf9
let return type reflect actual behavior with falsey values
crishoj Oct 14, 2024
8eb32c3
let type assertions reflect actual behavior with falsey values
crishoj Oct 14, 2024
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
View file
Open in desktop
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
View file
Open in desktop
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