Merge pull request #37 from xtreamwayz/feature/psr-11

Use PSR-11 Container Interface

Conflicts:
	composer.lock

Author: weierophinney

composer.json

@@ -21,7 +21,8 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "container-interop/container-interop": "^1.2",
+        "container-interop/container-interop": "^1.2.0",
+        "psr/container": "^1.0",
         "psr/http-message": "^1.0.1",
         "zendframework/zend-expressive-helpers": "^1.4 || ^2.2 || ^3.0.1 || ^4.0",
         "zendframework/zend-expressive-router": "^1.3.2 || ^2.1",
@@ -34,6 +35,9 @@
         "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
+    "conflict": {
+        "container-interop/container-interop": "<1.2.0"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Expressive\\ZendView\\": "src/"