{"WIP"=>"Add to support List shapes"} #2202
Conversation
|
continue work in a few days |
|
This pull request has been marked as ready for review. |
phpstan-bot
changed the title
There was a problem hiding this comment.
I'd choose a different implementation path.
- Reset everything in src/, leave just the tests.
- In TypeNodeResolver, intersect
$builder->getArray()withAccessoryArrayListTypeif kind is list. - In
IntersectionType::describeItselfthere's a section that makes sure thatarray<...>&listis described aslist<...>. Please write similar logic there so thatarray{...}&listis described aslist{...}.
Thank you.
src/PhpDoc/TypeNodeResolver.php
Outdated
| $arrayType = $builder->getArray(); | ||
| if ($typeNode->kind === ArrayShapeNode::KIND_LIST) { | ||
| $arrayType = AccessoryArrayListType::intersectWith($arrayType); | ||
| var_dump($arrayType); |
There was a problem hiding this comment.
array{0: 'a', 1: 'b'}&list is normalized to array{0: 'a', 1: 'b'}.
AccessoryArrayListType::intersectWith($arrayType) always returns the operand $arrayType: ConstantArrayType instead of IntersectionType because the following equality always holds.
(new AccessoryArrayListType)->isSuperTypeOf($arrayType)->yes() === true
There was a problem hiding this comment.
@ondrejmirtes AccessoryArrayListType::intersectWith($arrayType) never returns IntersectionType so changing IntersectionType::describeItself() doesn't seem to accomplish what you want, any ideas?
There was a problem hiding this comment.
array{0: 'a', 1: 'b'} is always a list so that's why the &list part is omitted and that's why it's not an intersection type. So we probably don't need to worry about this at all. The point of list{...} should be to reject types like list{foo: 1}.
src/Type/IntersectionType.php
Outdated
| } | ||
| $describedTypes[$i] = 'list{' . substr($typeDescription, strlen('array{')); | ||
| continue; | ||
| } |
There was a problem hiding this comment.
- In
IntersectionType::describeItselfthere's a section that makes sure thatarray<...>&listis described aslist<...>. Please write similar logic there so thatarray{...}&listis described aslist{...}.
array{0: 'a', 1: 'b'}is always a list so that's why the&listpart is omitted and that's why it's not an intersection type. So we probably don't need to worry about this at all. The point oflist{...}should be to reject types likelist{foo: 1}.
As you say array{0: 'a', 1: 'b'}&list is always ConstantArrayType not IntersectionType. Changing IntersectionType::describeItself() for print list{} seems to have no effect.
Reset everything in src/, leave just the tests.
Maybe I need to reapply the reverted fa7bcee09da8565bfe9f5a557c2894922f74faf1 and change ConstantArrayType.
There was a problem hiding this comment.
Do not overthink this :) It's fine to describe list{1} in PHPDoc as array{1} with dumpType.
There was a problem hiding this comment.
I think you can delete this change without anything failing.
src/Type/IntersectionType.php
Outdated
| } | ||
| $describedTypes[$i] = 'list{' . substr($typeDescription, strlen('array{')); | ||
| continue; | ||
| } |
There was a problem hiding this comment.
I think you can delete this change without anything failing.
|
Rebasing to see if the Rector failures are fixed. |
|
Thank you. |
refs phpstan/phpstan#8789, phpstan/phpdoc-parser#175
no tests yet