Merge branch '6.4' into 7.0

* 6.4:
  [Console] Fix horizontal table top border is incorrectly rendered
  [Tests] Streamline
  [AssetMapper] Fixing bug where JSCompiler used non-absolute importmap entry path
  [FrameworkBundle] Fix BC break about enable_annotations in validation and serializer configuration
  [Uid] Fix UuidV7 collisions within the same ms
  [Validator] updated Romanian translation

Author: nicolas-grekas

Tests/DependencyInjection/DoctrineExtensionTest.php

@@ -174,7 +174,23 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
         ], $expectedEm2));
     }
 
-    public static function providerBasicDrivers()
+    public function testMappingTypeDetection()
+    {
+        $container = $this->createContainer();
+
+        $reflection = new \ReflectionClass($this->extension);
+        $method = $reflection->getMethod('detectMappingType');
+
+        // The ordinary fixtures contain annotation
+        $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures', $container);
+        $this->assertSame($mappingType, 'attribute');
+
+        // In the attribute folder, attributes are used
+        $mappingType = $method->invoke($this->extension, __DIR__.'/../Fixtures/Attribute', $container);
+        $this->assertSame($mappingType, 'attribute');
+    }
+
+    public static function providerBasicDrivers(): array
     {
         return [
             ['doctrine.orm.cache.apc.class',       ['type' => 'apc']],
@@ -253,7 +269,7 @@ public function testUnrecognizedCacheDriverException()
         $this->invokeLoadCacheDriver($objectManager, $container, $cacheName);
     }
 
-    public static function providerBundles()
+    public static function providerBundles(): iterable
     {
         yield ['AnnotationsBundle', 'attribute', '/Entity'];
         yield ['AnnotationsOneLineBundle', 'attribute', '/Entity'];

Tests/Form/Type/EntityTypeTest.php

@@ -143,7 +143,7 @@ public function testChoiceTranslationDomainIsDisabledByDefault($expanded)
         }
     }
 
-    public static function choiceTranslationDomainProvider()
+    public static function choiceTranslationDomainProvider(): array
     {
         return [
             [false],
@@ -223,8 +223,6 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
             'class' => self::SINGLE_IDENT_CLASS,
             'query_builder' => fn () => new \stdClass(),
         ]);
-
-        $field->submit('2');
     }
 
     public function testConfigureQueryBuilderWithClosureReturningNullUseDefault()

Tests/Validator/Constraints/UniqueEntityValidatorTest.php

@@ -471,7 +471,7 @@ public function testValidateResultTypes($entity1, $result)
         $this->assertNoViolation();
     }
 
-    public static function resultTypesProvider()
+    public static function resultTypesProvider(): array
     {
         $entity = new SingleIntIdEntity(1, 'foo');