Fix deprecated call in PHP 8

brick · Nov 26, 2020 · 1b17f80 · 1b17f80
1 parent e86eb30
commit 1b17f80
Showing 1 changed file with 37 additions and 3 deletions.
diff --git a/src/ValueResolver/ContainerValueResolver.php b/src/ValueResolver/ContainerValueResolver.php
@@ -56,9 +56,9 @@ public function getParameterValue(\ReflectionParameter $parameter)
         }
 
         // Try to resolve the parameter by type.
-        $class = $parameter->getClass();
-        if ($class) {
-            $className = $class->getName();
+        $type = $parameter->getType();
+
+        foreach ($this->getClassNames($type) as $className) {
             if ($this->container->has($className)) {
                 return $this->container->get($className);
             }
@@ -88,4 +88,38 @@ public function getPropertyValue(\ReflectionProperty $property)
 
         return $this->defaultValueResolver->getPropertyValue($property);
     }
+
+    /**
+     * @return \ReflectionNamedType[]
+     */
+    private function getReflectionNamedTypes(?\ReflectionType $type) : array
+    {
+        if ($type instanceof \ReflectionNamedType) {
+            return [$type];
+        }
+
+        if ($type instanceof \ReflectionUnionType) {
+            return $type->getTypes();
+        }
+
+        return [];
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getClassNames(?\ReflectionType $type) : array
+    {
+        $namedTypes = $this->getReflectionNamedTypes($type);
+
+        $classNames = [];
+
+        foreach ($namedTypes as $namedType) {
+            if (! $namedType->isBuiltin()) {
+                $classNames[] = $namedType->getName();
+            }
+        }
+
+        return $classNames;
+    }
 }