Fix support for PHP8 union types

Author: nicolas-grekas

Compiler/CheckTypeDeclarationsPass.php

@@ -153,9 +153,26 @@ private function checkTypeDeclarations(Definition $checkedDefinition, \Reflectio
     /**
      * @throws InvalidParameterTypeException When a parameter is not compatible with the declared type
      */
-    private function checkType(Definition $checkedDefinition, $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix): void
+    private function checkType(Definition $checkedDefinition, $value, \ReflectionParameter $parameter, ?string $envPlaceholderUniquePrefix, string $type = null): void
     {
-        $type = $parameter->getType()->getName();
+        if (null === $type) {
+            $type = $parameter->getType();
+
+            if ($type instanceof \ReflectionUnionType) {
+                foreach ($type->getTypes() as $type) {
+                    try {
+                        $this->checkType($checkedDefinition, $value, $parameter, $envPlaceholderUniquePrefix, $type);
+
+                        return;
+                    } catch (InvalidParameterTypeException $e) {
+                    }
+                }
+
+                throw new InvalidParameterTypeException($this->currentId, $e->getCode(), $parameter);
+            }
+
+            $type = $type->getName();
+        }
 
         if ($value instanceof Reference) {
             if (!$this->container->has($value = (string) $value)) {
@@ -266,7 +283,7 @@ private function checkType(Definition $checkedDefinition, $value, \ReflectionPar
             return;
         }
 
-        $checkFunction = sprintf('is_%s', $parameter->getType()->getName());
+        $checkFunction = sprintf('is_%s', $type);
 
         if (!$parameter->getType()->isBuiltin() || !$checkFunction($value)) {
             throw new InvalidParameterTypeException($this->currentId, \is_object($value) ? $class : \gettype($value), $parameter);

Dumper/Preloader.php

@@ -48,7 +48,7 @@ public static function preload(array $classes)
         }
     }
 
-    private static function doPreload(string $class, array &$preloaded)
+    private static function doPreload(string $class, array &$preloaded): void
     {
         if (isset($preloaded[$class]) || \in_array($class, ['self', 'static', 'parent'], true)) {
             return;
@@ -68,9 +68,7 @@ private static function doPreload(string $class, array &$preloaded)
 
             if (\PHP_VERSION_ID >= 70400) {
                 foreach ($r->getProperties(\ReflectionProperty::IS_PUBLIC) as $p) {
-                    if (($t = $p->getType()) && !$t->isBuiltin()) {
-                        self::doPreload($t->getName(), $preloaded);
-                    }
+                    self::preloadType($p->getType(), $preloaded);
                 }
             }
 
@@ -84,17 +82,26 @@ private static function doPreload(string $class, array &$preloaded)
                         }
                     }
 
-                    if (($t = $p->getType()) && !$t->isBuiltin()) {
-                        self::doPreload($t->getName(), $preloaded);
-                    }
+                    self::preloadType($p->getType(), $preloaded);
                 }
 
-                if (($t = $m->getReturnType()) && !$t->isBuiltin()) {
-                    self::doPreload($t->getName(), $preloaded);
-                }
+                self::preloadType($p->getReturnType(), $preloaded);
             }
         } catch (\ReflectionException $e) {
             // ignore missing classes
         }
     }
+
+    private static function preloadType(?\ReflectionType $t, array &$preloaded): void
+    {
+        if (!$t || $t->isBuiltin()) {
+            return;
+        }
+
+        foreach ($t instanceof \ReflectionUnionType ? $t->getTypes() : [$t] as $t) {
+            if (!$t->isBuiltin()) {
+                self::doPreload($t instanceof \ReflectionNamedType ? $t->getName() : $t, $preloaded);
+            }
+        }
+    }
 }

Exception/InvalidParameterTypeException.php

@@ -21,6 +21,9 @@ class InvalidParameterTypeException extends InvalidArgumentException
 {
     public function __construct(string $serviceId, string $type, \ReflectionParameter $parameter)
     {
-        parent::__construct(sprintf('Invalid definition for service "%s": argument %d of "%s::%s" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $parameter->getDeclaringClass()->getName(), $parameter->getDeclaringFunction()->getName(), $parameter->getType()->getName(), $type));
+        $acceptedType = $parameter->getType();
+        $acceptedType = $acceptedType instanceof \ReflectionNamedType ? $acceptedType->getName() : (string) $acceptedType;
+
+        parent::__construct(sprintf('Invalid definition for service "%s": argument %d of "%s::%s" accepts "%s", "%s" passed.', $serviceId, 1 + $parameter->getPosition(), $parameter->getDeclaringClass()->getName(), $parameter->getDeclaringFunction()->getName(), $acceptedType, $type), $type);
     }
 }