Rename ParameterResolver interface to Resolver

README.md

@@ -24,13 +24,13 @@ For each parameter the resolver tries, in order:
 A trailing **variadic** parameter receives a matching named argument (if any) followed by every remaining positional argument.
 
 ```php
-use Respect\Parameter\Resolver;
+use Respect\Parameter\ContainerResolver;
 
 function notify(Mailer $mailer, Logger $logger, string $to, string $subject = 'Hi') {
     // ...
 }
 
-$resolver = new Resolver($container);
+$resolver = new ContainerResolver($container);
 $args = $resolver->resolve(new ReflectionFunction('notify'), ['bob@example.com']);
 // [Mailer, Logger, 'bob@example.com', 'Hi']  — ordered, ready to splat
 ```
@@ -54,15 +54,15 @@ $args = $resolver->resolve($constructor, ['username' => 'admin']);
 
 ### Bind to the interface
 
-Type-hint `ParameterResolver` (the `resolve()` contract) rather than the concrete `Resolver` to stay
+Type-hint `Resolver` (the `resolve()` contract) rather than the concrete `ContainerResolver` to stay
 decoupled from the implementation:
 
 ```php
-use Respect\Parameter\ParameterResolver;
+use Respect\Parameter\Resolver;
 
 final class Factory
 {
-    public function __construct(private ParameterResolver $resolver)
+    public function __construct(private Resolver $resolver)
     {
     }
 }
@@ -73,19 +73,19 @@ final class Factory
 Convert any callable form into a `ReflectionFunctionAbstract`:
 
 ```php
-use Respect\Parameter\Resolver;
+use Respect\Parameter\ContainerResolver;
 
-Resolver::reflectCallable(fn() => ...);                  // Closure
-Resolver::reflectCallable([$obj, 'method']);             // Array callable
-Resolver::reflectCallable(new Invocable());              // __invoke object
-Resolver::reflectCallable('strlen');                     // Function name
-Resolver::reflectCallable('DateTime::createFromFormat'); // Static method
+ContainerResolver::reflectCallable(fn() => ...);                  // Closure
+ContainerResolver::reflectCallable([$obj, 'method']);             // Array callable
+ContainerResolver::reflectCallable(new Invocable());              // __invoke object
+ContainerResolver::reflectCallable('strlen');                     // Function name
+ContainerResolver::reflectCallable('DateTime::createFromFormat'); // Static method
 ```
 
 ### Check accepted types
 
 ```php
-Resolver::acceptsType($reflection, LoggerInterface::class); // true/false
+ContainerResolver::acceptsType($reflection, LoggerInterface::class); // true/false
 ```
 
 ## API
@@ -96,7 +96,7 @@ Resolver::acceptsType($reflection, LoggerInterface::class); // true/false
 | `reflectCallable($callable)`            | static   | Any callable to `ReflectionFunctionAbstract`                                                      |
 | `acceptsType($reflection, $type)`       | static   | Check if any parameter accepts a type                                                             |
 
-`Resolver` implements `ParameterResolver`.
+`ContainerResolver` implements `Resolver`.
 
 ## License
 

src/ContainerResolver.php

@@ -0,0 +1,189 @@
+<?php
+
+/*
+ * SPDX-License-Identifier: ISC
+ * SPDX-FileCopyrightText: (c) Respect Project Contributors
+ * SPDX-FileContributor: Alexandre Gomes Gaigalas <alganet@gmail.com>
+ */
+
+declare(strict_types=1);
+
+namespace Respect\Parameter;
+
+use Closure;
+use Psr\Container\ContainerInterface;
+use ReflectionFunction;
+use ReflectionFunctionAbstract;
+use ReflectionMethod;
+use ReflectionNamedType;
+use ReflectionParameter;
+
+use function array_key_exists;
+use function array_values;
+use function assert;
+use function count;
+use function is_a;
+use function is_array;
+use function is_int;
+use function is_object;
+use function is_string;
+use function str_contains;
+
+/**
+ * Resolves the arguments to call a function or constructor with, autowiring any parameter that is
+ * not supplied from a PSR-11 container by type.
+ *
+ * The result is always an ordered list ready to splat (`...$args` / `newInstanceArgs`), with
+ * variadic parameters expanded.
+ */
+final readonly class ContainerResolver implements Resolver
+{
+    public function __construct(private ContainerInterface $container)
+    {
+    }
+
+    /**
+     * Resolve the arguments for a function/constructor.
+     *
+     * Provided arguments may be positional (int-keyed) or named (string-keyed by parameter name).
+     * For each parameter, in order: an explicit named argument wins; then a positional argument
+     * already matching the parameter type; then the container by type; then the next positional
+     * argument; then the parameter default; otherwise null. A trailing variadic parameter receives
+     * a matching named argument (if any) followed by every remaining positional argument.
+     *
+     * @param array<int|string, mixed> $arguments
+     *
+     * @return list<mixed>
+     */
+    public function resolve(ReflectionFunctionAbstract $reflection, array $arguments): array
+    {
+        $parameters = $reflection->getParameters();
+        if ($parameters === []) {
+            return array_values($arguments);
+        }
+
+        $positional = [];
+        $named = [];
+        foreach ($arguments as $key => $value) {
+            if (is_int($key)) {
+                $positional[] = $value;
+            } else {
+                $named[$key] = $value;
+            }
+        }
+
+        $resolved = [];
+        $index = 0;
+        $count = count($positional);
+
+        foreach ($parameters as $param) {
+            $name = $param->getName();
+
+            if ($param->isVariadic()) {
+                if (array_key_exists($name, $named)) {
+                    $resolved[] = $named[$name];
+                }
+
+                while ($index < $count) {
+                    $resolved[] = $positional[$index++];
+                }
+
+                break;
+            }
+
+            if (array_key_exists($name, $named)) {
+                $resolved[] = $named[$name];
+
+                continue;
+            }
+
+            $type = self::typeName($param);
+
+            if ($type !== null && isset($positional[$index]) && $positional[$index] instanceof $type) {
+                $resolved[] = $positional[$index++];
+
+                continue;
+            }
+
+            if ($type !== null && $this->container->has($type)) {
+                $resolved[] = $this->container->get($type);
+
+                continue;
+            }
+
+            if ($index < $count) {
+                $resolved[] = $positional[$index++];
+            } elseif ($param->isDefaultValueAvailable()) {
+                $resolved[] = $param->getDefaultValue();
+            } else {
+                $resolved[] = null;
+            }
+        }
+
+        return $resolved;
+    }
+
+    /**
+     * Resolve arguments, with named arguments taking precedence over the container.
+     *
+     * @deprecated Use {@see resolve()} instead; it now handles named arguments directly.
+     *
+     * @param array<int|string, mixed> $arguments
+     *
+     * @return list<mixed>
+     */
+    public function resolveNamed(ReflectionFunctionAbstract $reflection, array $arguments): array
+    {
+        return $this->resolve($reflection, $arguments);
+    }
+
+    /** Reflect any callable into its ReflectionFunctionAbstract. */
+    public static function reflectCallable(callable $callable): ReflectionFunctionAbstract
+    {
+        if ($callable instanceof Closure) {
+            return new ReflectionFunction($callable);
+        }
+
+        if (is_array($callable)) {
+            /** @var array{object|class-string, string} $callable */ // phpcs:ignore SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
+
+            return new ReflectionMethod(...$callable);
+        }
+
+        if (is_object($callable)) {
+            return new ReflectionMethod($callable, '__invoke');
+        }
+
+        if (is_string($callable) && str_contains($callable, '::')) {
+            return ReflectionMethod::createFromMethodName($callable);
+        }
+
+        assert(is_string($callable));
+
+        return new ReflectionFunction($callable);
+    }
+
+    /** @param class-string $type */
+    public static function acceptsType(ReflectionFunctionAbstract $reflection, string $type): bool
+    {
+        foreach ($reflection->getParameters() as $param) {
+            $typeName = self::typeName($param);
+
+            if ($typeName !== null && is_a($typeName, $type, true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /** @return class-string|null */
+    private static function typeName(ReflectionParameter $param): string|null
+    {
+        $type = $param->getType();
+
+        /** @phpstan-ignore return.type */
+        return $type instanceof ReflectionNamedType && !$type->isBuiltin() ? $type->getName() : null;
+        /* Ignore Reason: !isBuiltin() guarantees class-string */
+    }
+}