ReflectionDescriptor - remove null

Author: ondrejmirtes

src/Type/Doctrine/Descriptors/ReflectionDescriptor.php

@@ -5,6 +5,7 @@
 use PHPStan\Broker\Broker;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 
 class ReflectionDescriptor implements DoctrineTypeDescriptor
 {
@@ -32,12 +33,16 @@ public function getType(): string
 
 	public function getWritableToPropertyType(): Type
 	{
-		return ParametersAcceptorSelector::selectSingle($this->broker->getClass($this->type)->getNativeMethod('convertToPHPValue')->getVariants())->getReturnType();
+		$type = ParametersAcceptorSelector::selectSingle($this->broker->getClass($this->type)->getNativeMethod('convertToPHPValue')->getVariants())->getReturnType();
+
+		return TypeCombinator::removeNull($type);
 	}
 
 	public function getWritableToDatabaseType(): Type
 	{
-		return ParametersAcceptorSelector::selectSingle($this->broker->getClass($this->type)->getNativeMethod('convertToDatabaseValue')->getVariants())->getParameters()[0]->getType();
+		$type = ParametersAcceptorSelector::selectSingle($this->broker->getClass($this->type)->getNativeMethod('convertToDatabaseValue')->getVariants())->getParameters()[0]->getType();
+
+		return TypeCombinator::removeNull($type);
 	}
 
 }

tests/Rules/Doctrine/ORM/data/CustomType.php

@@ -22,15 +22,15 @@ public function getName(): string
 		return self::NAME;
 	}
 
-	public function convertToPHPValue($value, AbstractPlatform $abstractPlatform): DateTimeInterface
+	public function convertToPHPValue($value, AbstractPlatform $abstractPlatform): ?DateTimeInterface
 	{
 		return new DateTimeImmutable();
 	}
 
 	/**
 	 * @param array $value
 	 */
-	public function convertToDatabaseValue($value, AbstractPlatform $abstractPlatform): string
+	public function convertToDatabaseValue($value, AbstractPlatform $abstractPlatform): ?string
 	{
 		return '';
 	}