[12.x] Improved type hints for when() helper function.#58696
Merged
taylorotwell merged 2 commits intolaravel:12.xfrom Feb 9, 2026
Merged
Conversation
|
Thanks for submitting a PR! Note that draft PRs are not reviewed. If you would like a review, please mark your pull request as ready for review in the GitHub user interface. Pull requests that are abandoned in draft may be closed due to inactivity. |
shaedrich
reviewed
Feb 8, 2026
Contributor
shaedrich
left a comment
There was a problem hiding this comment.
I could have sworn, these types were already part of the helper—I couldn't have been more wrong apparently 🤯
All the better, that someone took on the task 👍🏻
Co-authored-by: Sebastian Hädrich <11225821+shaedrich@users.noreply.github.com>
shaedrich
reviewed
Feb 8, 2026
Contributor
shaedrich
left a comment
There was a problem hiding this comment.
LGTM 👍🏻
But I can neither approve nor reject your PR, however, Taylor will eventually.
Contributor
|
This change seems to break the typehint for Closures with parameters. Is this intended? The Closure gets the function when($condition, $value, $default = null)
{
$condition = $condition instanceof Closure ? $condition() : $condition;
if ($condition) {
return value($value, $condition);
}
return value($default, $condition);
} function value($value, ...$args)
{
return $value instanceof Closure ? $value(...$args) : $value;
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request adds more detailed type hints to the
when()helper function, allowing PHPStan to better analyze the output. Allowing the usage ofwhen()in higher PHPStan levels (9+) where the output ofwhen()gets provided to another method that requires a specific parameter type.Examples