Merge branch '3.4' into 4.3

* 3.4: [Console] Constant STDOUT might be undefined. Allow returning null from NormalizerInterface::normalize
symfony · Nov 13, 2019 · 983b5d1 · 983b5d1
2 parents 3ae3094 + 32bde39
commit 983b5d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
@@ -98,7 +98,7 @@ private static function initDimensions()
      */
     private static function hasVt100Support(): bool
     {
-        return \function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support(STDOUT);
+        return \function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support(fopen('php://stdout', 'w'));
     }
 
     /**

diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php
@@ -30,9 +30,9 @@ interface NormalizerInterface
      * @param string $format  Format the normalization result will be encoded as
      * @param array  $context Context options for the normalizer
      *
-     * @return array|string|int|float|bool
+     * @return array|string|int|float|bool|null
      *
-     * @throws InvalidArgumentException   Occurs when the object given is not an attempted type for the normalizer
+     * @throws InvalidArgumentException   Occurs when the object given is not a supported type for the normalizer
      * @throws CircularReferenceException Occurs when the normalizer detects a circular reference when no circular
      *                                    reference handler can fix it
      * @throws LogicException             Occurs when the normalizer is not called in an expected context