From 674c9d44b5d2e385eaa5061615aa8a0ffac6e1fd Mon Sep 17 00:00:00 2001
From: Ondrej Mirtes <ondrej@mirtes.cz>
Date: Tue, 24 Sep 2024 18:00:11 +0200
Subject: [PATCH] Fixes after PHPStan update

---
 src/Type/Doctrine/Descriptors/SimpleArrayType.php             | 3 ++-
 src/Type/Doctrine/HydrationModeReturnTypeResolver.php         | 4 ++--
 tests/Platform/data/config.neon                               | 3 ---
 .../Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php | 4 +---
 tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php       | 2 +-
 tests/Type/Doctrine/data/QueryResult/config.neon              | 2 --
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/Type/Doctrine/Descriptors/SimpleArrayType.php b/src/Type/Doctrine/Descriptors/SimpleArrayType.php
index 8044caca..2154eb91 100644
--- a/src/Type/Doctrine/Descriptors/SimpleArrayType.php
+++ b/src/Type/Doctrine/Descriptors/SimpleArrayType.php
@@ -8,6 +8,7 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 
 class SimpleArrayType implements DoctrineTypeDescriptor
 {
@@ -19,7 +20,7 @@ public function getType(): string
 
 	public function getWritableToPropertyType(): Type
 	{
-		return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new StringType()));
+		return TypeCombinator::intersect(new ArrayType(new IntegerType(), new StringType()), new AccessoryArrayListType());
 	}
 
 	public function getWritableToDatabaseType(): Type
diff --git a/src/Type/Doctrine/HydrationModeReturnTypeResolver.php b/src/Type/Doctrine/HydrationModeReturnTypeResolver.php
index c0522e7f..e978ae2f 100644
--- a/src/Type/Doctrine/HydrationModeReturnTypeResolver.php
+++ b/src/Type/Doctrine/HydrationModeReturnTypeResolver.php
@@ -77,10 +77,10 @@ public function getMethodReturnTypeForHydrationMode(
 				);
 			default:
 				if ($queryKeyType->isNull()->yes()) {
-					return AccessoryArrayListType::intersectWith(new ArrayType(
+					return TypeCombinator::intersect(new ArrayType(
 						new IntegerType(),
 						$queryResultType,
-					));
+					), new AccessoryArrayListType());
 				}
 				return new ArrayType(
 					$queryKeyType,
diff --git a/tests/Platform/data/config.neon b/tests/Platform/data/config.neon
index 38f26ed7..e6dd2808 100644
--- a/tests/Platform/data/config.neon
+++ b/tests/Platform/data/config.neon
@@ -1,5 +1,2 @@
 includes:
 	- ../../../extension.neon
-parameters:
-	featureToggles:
-		listType: true
diff --git a/tests/Type/Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php b/tests/Type/Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php
index 52e08911..307a867d 100644
--- a/tests/Type/Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php
+++ b/tests/Type/Doctrine/Query/QueryResultTypeWalkerHydrationModeTest.php
@@ -116,8 +116,6 @@ public function test(Type $expectedType, string $dql, string $methodName, ?int $
 	 */
 	public static function getTestData(): iterable
 	{
-		AccessoryArrayListType::setListTypeEnabled(true);
-
 		yield 'getResult(object), full entity' => [
 			self::list(new ObjectType(Simple::class)),
 			'
@@ -305,7 +303,7 @@ private static function constantArray(array $elements): Type
 
 	private static function list(Type $values): Type
 	{
-		return AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), $values));
+		return TypeCombinator::intersect(new ArrayType(new IntegerType(), $values), new AccessoryArrayListType());
 	}
 
 	private static function numericString(): Type
diff --git a/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php b/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
index 33fa5bbd..427212a4 100644
--- a/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
+++ b/tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php
@@ -1497,7 +1497,7 @@ private function yieldConditionalDataset(): iterable
 					$this->constantArray([
 						[new ConstantStringType('stringEnumColumn'), new ObjectType(StringEnum::class)],
 						[new ConstantStringType('intEnumColumn'), new ObjectType(IntEnum::class)],
-						[new ConstantStringType('stringEnumListColumn'), AccessoryArrayListType::intersectWith(new ArrayType(new IntegerType(), new ObjectType(StringEnum::class)))],
+						[new ConstantStringType('stringEnumListColumn'), TypeCombinator::intersect(new ArrayType(new IntegerType(), new ObjectType(StringEnum::class)), new AccessoryArrayListType())],
 					]),
 					'
 						SELECT		e.stringEnumColumn, e.intEnumColumn, e.stringEnumListColumn
diff --git a/tests/Type/Doctrine/data/QueryResult/config.neon b/tests/Type/Doctrine/data/QueryResult/config.neon
index 5ce3210a..147e4f94 100644
--- a/tests/Type/Doctrine/data/QueryResult/config.neon
+++ b/tests/Type/Doctrine/data/QueryResult/config.neon
@@ -3,5 +3,3 @@ includes:
 parameters:
 	doctrine:
 		objectManagerLoader: entity-manager.php
-	featureToggles:
-		listType: true