Merge pull request #3 from campings-group/php-8

fix(php): do not call deprecated ReflectionProperty::getClass
campings-group · Sep 6, 2021 · 3de8dd0 · 3de8dd0
2 parents fedd96d + 5e2654a
commit 3de8dd0
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/src/HttpCall/HttpCallResultPoolResolver.php b/src/HttpCall/HttpCallResultPoolResolver.php
@@ -23,14 +23,35 @@ public function resolveArguments(\ReflectionClass $classReflection, array $argum
         if ($constructor !== null) {
             $parameters = $constructor->getParameters();
             foreach ($parameters as $parameter) {
-                if (
-                    null !== $parameter->getClass()
-                    && isset($this->dependencies[$parameter->getClass()->name])
-                ) {
-                    $arguments[$parameter->name] = $this->dependencies[$parameter->getClass()->name];
+                if ($dependency = $this->resolveDependency($parameter)) {
+                    $arguments[$parameter->name] = $dependency;
                 }
             }
         }
         return $arguments;
     }
+
+    private function resolveDependency(\ReflectionParameter $parameter)
+    {
+        if (method_exists($parameter, 'getType')) {
+            if (
+                ($type = $parameter->getType()) &&
+                !$type->isBuiltin() &&
+                ($name = $type->getName()) &&
+                isset($this->dependencies[$name])
+            ) {
+                return $this->dependencies[$name];
+            }
+            return null;
+        }
+
+        if (
+            null !== $parameter->getClass()
+            && isset($this->dependencies[$parameter->getClass()->name])
+        ) {
+            return $this->dependencies[$parameter->getClass()->name];
+        }
+
+        return null;
+    }
 }