Merge pull request #36 from PHP-DI/v6

Upgrade to PHP-DI 6

Author: mnapoli

.travis.yml

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

composer.json

@@ -14,12 +14,12 @@
         }
     },
     "require": {
-        "php": "~5.5|~7.0",
-        "php-di/php-di": "^5.2.0",
-        "php-di/invoker": "^1.2.0",
+        "php": "~7.0",
+        "php-di/php-di": "^6.0.0",
+        "php-di/invoker": "^2.0.0",
         "slim/slim": "^3.9.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.36"
+        "phpunit/phpunit": "~6.0"
     }
 }

src/config.php

@@ -1,14 +1,17 @@
 <?php
 
+use function DI\autowire;
 use DI\Bridge\Slim\CallableResolver;
 use DI\Bridge\Slim\ControllerInvoker;
 use DI\Container;
-use Interop\Container\ContainerInterface;
+use function DI\create;
+use function DI\get;
 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\Http\Headers;
 use Slim\Http\Request;
 use Slim\Http\Response;
@@ -25,26 +28,26 @@
     'settings.routerCacheFile' => false,
 
     'settings' => [
-        'httpVersion' => DI\get('settings.httpVersion'),
-        'responseChunkSize' => DI\get('settings.responseChunkSize'),
-        'outputBuffering' => DI\get('settings.outputBuffering'),
-        'determineRouteBeforeAppMiddleware' => DI\get('settings.determineRouteBeforeAppMiddleware'),
-        'displayErrorDetails' => DI\get('settings.displayErrorDetails'),
-        'addContentLengthHeader' => DI\get('settings.addContentLengthHeader'),
-        'routerCacheFile' => DI\get('settings.routerCacheFile'),
+        'httpVersion' => get('settings.httpVersion'),
+        'responseChunkSize' => get('settings.responseChunkSize'),
+        'outputBuffering' => get('settings.outputBuffering'),
+        'determineRouteBeforeAppMiddleware' => get('settings.determineRouteBeforeAppMiddleware'),
+        'displayErrorDetails' => get('settings.displayErrorDetails'),
+        'addContentLengthHeader' => get('settings.addContentLengthHeader'),
+        'routerCacheFile' => get('settings.routerCacheFile'),
     ],
 
     // Default Slim services
-    'router' => DI\object(Slim\Router::class)
-        ->method('setContainer', DI\get(Container::class))
-        ->method('setCacheFile', DI\get('settings.routerCacheFile')),
-    Slim\Router::class => DI\get('router'),
-    'errorHandler' => DI\object(Slim\Handlers\Error::class)
-        ->constructor(DI\get('settings.displayErrorDetails')),
-    'phpErrorHandler' => DI\object(Slim\Handlers\PhpError::class)
-        ->constructor(DI\get('settings.displayErrorDetails')),
-    'notFoundHandler' => DI\object(Slim\Handlers\NotFound::class),
-    'notAllowedHandler' => DI\object(Slim\Handlers\NotAllowed::class),
+    'router' => create(Slim\Router::class)
+        ->method('setContainer', get(Container::class))
+        ->method('setCacheFile', get('settings.routerCacheFile')),
+    Slim\Router::class => get('router'),
+    'errorHandler' => create(Slim\Handlers\Error::class)
+        ->constructor(get('settings.displayErrorDetails')),
+    'phpErrorHandler' => create(Slim\Handlers\PhpError::class)
+        ->constructor(get('settings.displayErrorDetails')),
+    'notFoundHandler' => create(Slim\Handlers\NotFound::class),
+    'notAllowedHandler' => create(Slim\Handlers\NotAllowed::class),
     'environment' => function () {
         return new Slim\Http\Environment($_SERVER);
     },
@@ -56,8 +59,8 @@
         $response = new Response(200, $headers);
         return $response->withProtocolVersion($c->get('settings')['httpVersion']);
     },
-    'foundHandler' => DI\object(ControllerInvoker::class)
-        ->constructor(DI\get('foundHandler.invoker')),
+    'foundHandler' => create(ControllerInvoker::class)
+        ->constructor(get('foundHandler.invoker')),
     'foundHandler.invoker' => function (ContainerInterface $c) {
         $resolvers = [
             // Inject parameters by name first
@@ -70,9 +73,6 @@
         return new Invoker(new ResolverChain($resolvers), $c);
     },
 
-    'callableResolver' => DI\object(CallableResolver::class),
-
-    // Aliases
-    ContainerInterface::class => DI\get(Container::class),
+    'callableResolver' => autowire(CallableResolver::class),
 
 ];