QueryResultTypeWalker: fix nullability checks over unknown type

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -374,7 +374,7 @@ public function walkFunction($function): string
 					new FloatType()
 				);
 
-				if (TypeCombinator::containsNull($exprType)) {
+				if ($this->canBeNull($exprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -386,7 +386,7 @@ public function walkFunction($function): string
 				$secondExprType = $this->unmarshalType($function->secondArithmetic->dispatch($this));
 
 				$type = IntegerRangeType::fromInterval(0, null);
-				if (TypeCombinator::containsNull($firstExprType) || TypeCombinator::containsNull($secondExprType)) {
+				if ($this->canBeNull($firstExprType) || $this->canBeNull($secondExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -397,7 +397,7 @@ public function walkFunction($function): string
 
 				foreach ($function->concatExpressions as $expr) {
 					$type = $this->unmarshalType($expr->dispatch($this));
-					$hasNull = $hasNull || TypeCombinator::containsNull($type);
+					$hasNull = $hasNull || $this->canBeNull($type);
 				}
 
 				$type = new StringType();
@@ -418,7 +418,7 @@ public function walkFunction($function): string
 				$intervalExprType = $this->unmarshalType($function->intervalExpression->dispatch($this));
 
 				$type = new StringType();
-				if (TypeCombinator::containsNull($dateExprType) || TypeCombinator::containsNull($intervalExprType)) {
+				if ($this->canBeNull($dateExprType) || $this->canBeNull($intervalExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -432,7 +432,7 @@ public function walkFunction($function): string
 					new IntegerType(),
 					new FloatType()
 				);
-				if (TypeCombinator::containsNull($date1ExprType) || TypeCombinator::containsNull($date2ExprType)) {
+				if ($this->canBeNull($date1ExprType) || $this->canBeNull($date2ExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -442,7 +442,7 @@ public function walkFunction($function): string
 				$stringPrimaryType = $this->unmarshalType($function->stringPrimary->dispatch($this));
 
 				$type = IntegerRangeType::fromInterval(0, null);
-				if (TypeCombinator::containsNull($stringPrimaryType)) {
+				if ($this->canBeNull($stringPrimaryType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -453,7 +453,7 @@ public function walkFunction($function): string
 				$secondExprType = $this->unmarshalType($this->walkStringPrimary($function->secondStringPrimary));
 
 				$type = IntegerRangeType::fromInterval(0, null);
-				if (TypeCombinator::containsNull($firstExprType) || TypeCombinator::containsNull($secondExprType)) {
+				if ($this->canBeNull($firstExprType) || $this->canBeNull($secondExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -465,7 +465,7 @@ public function walkFunction($function): string
 				$stringPrimaryType = $this->unmarshalType($function->stringPrimary->dispatch($this));
 
 				$type = new StringType();
-				if (TypeCombinator::containsNull($stringPrimaryType)) {
+				if ($this->canBeNull($stringPrimaryType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -476,7 +476,7 @@ public function walkFunction($function): string
 				$secondExprType = $this->unmarshalType($this->walkSimpleArithmeticExpression($function->secondSimpleArithmeticExpression));
 
 				$type = IntegerRangeType::fromInterval(0, null);
-				if (TypeCombinator::containsNull($firstExprType) || TypeCombinator::containsNull($secondExprType)) {
+				if ($this->canBeNull($firstExprType) || $this->canBeNull($secondExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -491,7 +491,7 @@ public function walkFunction($function): string
 				$exprType = $this->unmarshalType($this->walkSimpleArithmeticExpression($function->simpleArithmeticExpression));
 
 				$type = new FloatType();
-				if (TypeCombinator::containsNull($exprType)) {
+				if ($this->canBeNull($exprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -508,7 +508,7 @@ public function walkFunction($function): string
 				}
 
 				$type = new StringType();
-				if (TypeCombinator::containsNull($stringType) || TypeCombinator::containsNull($firstExprType) || TypeCombinator::containsNull($secondExprType)) {
+				if ($this->canBeNull($stringType) || $this->canBeNull($firstExprType) || $this->canBeNull($secondExprType)) {
 					$type = TypeCombinator::addNull($type);
 				}
 
@@ -639,7 +639,7 @@ public function walkCoalesceExpression($coalesceExpression): string
 			}
 
 			$type = $this->unmarshalType($expression->dispatch($this));
-			$allTypesContainNull = $allTypesContainNull && TypeCombinator::containsNull($type);
+			$allTypesContainNull = $allTypesContainNull && $this->canBeNull($type);
 
 			$expressionTypes[] = $type;
 		}
@@ -1399,6 +1399,11 @@ private function resolveDatabaseInternalType(string $typeName, ?string $enumType
 		return $type;
 	}
 
+	private function canBeNull(Type $type): bool
+	{
+		return !$type->accepts(new NullType(), true)->no();
+	}
+
 	private function toNumericOrNull(Type $type): Type
 	{
 		return TypeTraverser::map($type, static function (Type $type, callable $traverse): Type {

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -7,6 +7,7 @@
 use DateTime;
 use DateTimeImmutable;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\DBAL\Types\Type as DbalType;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Tools\SchemaTool;
@@ -43,6 +44,7 @@
 use QueryResult\EntitiesEnum\IntEnum;
 use QueryResult\EntitiesEnum\StringEnum;
 use Throwable;
+use Type\Doctrine\data\QueryResult\CustomIntType;
 use function array_merge;
 use function array_shift;
 use function assert;
@@ -75,6 +77,10 @@ public static function setUpBeforeClass(): void
 		$em = require __DIR__ . '/../data/QueryResult/entity-manager.php';
 		self::$em = $em;
 
+		if (!DbalType::hasType(CustomIntType::NAME)) {
+			DbalType::addType(CustomIntType::NAME, CustomIntType::class);
+		}
+
 		$schemaTool = new SchemaTool($em);
 		$classes = $em->getMetadataFactory()->getAllMetadata();
 		$schemaTool->createSchema($classes);
@@ -1221,6 +1227,16 @@ public function getTestData(): iterable
 			',
 		];
 
+		yield 'abs function with mixed' => [
+			$this->constantArray([
+				[new ConstantIntegerType(1), TypeCombinator::addNull($this->unumericStringified())],
+			]),
+			'
+				SELECT		ABS(o.mixedColumn)
+				FROM		QueryResult\Entities\One o
+			',
+		];
+
 		yield 'bit_and function' => [
 			$this->constantArray([
 				[new ConstantIntegerType(1), $this->uintStringified()],

tests/Type/Doctrine/data/QueryResult/CustomIntType.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types = 1);
+
+namespace Type\Doctrine\data\QueryResult;
+
+use Doctrine\DBAL\Types\IntegerType;
+
+class CustomIntType extends IntegerType
+{
+
+	public const NAME = 'custom_int';
+
+	public function getName(): string
+	{
+		return self::NAME;
+	}
+
+}

tests/Type/Doctrine/data/QueryResult/Entities/One.php

@@ -74,6 +74,13 @@ class One
 	 */
 	public $embedded;
 
+	/**
+	 * @Column(type="custom_int", nullable=true)
+	 *
+	 * @var mixed
+	 */
+	public $mixedColumn;
+
 	public function __construct()
 	{
 		$this->subOne = new SubOne();