Merge commit 'dcf42b9' into 1.3.x

Author: ondrejmirtes

src/Type/Doctrine/Descriptors/ReflectionDescriptor.php

@@ -2,9 +2,11 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors;
 
-use PHPStan\Broker\Broker;
+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;
 
@@ -14,16 +16,16 @@ class ReflectionDescriptor implements DoctrineTypeDescriptor
 	/** @var class-string<\Doctrine\DBAL\Types\Type> */
 	private $type;
 
-	/** @var Broker */
-	private $broker;
+	/** @var ReflectionProvider */
+	private $reflectionProvider;
 
 	/**
 	 * @param class-string<\Doctrine\DBAL\Types\Type> $type
 	 */
-	public function __construct(string $type, Broker $broker)
+	public function __construct(string $type, ReflectionProvider $reflectionProvider)
 	{
 		$this->type = $type;
-		$this->broker = $broker;
+		$this->reflectionProvider = $reflectionProvider;
 	}
 
 	public function getType(): string
@@ -33,14 +35,22 @@ public function getType(): string
 
 	public function getWritableToPropertyType(): Type
 	{
-		$type = ParametersAcceptorSelector::selectSingle($this->broker->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->broker->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);
 	}