Test custom TypedExpression

Author: janedbal

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -1122,7 +1122,7 @@ public function walkSelectExpression($selectExpression): string
 			if ($expr instanceof TypedExpression) {
 				$type = TypeCombinator::intersect( // e.g. count is typed as int, but we infer int<0, max>
 					$type,
-					$this->resolveDoctrineType(DbalType::lookupName($expr->getReturnType()), null, $this->canBeNull($type))
+					$this->resolveDoctrineType(DbalType::lookupName($expr->getReturnType()), null, TypeCombinator::containsNull($type))
 				);
 			} else {
 				// Expressions default to Doctrine's StringType, whose

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

@@ -45,6 +45,7 @@
 use PHPStan\Type\VerbosityLevel;
 use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\Constraint\IsIdentical;
+use Platform\TypedExpressionBooleanPiFunction;
 use SQLite3;
 use Throwable;
 use function floor;
@@ -2956,9 +2957,40 @@ public static function provideCases(): iterable
 			},
 		];
 
+		yield 'INT_PI()' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT INT_PI() FROM %s t',
+			'mysql' => self::int(),
+			'sqlite' => self::int(),
+			'pdo_pgsql' => self::int(),
+			'pgsql' => self::int(),
+			'mysqlResult' => 3,
+			'sqliteResult' => 3,
+			'pdoPgsqlResult' => 3,
+			'pgsqlResult' => 3,
+			'shouldStringify' => static function (): bool {
+				return false;
+			},
+		];
+
+		yield 'BOOL_PI()' => [
+			'data' => self::dataDefault(),
+			'select' => 'SELECT BOOL_PI() FROM %s t',
+			'mysql' => self::bool(),
+			'sqlite' => self::bool(),
+			'pdo_pgsql' => self::bool(),
+			'pgsql' => self::bool(),
+			'mysqlResult' => true,
+			'sqliteResult' => true,
+			'pdoPgsqlResult' => true,
+			'pgsqlResult' => true,
+			'shouldStringify' => static function (): bool {
+				return false;
+			},
+		];
+
 		// TODO would col_numeric_string differ from col_string results ?
 		// TODO dbal/orm versions
-		// TODO custom TypedExpression
 		// TODO unknown driver to return mixed everywhere
 		// TODO double check all inferred unions
 		// TODO check else branches & default behaviour (other drivers)
@@ -3070,6 +3102,8 @@ private function getQuery(
 		$config->setSecondLevelCacheEnabled(false);
 		$config->setMetadataCache(new ArrayCachePool());
 		$config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), [__DIR__ . '/Entity']));
+		$config->addCustomStringFunction('INT_PI', TypedExpressionIntegerPiFunction::class);
+		$config->addCustomStringFunction('BOOL_PI', TypedExpressionBooleanPiFunction::class);
 		$entityManager = new EntityManager($connection, $config);
 
 		$schemaTool = new SchemaTool($entityManager);

tests/Platform/TypedExpressionBooleanPiFunction.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace Platform;
+
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\TypedExpression;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+use Doctrine\ORM\Query\TokenType;
+
+class TypedExpressionBooleanPiFunction extends FunctionNode implements TypedExpression
+{
+
+	public function getSql(SqlWalker $sqlWalker): string
+	{
+		return 'PI()';
+	}
+
+	public function parse(Parser $parser): void
+	{
+		$parser->match(TokenType::T_IDENTIFIER);
+		$parser->match(TokenType::T_OPEN_PARENTHESIS);
+		$parser->match(TokenType::T_CLOSE_PARENTHESIS);
+	}
+
+	public function getReturnType(): Type
+	{
+		return Type::getType(Types::BOOLEAN);
+	}
+
+}

tests/Platform/TypedExpressionIntegerPiFunction.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Platform;
+
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
+use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\TypedExpression;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+use Doctrine\ORM\Query\TokenType;
+
+class TypedExpressionIntegerPiFunction extends FunctionNode implements TypedExpression
+{
+
+	public function getSql(SqlWalker $sqlWalker): string
+	{
+		return 'PI()';
+	}
+
+	public function parse(Parser $parser): void
+	{
+		$parser->match(TokenType::T_IDENTIFIER);
+		$parser->match(TokenType::T_OPEN_PARENTHESIS);
+		$parser->match(TokenType::T_CLOSE_PARENTHESIS);
+	}
+
+	public function getReturnType(): Type
+	{
+		return Type::getType(Types::INTEGER);
+	}
+
+}