Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS

Author: fabpot

Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

@@ -318,8 +318,8 @@ public function testLegacyLoadChoicesForValuesLoadsOnlyChoicesIfValueUseIdReader
 
         $this->assertSame(
             [4 => $this->obj3, 7 => $this->obj2],
-            $loader->loadChoicesForValues([4 => '3', 7 => '2']
-        ));
+            $loader->loadChoicesForValues([4 => '3', 7 => '2'])
+        );
     }
 
     public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueUseIdReader()
@@ -354,8 +354,8 @@ public function testLoadChoicesForValuesLoadsOnlyChoicesIfValueUseIdReader()
 
         $this->assertSame(
             [4 => $this->obj3, 7 => $this->obj2],
-            $loader->loadChoicesForValues([4 => '3', 7 => '2'], [$this->idReader, 'getIdValue']
-        ));
+            $loader->loadChoicesForValues([4 => '3', 7 => '2'], [$this->idReader, 'getIdValue'])
+        );
     }
 
     public function testLoadChoicesForValuesLoadsAllIfSingleIntIdAndValueGiven()

Types/AbstractUidType.php

@@ -99,7 +99,7 @@ public function requiresSQLCommentHint(AbstractPlatform $platform): bool
     private function hasNativeGuidType(AbstractPlatform $platform): bool
     {
         // Compatibility with DBAL < 3.4
-        $method = \method_exists($platform, 'getStringTypeDeclarationSQL')
+        $method = method_exists($platform, 'getStringTypeDeclarationSQL')
             ? 'getStringTypeDeclarationSQL'
             : 'getVarcharTypeDeclarationSQL';