Merge branch '5.0' into 5.1

* 5.0:
  Add compatible type-hinting
  Add documentation about data collectors late collect

Author: javiereguiluz

profiler/data_collector.rst

@@ -79,6 +79,12 @@ request::
     :doc:`/testing/profiling`) so it's recommended to return a string which is
     short, lowercase and without white spaces.
 
+The ``collect()`` method is called during the :ref:`kernel.response <component-http-kernel-kernel-response>`
+event. If you need to collect data that is only available later, implement
+:class:`Symfony\\Component\\HttpKernel\\DataCollector\\LateDataCollectorInterface`
+and define the ``lateCollect()`` method, which is invoked just before the profiler
+data serialization (during :ref:`kernel.terminate <component-http-kernel-kernel-terminate>` event).
+
 .. _data_collector_tag:
 
 Enabling Custom Data Collectors

serializer/custom_normalizer.rst

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