Make phpdoc types correct #8547
Conversation
| * @psalm-param array{entityListeners: array<class-string, array<string, array{string}>>} $array | ||
| * @psalm-return array{entityListeners: array<class-string, array<string, array{string}>>} | ||
| * @psalm-param array<string, mixed> $array | ||
| * @psalm-return array<string, mixed>&array{entityListeners: array<class-string, array<string, array{string}>>} |
There was a problem hiding this comment.
This is the best way I have found to say that I'm not super sure about the shape of the array except that it will have an entityListeners key with that form. Can and should be improved in subsequent PRs with more details.
There was a problem hiding this comment.
That's a perfectly valid syntax :)
|
@benjamintoussaint @stlrnz @orklah @simonberger please give this a review 🙏 |
| @@ -428,7 +428,7 @@ private function getAssociationValue(ResultSetMapping $rsm, $assocAlias, $entity | |||
| * @param mixed $value | |||
| * @param array<mixed> $path | |||
| * | |||
| * @return array<object>|object|null | |||
There was a problem hiding this comment.
Why do you widen the type here? Was this wrong?
There was a problem hiding this comment.
Yes, or at least the recursivity line 456 makes it hard to understand for psalm.
At level 6, you get ERROR: InvalidReturnStatement - lib/Doctrine/ORM/Cache/DefaultQueryCache.php:459:16 - The inferred type 'list<array<array-key, object>|null|object>' does not match the declared return type 'array<array- key, object>|null|object' for Doctrine\ORM\Cache\DefaultQueryCache::getAssociationPathValue (see http s://psalm.dev/128).
| @@ -59,7 +59,7 @@ class FileLockRegion implements ConcurrentRegion | |||
| /** @var string */ | |||
| private $directory; | |||
|
|
|||
| /** @var int */ | |||
| /** @var string */ | |||
There was a problem hiding this comment.
Maybe you're looking for the type numeric-string?
| @@ -132,7 +132,7 @@ public function count() | |||
| /** | |||
| * {@inheritdoc} | |||
| * | |||
| * @return ArrayIterator<mixed, T> | |||
| * @return ArrayIterator<int|string, T> | |||
There was a problem hiding this comment.
maybe array-key would be more adapted here?
greg0ire
force-pushed
the
psalm-lv6-phpdoc
branch
from
d6f926d
to
bc3592b
Compare
Fixes #8503