QueryResultTypeWalkerTest: fix stringification asserts

Author: janedbal

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -28,7 +28,6 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
-use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
 use QueryResult\Entities\Embedded;
 use QueryResult\Entities\JoinedChild;
@@ -553,9 +552,7 @@ public function getTestData(): iterable
 						new ConstantIntegerType(2),
 						TypeCombinator::union(
 							new ConstantIntegerType(1),
-							new ConstantIntegerType(2),
-							new ConstantStringType('1'),
-							new ConstantStringType('2')
+							new ConstantIntegerType(2)
 						),
 					],
 					[
@@ -1447,15 +1444,15 @@ public function getTestData(): iterable
 
 		yield 'identity function' => [
 			$this->constantArray([
-				[new ConstantIntegerType(1), TypeCombinator::addNull($this->numericStringOrInt())],
-				[new ConstantIntegerType(2), $this->numericStringOrInt()],
-				[new ConstantIntegerType(3), TypeCombinator::addNull($this->numericStringOrInt())],
+				[new ConstantIntegerType(1), TypeCombinator::addNull(new IntegerType())],
+				[new ConstantIntegerType(2), new IntegerType()],
+				[new ConstantIntegerType(3), TypeCombinator::addNull(new IntegerType())],
 				[new ConstantIntegerType(4), TypeCombinator::addNull(new StringType())],
 				[new ConstantIntegerType(5), TypeCombinator::addNull(new StringType())],
-				[new ConstantIntegerType(6), TypeCombinator::addNull($this->numericStringOrInt())],
+				[new ConstantIntegerType(6), TypeCombinator::addNull(new IntegerType())],
 				[new ConstantIntegerType(7), TypeCombinator::addNull(new MixedType())],
-				[new ConstantIntegerType(8), TypeCombinator::addNull($this->numericStringOrInt())],
-				[new ConstantIntegerType(9), TypeCombinator::addNull($this->numericStringOrInt())],
+				[new ConstantIntegerType(8), TypeCombinator::addNull(new IntegerType())],
+				[new ConstantIntegerType(9), TypeCombinator::addNull(new IntegerType())],
 			]),
 			'
 				SELECT		IDENTITY(m.oneNull),
@@ -1474,7 +1471,7 @@ public function getTestData(): iterable
 
 		yield 'select nullable association' => [
 			$this->constantArray([
-				[new ConstantIntegerType(1), TypeCombinator::addNull($this->numericStringOrInt())],
+				[new ConstantIntegerType(1), TypeCombinator::addNull(new IntegerType())],
 			]),
 			'
 				SELECT		DISTINCT(m.oneNull)
@@ -1484,7 +1481,7 @@ public function getTestData(): iterable
 
 		yield 'select non null association' => [
 			$this->constantArray([
-				[new ConstantIntegerType(1), $this->numericStringOrInt()],
+				[new ConstantIntegerType(1), new IntegerType()],
 			]),
 			'
 				SELECT		DISTINCT(m.one)
@@ -1494,7 +1491,7 @@ public function getTestData(): iterable
 
 		yield 'select default nullability association' => [
 			$this->constantArray([
-				[new ConstantIntegerType(1), TypeCombinator::addNull($this->numericStringOrInt())],
+				[new ConstantIntegerType(1), TypeCombinator::addNull(new IntegerType())],
 			]),
 			'
 				SELECT		DISTINCT(m.oneDefaultNullability)
@@ -1504,7 +1501,7 @@ public function getTestData(): iterable
 
 		yield 'select non null association in aggregated query' => [
 			$this->constantArray([
-				[new ConstantIntegerType(1), TypeCombinator::addNull($this->numericStringOrInt())],
+				[new ConstantIntegerType(1), TypeCombinator::addNull(new IntegerType())],
 				[
 					new ConstantIntegerType(2),
 					$this->uint(),
@@ -1572,17 +1569,6 @@ private function constantArray(array $elements): Type
 		return $builder->getArray();
 	}
 
-	private function numericStringOrInt(): Type
-	{
-		return new UnionType([
-			new IntegerType(),
-			new IntersectionType([
-				new StringType(),
-				new AccessoryNumericStringType(),
-			]),
-		]);
-	}
-
 	private function numericString(): Type
 	{
 		return new IntersectionType([