Improved support for enum-string types #3807
Merged
Conversation
This file contains 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
zonuexe
commented
Feb 5, 2025
src/PhpDoc/TypeNodeResolver.php
Outdated
| @@ -696,7 +698,7 @@ static function (string $variance): TemplateTypeVariance { | |||
| if (count($genericTypes) === 2) { // iterable<KeyType, ValueType> | |||
| return new IterableType($genericTypes[0], $genericTypes[1]); | |||
| } | |||
| } elseif (in_array($mainTypeName, ['class-string', 'interface-string'], true)) { | |||
| } elseif (in_array($mainTypeName, ['class-string', 'interface-string', 'enum-string'], true)) { | |||
There was a problem hiding this comment.
Instead of adding this elseif clause, another idea is to add another clause.
- } elseif (in_array($mainTypeName, ['class-string', 'interface-string'], true)) {
+ } elseif ($mainTypeName === 'enum-string') {
if (count($genericTypes) === 1) {
$genericType = $genericTypes[0];
- if ($genericType->isObject()->yes() || $genericType instanceof MixedType) {
+ if ($genericType->isEnum()->yes() || $genericType instanceof MixedType) {
return new GenericClassStringType($genericType);
}
}However, Psalm simply equates the three.
There was a problem hiding this comment.
We need to do TypeCombinator::intersect($genericType, new ObjectType(UnitEnum::class)). You can then test it with enum-string<object> and also enum-string<SomeInterface>.
dcb943e to
4901208
Compare
ondrejmirtes
requested changes
Feb 5, 2025
src/PhpDoc/TypeNodeResolver.php
Outdated
| @@ -696,7 +698,7 @@ static function (string $variance): TemplateTypeVariance { | |||
| if (count($genericTypes) === 2) { // iterable<KeyType, ValueType> | |||
| return new IterableType($genericTypes[0], $genericTypes[1]); | |||
| } | |||
| } elseif (in_array($mainTypeName, ['class-string', 'interface-string'], true)) { | |||
| } elseif (in_array($mainTypeName, ['class-string', 'interface-string', 'enum-string'], true)) { | |||
There was a problem hiding this comment.
We need to do TypeCombinator::intersect($genericType, new ObjectType(UnitEnum::class)). You can then test it with enum-string<object> and also enum-string<SomeInterface>.
5eb8099 to
5eaf06a
Compare
|
This pull request has been marked as ready for review. |
ondrejmirtes
reviewed
Feb 5, 2025
ondrejmirtes
reviewed
Feb 5, 2025
|
Thank you! |
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.
resolve phpstan/phpstan#12529
refs #2764