[PropertyInfo] Fix bigint extraction with type info

mtarld · mtarld · commit 4ce5d8e75a0c · 2024-09-24T10:23:30.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -133,7 +133,7 @@ public function getType(string $class, string $property, array $context = []): ?
 
         // DBAL 4 has a special fallback strategy for BINGINT (int -> string)
         if (Types::BIGINT === $typeOfField && !method_exists(BigIntType::class, 'getName')) {
-            return Type::collection(Type::int(), Type::string());
+            return $nullable ? Type::nullable(Type::union(Type::int(), Type::string())) : Type::union(Type::int(), Type::string());
         }
 
         $enumType = null;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -286,7 +286,7 @@ public static function typeProvider(): iterable
     {
         // DBAL 4 has a special fallback strategy for BINGINT (int -> string)
         if (!method_exists(BigIntType::class, 'getName')) {
-            $expectedBigIntType = Type::collection(Type::int(), Type::string());
+            $expectedBigIntType = Type::union(Type::int(), Type::string());
         } else {
             $expectedBigIntType = Type::string();
         }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function getType(string $class, string $property, array $context = []): ?`
`133`	`133`
`134`	`134`	`// DBAL 4 has a special fallback strategy for BINGINT (int -> string)`
`135`	`135`	`if (Types::BIGINT === $typeOfField && !method_exists(BigIntType::class, 'getName')) {`
`136`		`- return Type::collection(Type::int(), Type::string());`
	`136`	`+ return $nullable ? Type::nullable(Type::union(Type::int(), Type::string())) : Type::union(Type::int(), Type::string());`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`$enumType = null;`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public static function typeProvider(): iterable`
`286`	`286`	`{`
`287`	`287`	`// DBAL 4 has a special fallback strategy for BINGINT (int -> string)`
`288`	`288`	`if (!method_exists(BigIntType::class, 'getName')) {`
`289`		`- $expectedBigIntType = Type::collection(Type::int(), Type::string());`
	`289`	`+ $expectedBigIntType = Type::union(Type::int(), Type::string());`
`290`	`290`	`} else {`
`291`	`291`	`$expectedBigIntType = Type::string();`
`292`	`292`	`}`