Merge branch 'feature/40' into develop

Close #40

CHANGELOG.md

@@ -9,6 +9,15 @@ All notable changes to this project will be documented in this file, in reverse
 - [#41](https://github.com/zfcampus/zf-console/pull/41) adds support for PHP
   versions 7.1 and 7.2.
 
+### Changed
+
+- [#40](https://github.com/zfcampus/zf-console/pull/40) changes the dependency
+  on container-interop/container-interop to psr/container, and updates internal
+  typehints against container-interop to reference the PSR-11 typehint instead.
+  This should generally not be an issue, as most containers that still typehint
+  against container-interop will use the last version of container-interop,
+  which extends the PSR-11 interface.
+
 ### Deprecated
 
 - Nothing.

README.md

@@ -426,8 +426,8 @@ $application = new Application('App', 1.0, $routes, null, $dispatcher);
 > - Since 1.3.0
 
 Instead of specifying a callable or a class name for a command handler, you may
-store your handlers within a dependency injection container compatible with
-[container-interop](https://github.com/container-interop/container-interop);
+store your handlers within a dependency injection container compatible with the
+[PSR-11 specification](https://github.com/php-fig/container);
 when you do so, you can specify the *service name* of the handler instead.
 
 To do this, you will need to create a `Dispatcher` instance, passing it the

composer.json

@@ -16,19 +16,18 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
+        "psr/container": "^1.0",
         "zendframework/zend-console": "^2.6"
     },
     "require-dev": {
-        "container-interop/container-interop": "^1.1",
         "phpunit/phpunit": "^5.7.25 || ^6.4.4",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-filter": "^2.7.1",
         "zendframework/zend-validator": "^2.8.1"
     },
     "suggest": {
         "zendframework/zend-filter": "^2.7.1; Useful for filtering/normalizing argument values",
-        "zendframework/zend-validator": "^2.8.1; Useful for providing more thorough argument validation logic",
-        "container-interop/container-interop": "^1.1; For ability to pull dispatched commands from container"
+        "zendframework/zend-validator": "^2.8.1; Useful for providing more thorough argument validation logic"
     },
     "autoload": {
         "psr-4": {

src/Dispatcher.php

@@ -6,8 +6,8 @@
 
 namespace ZF\Console;
 
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 use Zend\Console\Adapter\AdapterInterface as ConsoleAdapter;
 use Zend\Console\ColorInterface as Color;

test/ApplicationTest.php

@@ -12,7 +12,6 @@
 use Zend\Console\Adapter\AdapterInterface;
 use ZF\Console\Application;
 use ZF\Console\Dispatcher;
-use ZF\Console\Route;
 
 class ApplicationTest extends TestCase
 {

test/DispatcherTest.php

@@ -6,8 +6,8 @@
 
 namespace ZFTest\Console;
 
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use Zend\Console\Adapter\AdapterInterface;
 use ZF\Console\Dispatcher;
 use ZF\Console\Route;