PHPStan: Fixed handling of union types in ConfigReturnTypeExtension #11312
Conversation
| // for compat with old phpstan versions, we use a deprecated phpstan method. | ||
| $strings = TypeUtils::getConstantStrings($keyType); |
There was a problem hiding this comment.
refactored to use the deprecated TypeUtils::getConstantStrings method, since composer itself does not specify a min-phpstan version requirement.
using the suggested Type->getConstantStrings() variant is available as of PHPStan 1.9.4
clxmstaab
force-pushed
the
phpstan-fix
branch
from
0c74446
to
edab4cc
Compare
| if ($keyType instanceof ConstantStringType) { | ||
| if (isset($this->properties[$keyType->getValue()])) { | ||
| return $this->properties[$keyType->getValue()]; | ||
| // for compat with old phpstan versions, we use a deprecated phpstan method. |
There was a problem hiding this comment.
maybe this should do a version check or a method_exists check to use the new API when available.
| if ($strings !== []) { | ||
| $types = []; | ||
| foreach($strings as $string) { | ||
| if (isset($this->properties[$string->getValue()])) { |
There was a problem hiding this comment.
Any string not being known here should force skipping the more precise type, falling back to the basic method signature
| @@ -64,18 +65,32 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method | |||
| { | |||
| $args = $methodCall->getArgs(); | |||
|
|
|||
| $defaultReturn = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType(); | |||
There was a problem hiding this comment.
in case we would have a min phpstan version of 1.5.0 or higher, the method could just return null and the phpstan-core would take care of determining the default-return type.
There was a problem hiding this comment.
Feel free to assume latest PHPStan and bump the require if you like :)
There was a problem hiding this comment.
this won't work. it depends on the phpstan version used by the project which depends on composer.
the extension is meant for re-use in plugin projects. this means I would either need to declare a non-dev dependency on phpstan or add a conflict. both things I don't like.
There was a problem hiding this comment.
Oh right I forgot that aspect, let's leave as is then 👍🏻
|
Thanks |
see https://phpstan.org/blog/why-is-instanceof-type-wrong-and-getting-deprecated
after this fix the PHPStan extension supports cases like
which it did not before