Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 983b5d1d5ff8 · 2019-11-13T08:29:07.000+01:00
* 3.4:
  [Console] Constant STDOUT might be undefined.
  Allow returning null from NormalizerInterface::normalize
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

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private static function initDimensions()`
`98`	`98`	`*/`
`99`	`99`	`private static function hasVt100Support(): bool`
`100`	`100`	`{`
`101`		`- return \function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support(STDOUT);`
	`101`	`+ return \function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support(fopen('php://stdout', 'w'));`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ interface NormalizerInterface`
`30`	`30`	`* @param string $format Format the normalization result will be encoded as`
`31`	`31`	`* @param array $context Context options for the normalizer`
`32`	`32`	`*`
`33`		`- * @return array\|string\|int\|float\|bool`
	`33`	`+ * @return array\|string\|int\|float\|bool\|null`
`34`	`34`	`*`
`35`		`- * @throws InvalidArgumentException Occurs when the object given is not an attempted type for the normalizer`
	`35`	`+ * @throws InvalidArgumentException Occurs when the object given is not a supported type for the normalizer`
`36`	`36`	`* @throws CircularReferenceException Occurs when the normalizer detects a circular reference when no circular`
`37`	`37`	`* reference handler can fix it`
`38`	`38`	`* @throws LogicException Occurs when the normalizer is not called in an expected context`