Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit 29eeb19a2ce3 · 2020-06-18T19:51:13.000+02:00
* 3.4:
  [3.4] Fix support for PHP8 union types
  [PhpUnitBridge] Streamline ansi/no-ansi of composer according to phpunit --colors option
  [3.4] Small update in our internal terminology
  [Cache] fix compat with DBAL v3
  [VarDumper] Fix CliDumper coloration
  [DI] tighten detection of local dirs to prevent false positives
  [FrameworkBundle] preserve dots in query-string when redirecting
  bumped Symfony version to 3.4.43
  updated VERSION for 3.4.42
  update CONTRIBUTORS for 3.4.42
  updated CHANGELOG for 3.4.42
diff --git a/Normalizer/AbstractNormalizer.php b/Normalizer/AbstractNormalizer.php
@@ -522,7 +522,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
     protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)
     {
         try {
-            if (($parameterType = $parameter->getType()) && !$parameterType->isBuiltin()) {
+            if (($parameterType = $parameter->getType()) instanceof \ReflectionNamedType && !$parameterType->isBuiltin()) {
                 $parameterClass = $parameterType->getName();
                 new \ReflectionClass($parameterClass); // throws a \ReflectionException if the class doesn't exist
 

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,7 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`522`	`522`	`protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, $parameterName, $parameterData, array $context, $format = null)`
`523`	`523`	`{`
`524`	`524`	`try {`
`525`		`- if (($parameterType = $parameter->getType()) && !$parameterType->isBuiltin()) {`
	`525`	`+ if (($parameterType = $parameter->getType()) instanceof \ReflectionNamedType && !$parameterType->isBuiltin()) {`
`526`	`526`	`$parameterClass = $parameterType->getName();`
`527`	`527`	`new \ReflectionClass($parameterClass); // throws a \ReflectionException if the class doesn't exist`
`528`	`528`