Merge branch '6.1' into 6.2

* 6.1:
  [Serializer] forward the context from the JsonEncoder to JsonEncode and JsonDecode
  [Notifier] Use local copy of stella-maris/clock when testing
  [FrameworkBundle] Fix passing `serializer.default_context` option to normalizers

Author: nicolas-grekas

Encoder/JsonEncoder.php

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