minor #53756 [DoctrineBridge] fix syntax errors on PHP 7 (xabbuh)

xabbuh · xabbuh · commit 837f7a8db070 · 2024-02-04T18:16:53.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DoctrineBridge] fix syntax errors on PHP 7 | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT I missed this when rebasing #53754 on the `5.4` branch Commits ------- 42d6424 fix syntax errors on PHP 7
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -200,7 +200,12 @@ private static function getRealClass(string $class): string
         return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
     }
 
-    private static function getMappingValue(array|JoinColumnMapping $mapping, string $key): mixed
+    /**
+     * @param array|JoinColumnMapping $mapping
+     *
+     * @return mixed
+     */
+    private static function getMappingValue($mapping, string $key)
     {
         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
@@ -306,7 +306,12 @@ private function getPhpType(string $doctrineType): ?string
         return null;
     }
 
-    private static function getMappingValue(array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping, string $key): mixed
+    /**
+     * @param array|AssociationMapping|EmbeddedClassMapping|FieldMapping|JoinColumnMapping $mapping
+     *
+     * @return mixed
+     */
+    private static function getMappingValue($mapping, string $key)
     {
         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
@@ -140,7 +140,12 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array
         return $fields;
     }
 
-    private static function getFieldMappingValue(array|FieldMapping $mapping, string $key): mixed
+    /**
+     * @param array|FieldMapping $mapping
+     *
+     * @return mixed
+     */
+    private static function getFieldMappingValue($mapping, string $key)
     {
         if ($mapping instanceof FieldMapping) {
             return $mapping->$key;

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,12 @@ private static function getRealClass(string $class): string`
`200`	`200`	`return substr($class, $pos + Proxy::MARKER_LENGTH + 2);`
`201`	`201`	`}`
`202`	`202`
`203`		`- private static function getMappingValue(array\|JoinColumnMapping $mapping, string $key): mixed`
	`203`	`+ /**`
	`204`	`+ * @param array\|JoinColumnMapping $mapping`
	`205`	`+ *`
	`206`	`+ * @return mixed`
	`207`	`+ */`
	`208`	`+ private static function getMappingValue($mapping, string $key)`
`204`	`209`	`{`
`205`	`210`	`if ($mapping instanceof JoinColumnMapping) {`
`206`	`211`	`return $mapping->$key;`
Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,12 @@ private function getPhpType(string $doctrineType): ?string`
`306`	`306`	`return null;`
`307`	`307`	`}`
`308`	`308`
`309`		`- private static function getMappingValue(array\|AssociationMapping\|EmbeddedClassMapping\|FieldMapping\|JoinColumnMapping $mapping, string $key): mixed`
	`309`	`+ /**`
	`310`	`+ * @param array\|AssociationMapping\|EmbeddedClassMapping\|FieldMapping\|JoinColumnMapping $mapping`
	`311`	`+ *`
	`312`	`+ * @return mixed`
	`313`	`+ */`
	`314`	`+ private static function getMappingValue($mapping, string $key)`
`310`	`315`	`{`
`311`	`316`	`if ($mapping instanceof AssociationMapping \|\| $mapping instanceof EmbeddedClassMapping \|\| $mapping instanceof FieldMapping \|\| $mapping instanceof JoinColumnMapping) {`
`312`	`317`	`return $mapping->$key;`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,12 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array`
`140`	`140`	`return $fields;`
`141`	`141`	`}`
`142`	`142`
`143`		`- private static function getFieldMappingValue(array\|FieldMapping $mapping, string $key): mixed`
	`143`	`+ /**`
	`144`	`+ * @param array\|FieldMapping $mapping`
	`145`	`+ *`
	`146`	`+ * @return mixed`
	`147`	`+ */`
	`148`	`+ private static function getFieldMappingValue($mapping, string $key)`
`144`	`149`	`{`
`145`	`150`	`if ($mapping instanceof FieldMapping) {`
`146`	`151`	`return $mapping->$key;`