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

ParameterBag/EnvPlaceholderParameterBag.php

@@ -26,7 +26,7 @@ class EnvPlaceholderParameterBag extends ParameterBag
 
     private static int $counter = 0;
 
-    public function get(string $name): array|bool|string|int|float|null
+    public function get(string $name): array|bool|string|int|float|\UnitEnum|null
     {
         if (str_starts_with($name, 'env(') && str_ends_with($name, ')') && 'env()' !== $name) {
             $env = substr($name, 4, -1);

Tests/ParameterBag/EnvPlaceholderParameterBagTest.php

@@ -206,4 +206,12 @@ public function testExtraCharsInProcessor()
         $bag->resolve();
         $this->assertStringMatchesFormat('env_%s_key_a_b_c_FOO_%s', $bag->get('env(key:a.b-c:FOO)'));
     }
+
+    public function testGetEnum()
+    {
+        $bag = new EnvPlaceholderParameterBag();
+        $bag->set('ENUM_VAR', StringBackedEnum::Bar);
+        $this->assertInstanceOf(StringBackedEnum::class, $bag->get('ENUM_VAR'));
+        $this->assertEquals(StringBackedEnum::Bar, $bag->get('ENUM_VAR'));
+    }
 }