Merge branch '2.8' into 3.4

* 2.8: [Serializer] Updates DocBlock to a mixed param type
2018-06-22 10:58:39 +02:00 · 2018-06-22 10:58:39 +02:00 · 0e0cf1467a
commit 0e0cf1467a
parent bdcd0ba569 9f6af974fa
1 changed files with 1 additions and 1 deletions
--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@ -25,7 +25,7 @@ interface NormalizerInterface
    /**
     * Normalizes an object into a set of arrays/scalars.
     *
-     * @param object $object  Object to normalize
+     * @param mixed  $object  Object to normalize
     * @param string $format  Format the normalization result will be encoded as
     * @param array  $context Context options for the normalizer
     *