Skip to content

Commit e4fb1e1

Browse files
committed
revert to native PHP union types
1 parent 7a86e8e commit e4fb1e1

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

Form/DoctrineOrmTypeGuesser.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,7 @@ private static function getRealClass(string $class): string
192192
return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
193193
}
194194

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
201196
{
202197
if ($mapping instanceof JoinColumnMapping) {
203198
return $mapping->$key;

PropertyInfo/DoctrineExtractor.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,7 @@ private function getPhpType(string $doctrineType): ?string
276276
};
277277
}
278278

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
285280
{
286281
if ($mapping instanceof AssociationMapping || $mapping instanceof EmbeddedClassMapping || $mapping instanceof FieldMapping || $mapping instanceof JoinColumnMapping) {
287282
return $mapping->$key;

Validator/DoctrineLoader.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,7 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array
134134
return $fields;
135135
}
136136

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
143138
{
144139
if ($mapping instanceof FieldMapping) {
145140
return $mapping->$key;

0 commit comments

Comments
 (0)