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

Encoder/JsonEncoder.php

@@ -23,10 +23,10 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
     protected $encodingImpl;
     protected $decodingImpl;
 
-    public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null)
+    public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null, array $defaultContext = [])
     {
-        $this->encodingImpl = $encodingImpl ?? new JsonEncode();
-        $this->decodingImpl = $decodingImpl ?? new JsonDecode([JsonDecode::ASSOCIATIVE => true]);
+        $this->encodingImpl = $encodingImpl ?? new JsonEncode($defaultContext);
+        $this->decodingImpl = $decodingImpl ?? new JsonDecode(array_merge([JsonDecode::ASSOCIATIVE => true], $defaultContext));
     }
 
     public function encode(mixed $data, string $format, array $context = []): string

Tests/Encoder/JsonEncoderTest.php

@@ -66,6 +66,22 @@ public function testOptions()
         $this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
     }
 
+    public function testWithDefaultContext()
+    {
+        $defaultContext = [
+            'json_encode_options' => \JSON_UNESCAPED_UNICODE,
+            'json_decode_associative' => false,
+        ];
+
+        $encoder = new JsonEncoder(null, null, $defaultContext);
+
+        $data = new \stdClass();
+        $data->msg = '你好';
+
+        $this->assertEquals('{"msg":"你好"}', $json = $encoder->encode($data, 'json'));
+        $this->assertEquals($data, $encoder->decode($json, 'json'));
+    }
+
     public function testEncodeNotUtf8WithoutPartialOnError()
     {
         $this->expectException(UnexpectedValueException::class);