Merge 4.x into 5.x

sonata-project · Jun 2, 2023 · a57621b · a57621b
2 parents 84126c5 + 15aade1
commit a57621b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -42,6 +42,7 @@
     'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
     'no_useless_else' => true,
     'no_useless_return' => true,
+    'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
     'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],

diff --git a/src/Model/ModelManager.php b/src/Model/ModelManager.php
@@ -460,8 +460,8 @@ private function getFieldName(ClassMetadata $metadata, string $name): string
 
     private function getValueFromType(object $value, Type $type, string $fieldType, AbstractPlatform $platform): string
     {
-        if ($platform->hasDoctrineTypeMappingFor($fieldType) &&
-            'binary' === $platform->getDoctrineTypeMapping($fieldType)
+        if ($platform->hasDoctrineTypeMappingFor($fieldType)
+            && 'binary' === $platform->getDoctrineTypeMapping($fieldType)
         ) {
             return (string) $type->convertToPHPValue($value, $platform);
         }