v4 support

Author: fritsvt

src/App.php

@@ -2,37 +2,43 @@
 
 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 Slim\Factory\AppFactory;
+use \Invoker\CallableResolver as InvokerCallableResolver;
 
 /**
  * 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
+class App
 {
-    public function __construct()
+    public static function boot(ContainerInterface $container)
     {
-        $containerBuilder = new ContainerBuilder;
-        $containerBuilder->addDefinitions(__DIR__ . '/config.php');
-        $this->configureContainer($containerBuilder);
-        $container = $containerBuilder->build();
+        AppFactory::setContainer($container);
+        $callableResolver = new InvokerCallableResolver($container);
+        AppFactory::setCallableResolver(new CallableResolver($callableResolver));
 
-        parent::__construct($container);
-    }
+        $app = AppFactory::create();
 
-    /**
-     * 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)
-    {
+        $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(),
+        ];
+
+        $invoker = new Invoker(new ResolverChain($resolvers), $container);
+        $app->getRouteCollector()->setDefaultInvocationStrategy(new ControllerInvoker($invoker));
+
+        return $app;
     }
 }

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();