Added support for PSR-15 middleware resolving

src/Bridge.php

@@ -10,6 +10,7 @@
 use Invoker\ParameterResolver\ResolverChain;
 use Psr\Container\ContainerInterface;
 use Slim\App;
+use Slim\CallableResolver as SlimCallableResolver;
 use Slim\Factory\AppFactory;
 use \Invoker\CallableResolver as InvokerCallableResolver;
 use Slim\Interfaces\CallableResolverInterface;
@@ -27,8 +28,9 @@ public static function create(ContainerInterface $container = null): App
         $container = $container ?: new Container;
 
         $callableResolver = new InvokerCallableResolver($container);
+        $slimCallableResolver = new SlimCallableResolver($container);
 
-        $container->set(CallableResolverInterface::class, new CallableResolver($callableResolver));
+        $container->set(CallableResolverInterface::class, new CallableResolver($callableResolver, $slimCallableResolver));
         $app = AppFactory::createFromContainer($container);
 
         $container->set(App::class, $app);

src/CallableResolver.php

@@ -2,27 +2,49 @@
 
 namespace DI\Bridge\Slim;
 
-use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\AdvancedCallableResolverInterface;
 
 /**
  * Resolve middleware and route callables using PHP-DI.
  */
-class CallableResolver implements CallableResolverInterface
+class CallableResolver implements AdvancedCallableResolverInterface
 {
     /**
      * @var \Invoker\CallableResolver
      */
     private $callableResolver;
+    /**
+     * @var \Slim\CallableResolver
+     */
+    private $slimCallableResolver;
 
-    public function __construct(\Invoker\CallableResolver $callableResolver)
+    public function __construct(\Invoker\CallableResolver $callableResolver, \Slim\CallableResolver $slimCallableResolver)
     {
         $this->callableResolver = $callableResolver;
+        $this->slimCallableResolver = $slimCallableResolver;
     }
+
     /**
      * {@inheritdoc}
      */
     public function resolve($toResolve): callable
     {
         return $this->callableResolver->resolve($toResolve);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveRoute($toResolve): callable
+    {
+        return $this->resolve($toResolve);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function resolveMiddleware($toResolve): callable
+    {
+        return $this->slimCallableResolver->resolveMiddleware($toResolve);
+    }
 }

tests/MiddlewareTest.php

@@ -3,6 +3,7 @@
 namespace DI\Bridge\Slim\Test;
 
 use DI\Bridge\Slim\Bridge;
+use DI\Bridge\Slim\Test\Mock\Psr15Middleware;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ServerRequestInterface;
@@ -26,4 +27,18 @@ public function invokes_closure_middleware()
 
         $this->assertEquals('Hello matt', $response->getBody()->__toString());
     }
+
+    /**
+     * @test
+     */
+    public function invokes_psr15_middleware()
+    {
+        $app = Bridge::create();
+        $app->add(Psr15Middleware::class);
+        $app->get('/', function () {});
+
+        $response = $app->handle(RequestFactory::create('/', 'foo=matt'));
+
+        $this->assertEquals('Hello matt', $response->getBody()->__toString());
+    }
 }

tests/Mock/Psr15Middleware.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+namespace DI\Bridge\Slim\Test\Mock;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Zend\Diactoros\Response\TextResponse;
+
+class Psr15Middleware implements MiddlewareInterface
+{
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        return new TextResponse('Hello ' . $request->getQueryParams()['foo']);
+    }
+}