revert to native PHP union types

xabbuh · xabbuh · commit 7cda7b49150b · 2024-02-05T09:03:21.000+01:00
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -192,12 +192,7 @@ private static function getRealClass(string $class): string
         return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
     }
 
-    /**
-     * @param array|JoinColumnMapping $mapping
-     *
-     * @return mixed
-     */
-    private static function getMappingValue($mapping, string $key)
+    private static function getMappingValue(array|JoinColumnMapping $mapping, string $key): mixed
     {
         if ($mapping instanceof JoinColumnMapping) {
             return $mapping->$key;
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -276,12 +276,7 @@ private function getPhpType(string $doctrineType): ?string
         };
     }
 
-    /**
-     * @param array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping
-     *
-     * @return mixed
-     */
-    private static function getMappingValue($mapping, string $key)
+    private static function getMappingValue(array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping, string $key): mixed
     {
         if ($mapping instanceof AssociationMapping || $mapping instanceof EmbeddedClassMapping || $mapping instanceof FieldMapping || $mapping instanceof JoinColumnMapping) {
             return $mapping->$key;
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -134,12 +134,7 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array
         return $fields;
     }
 
-    /**
-     * @param array|FieldMapping $mapping
-     *
-     * @return mixed
-     */
-    private static function getFieldMappingValue($mapping, string $key)
+    private static function getFieldMappingValue(array|FieldMapping $mapping, string $key): mixed
     {
         if ($mapping instanceof FieldMapping) {
             return $mapping->$key;

Original file line number	Diff line number	Diff line change
`@@ -192,12 +192,7 @@ private static function getRealClass(string $class): string`
`192`	`192`	`return substr($class, $pos + Proxy::MARKER_LENGTH + 2);`
`193`	`193`	`}`
`194`	`194`
`195`		`- /**`
`196`		`- * @param array\|JoinColumnMapping $mapping`
`197`		`- *`
`198`		`- * @return mixed`
`199`		`- */`
`200`		`- private static function getMappingValue($mapping, string $key)`
	`195`	`+ private static function getMappingValue(array\|JoinColumnMapping $mapping, string $key): mixed`
`201`	`196`	`{`
`202`	`197`	`if ($mapping instanceof JoinColumnMapping) {`
`203`	`198`	`return $mapping->$key;`
Original file line number	Diff line number	Diff line change
`@@ -276,12 +276,7 @@ private function getPhpType(string $doctrineType): ?string`
`276`	`276`	`};`
`277`	`277`	`}`
`278`	`278`
`279`		`- /**`
`280`		`- * @param array\|AssociationMapping\|EmbeddedClassMapping\|FieldMapping\|JoinColumnMapping $mapping`
`281`		`- *`
`282`		`- * @return mixed`
`283`		`- */`
`284`		`- private static function getMappingValue($mapping, string $key)`
	`279`	`+ private static function getMappingValue(array\|AssociationMapping\|EmbeddedClassMapping\|FieldMapping\|JoinColumnMapping $mapping, string $key): mixed`
`285`	`280`	`{`
`286`	`281`	`if ($mapping instanceof AssociationMapping \|\| $mapping instanceof EmbeddedClassMapping \|\| $mapping instanceof FieldMapping \|\| $mapping instanceof JoinColumnMapping) {`
`287`	`282`	`return $mapping->$key;`
Original file line number	Diff line number	Diff line change
`@@ -134,12 +134,7 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array`
`134`	`134`	`return $fields;`
`135`	`135`	`}`
`136`	`136`
`137`		`- /**`
`138`		`- * @param array\|FieldMapping $mapping`
`139`		`- *`
`140`		`- * @return mixed`
`141`		`- */`
`142`		`- private static function getFieldMappingValue($mapping, string $key)`
	`137`	`+ private static function getFieldMappingValue(array\|FieldMapping $mapping, string $key): mixed`
`143`	`138`	`{`
`144`	`139`	`if ($mapping instanceof FieldMapping) {`
`145`	`140`	`return $mapping->$key;`