Skip to content

Commit 7a86e8e

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [Validator] Missing translations for Russian (ru) #53775 fix syntax errors on PHP 7
2 parents cfd456b + 473f59f commit 7a86e8e

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

Form/DoctrineOrmTypeGuesser.php

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

195-
private static function getMappingValue(array|JoinColumnMapping $mapping, string $key): mixed
195+
/**
196+
* @param array|JoinColumnMapping $mapping
197+
*
198+
* @return mixed
199+
*/
200+
private static function getMappingValue($mapping, string $key)
196201
{
197202
if ($mapping instanceof JoinColumnMapping) {
198203
return $mapping->$key;

PropertyInfo/DoctrineExtractor.php

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

279-
private static function getMappingValue(array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping, string $key): mixed
279+
/**
280+
* @param array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping
281+
*
282+
* @return mixed
283+
*/
284+
private static function getMappingValue($mapping, string $key)
280285
{
281286
if ($mapping instanceof AssociationMapping || $mapping instanceof EmbeddedClassMapping || $mapping instanceof FieldMapping || $mapping instanceof JoinColumnMapping) {
282287
return $mapping->$key;

Validator/DoctrineLoader.php

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

137-
private static function getFieldMappingValue(array|FieldMapping $mapping, string $key): mixed
137+
/**
138+
* @param array|FieldMapping $mapping
139+
*
140+
* @return mixed
141+
*/
142+
private static function getFieldMappingValue($mapping, string $key)
138143
{
139144
if ($mapping instanceof FieldMapping) {
140145
return $mapping->$key;

0 commit comments

Comments
 (0)