Enhance middleware creation to support container-registered identifiers

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 5.3.1 under development
 
-- no changes in this release.
+- Enh #110: Add support for using middlewares from container-registered identifier (@rustamwin)
 
 ## 5.3.0 August 06, 2025
 

README.md

@@ -20,7 +20,7 @@ request instance, dispatcher executes it and produces a response instance.
 
 ## Requirements
 
-- PHP 8.1 or higher.
+- PHP 8.1 - 8.4.
 
 ## Installation
 
@@ -64,6 +64,7 @@ In the above we have used a callback. Overall the following options are availabl
   `index()` method will be executed.
 - A name of PSR-15 middleware class. The middleware instance will be obtained from container.
 - A name of PSR-15 request handler class. The request handler instance will be obtained from container and executed.
+- An identifier of container definition for PSR-15 middleware. The middleware instance will be obtained from container and executed.
 - A name or instance of invokable class. If the name of invokable class is provided, the instance will be
   obtained from container and executed.
 - A function returning a middleware such as

src/InvalidMiddlewareDefinitionException.php

@@ -64,6 +64,19 @@ public function getSolution(): ?string
         Yiisoft\Session\SessionMiddleware::class
         ```
 
+        PSR request handler class name:
+
+        ```php
+        Yiisoft\Yii\Swagger\Action\SwaggerUi::class
+        ```
+
+        An identifier of container definition for PSR middleware:
+
+        ```php
+        'sessionMiddleware'
+        ```
+        where `sessionMiddleware` is the identifier of container definition for `Yiisoft\Session\SessionMiddleware`.
+
         PSR middleware array definition:
 
         ```php

src/MiddlewareFactory.php

@@ -4,7 +4,6 @@
 
 namespace Yiisoft\Middleware\Dispatcher;
 
-use Closure;
 use Psr\Container\ContainerInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -44,6 +43,7 @@ public function __construct(
      * - A name of PSR-15 middleware class. The middleware instance will be obtained from container and executed.
      * - A name of PSR-15 request handler class. The request handler instance will be obtained from container and executed.
      * - A name of invokable class. The invokable class instance will be obtained from container and executed.
+     * - An identifier of container definition for PSR-15 middleware. The middleware instance will be obtained from container and executed.
      * - A callable with
      *   `function(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface`
      *   signature.
@@ -87,6 +87,14 @@ public function create(array|callable|string $middlewareDefinition): MiddlewareI
             return ArrayDefinition::fromConfig($middlewareDefinition)->resolve($this->container);
         }
 
+        if ($this->isContainerAlias($middlewareDefinition)) {
+            /** @var mixed $resolvedDefinition */
+            $resolvedDefinition = $this->container->get($middlewareDefinition);
+            if ($resolvedDefinition instanceof MiddlewareInterface) {
+                return $resolvedDefinition;
+            }
+        }
+
         throw new InvalidMiddlewareDefinitionException($middlewareDefinition);
     }
 
@@ -158,6 +166,14 @@ private function isArrayDefinition(array|callable|string $definition): bool
         return is_subclass_of((string) ($definition['class'] ?? ''), MiddlewareInterface::class);
     }
 
+    /**
+     * @psalm-assert-if-true string $definition
+     */
+    private function isContainerAlias(array|callable|string $definition): bool
+    {
+        return is_string($definition) && $this->container->has($definition);
+    }
+
     /**
      * @param array{0:class-string, 1:non-empty-string}|callable $callable
      */
@@ -187,7 +203,7 @@ public function __construct(
                 private readonly ?ParametersResolverInterface $parametersResolver
             ) {
                 $this->callback = $callback;
-                $callback = Closure::fromCallable($callback);
+                $callback = $callback(...);
 
                 $callableParameters = (new ReflectionFunction($callback))->getParameters();
                 foreach ($callableParameters as $parameter) {

tests/MiddlewareFactoryTest.php

@@ -35,6 +35,16 @@ public function testCreateFromString(): void
         self::assertInstanceOf(TestMiddleware::class, $middleware);
     }
 
+    public function testCreateFromContainerDefinitionIdentifier(): void
+    {
+        $container = $this->getContainer([
+            'test' => new TestMiddleware(),
+        ]);
+        $middleware = $this->getMiddlewareFactory($container)->create('test');
+
+        self::assertInstanceOf(TestMiddleware::class, $middleware);
+    }
+
     public function testCreateFromInvokable(): void
     {
         $container = $this->getContainer([InvokeableAction::class => new InvokeableAction()]);