Fix item-type in list to constant-array conversion with count()#3309
Merged
ondrejmirtes merged 11 commits intophpstan:1.11.xfrom Aug 19, 2024
Merged
Fix item-type in list to constant-array conversion with count()#3309ondrejmirtes merged 11 commits intophpstan:1.11.xfrom
ondrejmirtes merged 11 commits intophpstan:1.11.xfrom
Conversation
1e63d51 to
afe2113
Compare
Collaborator
|
This pull request has been marked as ready for review. |
ondrejmirtes
requested changes
Aug 9, 2024
1133d1a to
7574911
Compare
ondrejmirtes
requested changes
Aug 13, 2024
src/Analyser/TypeSpecifier.php
Outdated
Member
There was a problem hiding this comment.
What about doing intersect with HasOffsetType instead of the for loop?
Contributor
Author
There was a problem hiding this comment.
I tried using HasOffsetValueType but it still requires the loop
- $valueTypesBuilder = ConstantArrayTypeBuilder::createEmpty();
+ $hasOffsetTypes = [];
for ($i = 0; $i < $constantType->getValue(); $i++) {
- $offsetType = new ConstantIntegerType($i);
- $valueTypesBuilder->setOffsetValueType($offsetType, $argType->getOffsetValueType($offsetType));
+ $hasOffsetTypes[] = new HasOffsetValueType(new ConstantIntegerType($i), $argType->getOffsetValueType(new ConstantIntegerType(
$i)));
}
- $valueTypes = $this->create($exprNode->getArgs()[0]->value, $valueTypesBuilder->getArray(), $context, false, $scope, $rootExpr);
+ $valueTypes = $this->create($exprNode->getArgs()[0]->value, TypeCombinator::intersect($argType, ...$hasOffsetTypes), $context, false,
$scope, $rootExpr);and it leads to less precise types, I think (at least less readable)
--- Expected
+++ Actual
@@ @@
-'array{ListCount\A, ListCount\A, ListCount\A}'
+'list<ListCount\A>&hasOffsetValue(0, ListCount\A)&hasOffsetValue(1, ListCount\A)&hasOffsetValue(2, ListCount\A)'
Contributor
Author
There was a problem hiding this comment.
to drop the loop we could maybe use new HasOffsetValueType(IntegerRangeType::fromInterval(0, $constantType->getValue(), $offsetValueType) but this doesn't work because $offsetValueType is different per offset
Collaborator
|
This pull request has been marked as ready for review. |
7574911 to
18d20a8
Compare
Member
|
Conflict :) |
18d20a8 to
95d749e
Compare
Collaborator
|
This pull request has been marked as ready for review. |
staabm
commented
Aug 18, 2024
| if ( | ||
| $isNormalCount->yes() | ||
| && $type->isList()->yes() | ||
| && $sizeType instanceof ConstantIntegerType |
Contributor
Author
There was a problem hiding this comment.
Note to future me: Misses int-range support?
Member
|
Thank you! |
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
3 participants
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.
before this PR we were loosing precision in this process as item-types were kind of generalized before.
I guess the original implementation was done before
Type->getOffsetValueType()was a thing.