Slim 4 support

.travis.yml

@@ -1,13 +1,12 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 
 matrix:
   include:
-    - php: 7.0
+    - php: 7.1
       env: dependencies=lowest
 
 sudo: false

composer.json

@@ -14,10 +14,11 @@
         }
     },
     "require": {
-        "php": "~7.0",
+        "php": "~7.1",
         "php-di/php-di": "^6.0.0",
         "php-di/invoker": "^2.0.0",
-        "slim/slim": "^3.9.0"
+        "slim/slim": "^4.0.0",
+        "slim/psr7": "^0.4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0"

src/App.php

@@ -3,36 +3,56 @@
 namespace DI\Bridge\Slim;
 
 use DI\ContainerBuilder;
+use Invoker\Invoker;
+use Invoker\ParameterResolver\AssociativeArrayResolver;
+use Invoker\ParameterResolver\Container\TypeHintContainerResolver;
+use Invoker\ParameterResolver\DefaultValueResolver;
+use Invoker\ParameterResolver\ResolverChain;
+use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseFactoryInterface;
+use Slim\Factory\AppFactory;
+use \Invoker\CallableResolver as InvokerCallableResolver;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\RouteCollectorInterface;
+use Slim\Interfaces\RouteResolverInterface;
 
 /**
  * Slim application configured with PHP-DI.
  *
  * As you can see, this class is very basic and is only useful to get started quickly.
- * You can also very well *not* use it and build the container manually.
  */
 class App extends \Slim\App
 {
-    public function __construct()
-    {
-        $containerBuilder = new ContainerBuilder;
-        $containerBuilder->addDefinitions(__DIR__ . '/config.php');
-        $this->configureContainer($containerBuilder);
-        $container = $containerBuilder->build();
+    public function __construct(
+        ?ContainerInterface $container = null,
+        ?ResponseFactoryInterface $responseFactory = null,
+        ?CallableResolverInterface $callableResolver = null,
+        ?RouteCollectorInterface $routeCollector = null,
+        ?RouteResolverInterface $routeResolver = null
+    ) {
+        if ($responseFactory == null) {
+            $responseFactory = AppFactory::determineResponseFactory();
+        }
+        if (!$container) {
+            $containerBuilder = new ContainerBuilder();
+            $container = $containerBuilder->build();
+        }
+        parent::__construct($responseFactory, $container, $callableResolver, $routeCollector, $routeResolver);
 
-        parent::__construct($container);
-    }
+        // Set resolvers
+        $callableResolver = new InvokerCallableResolver($container);
+        AppFactory::setCallableResolver(new CallableResolver($callableResolver));
+
+        $resolvers = [
+            // Inject parameters by name first
+            new AssociativeArrayResolver(),
+            // Then inject services by type-hints for those that weren't resolved
+            new TypeHintContainerResolver($container),
+            // Then fall back on parameters default values for optional route parameters
+            new DefaultValueResolver(),
+        ];
 
-    /**
-     * Override this method to configure the container builder.
-     *
-     * For example, to load additional configuration files:
-     *
-     *     protected function configureContainer(ContainerBuilder $builder)
-     *     {
-     *         $builder->addDefinitions(__DIR__ . 'my-config-file.php');
-     *     }
-     */
-    protected function configureContainer(ContainerBuilder $builder)
-    {
+        $invoker = new Invoker(new ResolverChain($resolvers), $container);
+        $this->getRouteCollector()->setDefaultInvocationStrategy(new ControllerInvoker($invoker));
     }
 }

src/CallableResolver.php

@@ -18,11 +18,10 @@ public function __construct(\Invoker\CallableResolver $callableResolver)
     {
         $this->callableResolver = $callableResolver;
     }
-
     /**
      * {@inheritdoc}
      */
-    public function resolve($toResolve)
+    public function resolve($toResolve): callable
     {
         return $this->callableResolver->resolve($toResolve);
     }

src/ControllerInvoker.php

@@ -18,7 +18,6 @@ public function __construct(InvokerInterface $invoker)
     {
         $this->invoker = $invoker;
     }
-
     /**
      * Invoke a route callable.
      *
@@ -34,16 +33,14 @@ public function __invoke(
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    ) {
+    ): ResponseInterface {
         // Inject the request and response by parameter name
         $parameters = [
             'request'  => $request,
             'response' => $response,
         ];
-
         // Inject the route arguments by name
         $parameters += $routeArguments;
-
         // Inject the attributes defined on the request
         $parameters += $request->getAttributes();
 

tests/ApplicationTest.php

@@ -2,10 +2,13 @@
 
 namespace DI\Bridge\Slim\Test;
 
+use App\ContainerFactory;
 use DI\Bridge\Slim\App;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
+use Exception;
 use PHPUnit\Framework\TestCase;
-use Slim\Http\Response;
+use Psr\Http\Message\ResponseInterface as Response;
+use Psr\Http\Message\ServerRequestInterface as Request;
 
 class ApplicationTest extends TestCase
 {
@@ -17,11 +20,12 @@ public function runs()
         $app = new App;
 
         $called = false;
-        $app->get('/', function () use (&$called) {
+        $app->get('/', function (Request $request, Response $response) use (&$called) {
             $called = true;
+            return $response;
         });
 
-        $app->callMiddlewareStack(RequestFactory::create(), new Response);
+        $app->handle(RequestFactory::create());
         $this->assertTrue($called);
     }
 }