Support PHP 8 + fix deprecation

Behatch · Oct 30, 2020 · a72d06f · a72d06f
1 parent 78b29a4
commit a72d06f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/HttpCall/HttpCallResultPoolResolver.php b/src/HttpCall/HttpCallResultPoolResolver.php
@@ -3,6 +3,7 @@
 namespace Behatch\HttpCall;
 
 use Behat\Behat\Context\Argument\ArgumentResolver;
+use ReflectionClass;
 
 class HttpCallResultPoolResolver implements ArgumentResolver
 {
@@ -23,11 +24,12 @@ 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];
+                $class = PHP_VERSION_ID < 80000 ? $parameter->getClass() : ($parameter->getType() && !$parameter->getType()->isBuiltin()
+                    ? new ReflectionClass($parameter->getType()->getName())
+                    : null
+                );
+                if (null !== $class && isset($this->dependencies[$class->name])) {
+                    $arguments[$parameter->name] = $this->dependencies[$class->name];
                 }
             }
         }