Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 837f7a8

Browse filesBrowse files
committed
minor #53756 [DoctrineBridge] fix syntax errors on PHP 7 (xabbuh)
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
2 parents ff5dc26 + 42d6424 commit 837f7a8
Copy full SHA for 837f7a8

File tree

3 files changed

+18
-3
lines changed
Filter options

3 files changed

+18
-3
lines changed

‎src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,12 @@ private static function getRealClass(string $class): string
200200
return substr($class, $pos + Proxy::MARKER_LENGTH + 2);
201201
}
202202

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)
204209
{
205210
if ($mapping instanceof JoinColumnMapping) {
206211
return $mapping->$key;

‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,12 @@ private function getPhpType(string $doctrineType): ?string
306306
return null;
307307
}
308308

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)
310315
{
311316
if ($mapping instanceof AssociationMapping || $mapping instanceof EmbeddedClassMapping || $mapping instanceof FieldMapping || $mapping instanceof JoinColumnMapping) {
312317
return $mapping->$key;

‎src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
+6-1Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,12 @@ private function getExistingUniqueFields(ClassMetadata $metadata): array
140140
return $fields;
141141
}
142142

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)
144149
{
145150
if ($mapping instanceof FieldMapping) {
146151
return $mapping->$key;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.