Merge branch '6.1' into 6.2

* 6.1:
  [DI] fix tests
  [FrameworkBundle] fix merge
  [FrameworkBundle] Filter out trans paths that are covered by a parent folder path
  [Form] fix tests
  [Serializer] Fixed framework.serializer.default_context is not working for JsonEncoder
  [Ldap] Do not run ldap_set_option on failed connection
  Correct compare float data
  Bugfix: add \UnitEnum as a result of get() method
  Fix AbstractFormLoginAuthenticator return types (fixes #47571).
  Run composer with --ignore-platform-req=php+
  [FrameworkBundle] Fix a phpdoc in mailer assertions

Author: nicolas-grekas

Command/TranslationUpdateCommand.php

@@ -389,6 +389,7 @@ private function extractMessages(string $locale, array $transPaths, string $pref
     {
         $extractedCatalogue = new MessageCatalogue($locale);
         $this->extractor->setPrefix($prefix);
+        $transPaths = $this->filterDuplicateTransPaths($transPaths);
         foreach ($transPaths as $path) {
             if (is_dir($path) || is_file($path)) {
                 $this->extractor->extract($path, $extractedCatalogue);
@@ -398,6 +399,27 @@ private function extractMessages(string $locale, array $transPaths, string $pref
         return $extractedCatalogue;
     }
 
+    private function filterDuplicateTransPaths(array $transPaths): array
+    {
+        $transPaths = array_filter(array_map('realpath', $transPaths));
+
+        sort($transPaths);
+
+        $filteredPaths = [];
+
+        foreach ($transPaths as $path) {
+            foreach ($filteredPaths as $filteredPath) {
+                if (str_starts_with($path, $filteredPath.\DIRECTORY_SEPARATOR)) {
+                    continue 2;
+                }
+            }
+
+            $filteredPaths[] = $path;
+        }
+
+        return $filteredPaths;
+    }
+
     private function loadCurrentMessages(string $locale, array $transPaths): MessageCatalogue
     {
         $currentCatalogue = new MessageCatalogue($locale);

Resources/config/serializer.php

@@ -177,6 +177,7 @@
             ->tag('serializer.encoder')
 
         ->set('serializer.encoder.json', JsonEncoder::class)
+            ->args([null, null])
             ->tag('serializer.encoder')
 
         ->set('serializer.encoder.yaml', YamlEncoder::class)

Test/MailerAssertionsTrait.php

@@ -91,7 +91,7 @@ public static function assertEmailAddressContains(RawMessage $email, string $hea
     }
 
     /**
-     * @return MessageEvents[]
+     * @return MessageEvent[]
      */
     public static function getMailerEvents(string $transport = null): array
     {

Tests/Command/TranslationUpdateCommandTest.php

@@ -140,6 +140,46 @@ public function testWriteMessagesForSpecificDomain()
         $this->assertMatchesRegularExpression('/Translation files were successfully updated./', $tester->getDisplay());
     }
 
+    public function testFilterDuplicateTransPaths()
+    {
+        $transPaths = [
+            $this->translationDir.'/a/test/folder/with/a/subfolder',
+            $this->translationDir.'/a/test/folder/',
+            $this->translationDir.'/a/test/folder/with/a/subfolder/and/a/file.txt',
+            $this->translationDir.'/a/different/test/folder',
+        ];
+
+        $expectedPaths = [
+            $this->translationDir.'/a/different/test/folder',
+            $this->translationDir.'/a/test/folder',
+        ];
+
+        foreach ($transPaths as $transPath) {
+            if (realpath($transPath)) {
+                continue;
+            }
+
+            if (preg_match('/\.[a-z]+$/', $transPath)) {
+                if (!realpath(\dirname($transPath))) {
+                    mkdir(\dirname($transPath), 0777, true);
+                }
+
+                touch($transPath);
+            } else {
+                mkdir($transPath, 0777, true);
+            }
+        }
+
+        $command = $this->createMock(TranslationUpdateCommand::class);
+
+        $method = new \ReflectionMethod(TranslationUpdateCommand::class, 'filterDuplicateTransPaths');
+        $method->setAccessible(true);
+
+        $filteredTransPaths = $method->invoke($command, $transPaths);
+
+        $this->assertEquals($expectedPaths, $filteredTransPaths);
+    }
+
     protected function setUp(): void
     {
         $this->fs = new Filesystem();