Merge branch '3.4' into 4.2

* 3.4:
  Mentioned the Lock expiringDate and isExpired methods
  Added the $context argument to supports* methods

Author: javiereguiluz

components/lock.rst

@@ -155,6 +155,10 @@ to reset the TTL to its original value::
         // refresh the lock for 600 seconds (next refresh() call will be 30 seconds again)
         $lock->refresh(600);
 
+This component also provides two useful methods related to expiring locks:
+``getExpiringDate()`` (which returns ``null`` or a ``\DateTimeImmutable``
+object) and ``isExpired()`` (which returns a boolean).
+
 Available Stores
 ----------------
 

serializer/custom_encoders.rst

@@ -32,7 +32,7 @@ create your own encoder that uses the
             return Yaml::dump($data);
         }
 
-        public function supportsEncoding($format)
+        public function supportsEncoding($format, array $context = [])
         {
             return 'yaml' === $format;
         }
@@ -42,7 +42,7 @@ create your own encoder that uses the
             return Yaml::parse($data);
         }
 
-        public function supportsDecoding($format)
+        public function supportsDecoding($format, array $context = [])
         {
             return 'yaml' === $format;
         }

serializer/custom_normalizer.rst

@@ -47,7 +47,7 @@ to customize the normalized data. To do that, leverage the ``ObjectNormalizer``:
             return $data;
         }
 
-        public function supportsNormalization($data, $format = null)
+        public function supportsNormalization($data, $format = null, array $context = [])
         {
             return $data instanceof Topic;
         }