From d32e399167502571b0b370305e29347d715f4341 Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Fri, 9 Feb 2024 13:47:21 +0100
Subject: [PATCH] Fix more tests on ORM 3

---
 .../Doctrine/Query/QueryResultTypeWalkerTest.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php b/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
index 6ab3ee8c..5b49bff8 100644
--- a/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
+++ b/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
@@ -239,6 +239,12 @@ public function test(Type $expectedType, string $dql, ?string $expectedException
 	 */
 	public function getTestData(): iterable
 	{
+		$ormVersion = InstalledVersions::getVersion('doctrine/orm');
+		$hasOrm3 = strpos($ormVersion, '3.') === 0;
+
+		$dbalVersion = InstalledVersions::getVersion('doctrine/dbal');
+		$hasDbal4 = strpos($dbalVersion, '4.') === 0;
+
 		yield 'just root entity' => [
 			new ObjectType(One::class),
 			'
@@ -355,7 +361,7 @@ public function getTestData(): iterable
 				]),
 				$this->constantArray([
 					[new ConstantIntegerType(0), new ObjectType(One::class)],
-					[new ConstantStringType('id'), $this->numericString()],
+					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -377,7 +383,7 @@ public function getTestData(): iterable
 				]),
 				$this->constantArray([
 					[new ConstantIntegerType(0), new ObjectType(Many::class)],
-					[new ConstantStringType('id'), $this->numericString()],
+					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -398,7 +404,7 @@ public function getTestData(): iterable
 				]),
 				$this->constantArray([
 					[new ConstantStringType('one'), new ObjectType(One::class)],
-					[new ConstantStringType('id'), $this->numericString()],
+					[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
 					[new ConstantStringType('intColumn'), new IntegerType()],
 				])
 			),
@@ -508,7 +514,7 @@ public function getTestData(): iterable
 		yield 'just root entity and scalars' => [
 			$this->constantArray([
 				[new ConstantIntegerType(0), new ObjectType(One::class)],
-				[new ConstantStringType('id'), $this->numericString()],
+				[new ConstantStringType('id'), $hasDbal4 ? new IntegerType() : $this->numericString()],
 			]),
 			'
 				SELECT		o, o.id
@@ -1177,8 +1183,6 @@ public function getTestData(): iterable
 			',
 		];
 
-		$ormVersion = InstalledVersions::getVersion('doctrine/orm');
-		$hasOrm3 = strpos($ormVersion, '3.0') === 0;
 		if (!$hasOrm3) {
 			yield 'date_add function' => [
 				$this->constantArray([