ReflectionDescriptor - fix compatibility with conditional return type…

… in VarDateTimeImmutableType
phpstan · Feb 18, 2023 · dcf42b9 · dcf42b9
1 parent 9a56b06
commit dcf42b9
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Type/Doctrine/Descriptors/ReflectionDescriptor.php b/src/Type/Doctrine/Descriptors/ReflectionDescriptor.php
@@ -2,9 +2,11 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\MixedType;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
@@ -33,14 +35,22 @@ public function getType(): string
 
  public function getWritableToPropertyType(): Type
  {
- $type = ParametersAcceptorSelector::selectSingle($this->reflectionProvider->getClass($this->type)->getNativeMethod('convertToPHPValue')->getVariants())->getReturnType();
+ $method = $this->reflectionProvider->getClass($this->type)->getNativeMethod('convertToPHPValue');
+ $type = ParametersAcceptorSelector::selectFromTypes([
+ new MixedType(),
+ new ObjectType(AbstractPlatform::class),
+ ], $method->getVariants(), false)->getReturnType();
 
  return TypeCombinator::removeNull($type);
  }
 
  public function getWritableToDatabaseType(): Type
  {
- $type = ParametersAcceptorSelector::selectSingle($this->reflectionProvider->getClass($this->type)->getNativeMethod('convertToDatabaseValue')->getVariants())->getParameters()[0]->getType();
+ $method = $this->reflectionProvider->getClass($this->type)->getNativeMethod('convertToDatabaseValue');
+ $type = ParametersAcceptorSelector::selectFromTypes([
+ new MixedType(),
+ new ObjectType(AbstractPlatform::class),
+ ], $method->getVariants(), false)->getParameters()[0]->getType();
 
  return TypeCombinator::removeNull($type);
  }