Use Respect\Parameter instead of Reflection

Author: alganet

composer.json

@@ -19,7 +19,8 @@
     },
     "require": {
         "php": ">=8.5",
-        "psr/container": "^2.0"
+        "psr/container": "^2.0",
+        "respect/parameter": "^1.0"
     },
     "require-dev": {
         "mikey179/vfsstream": "^1.6",

src/Autowire.php

@@ -5,9 +5,7 @@
 namespace Respect\Config;
 
 use Psr\Container\ContainerInterface;
-use ReflectionNamedType;
-
-use function array_key_exists;
+use Respect\Parameter\Resolver;
 
 class Autowire extends Instantiator
 {
@@ -24,28 +22,16 @@ protected function cleanupParams(array $params, bool $forConstructor = true): ar
         $constructor = $this->reflection()->getConstructor();
         $container = $this->container;
         if ($forConstructor && $constructor && $container) {
-            foreach ($constructor->getParameters() as $param) {
-                $name = $param->getName();
-                if (array_key_exists($name, $this->params)) {
-                    $value = $params[$name] ?? null;
-                    if ($value instanceof Ref) {
-                        $params[$name] = $container->get($value->id);
-                    } else {
-                        $this->propagateContainer($value);
-                        $params[$name] = $this->lazyLoad($value);
-                    }
+            foreach ($params as $name => $value) {
+                if ($value instanceof Ref) {
+                    $params[$name] = $container->get($value->id);
                 } else {
-                    $type = $param->getType();
-                    if (
-                        $type instanceof ReflectionNamedType && !$type->isBuiltin()
-                        && $container->has($type->getName())
-                    ) {
-                        $params[$name] = $container->get($type->getName());
-                    }
+                    $this->propagateContainer($value);
+                    $params[$name] = $this->lazyLoad($value);
                 }
             }
 
-            return $this->stripTrailingNulls($params);
+            return $this->stripTrailingNulls((new Resolver($container))->resolveNamed($constructor, $params));
         }
 
         return parent::cleanupParams($params);