From e0776f52c98c7a4fb294a623344843013a038c47 Mon Sep 17 00:00:00 2001 From: Geert Eltink Date: Sat, 25 Mar 2017 17:21:18 +0100 Subject: [PATCH] Use PSR-11 Container Interface --- composer.json | 6 ++- composer.lock | 52 ++++++++++++------------ src/Exception/MissingHelperException.php | 4 +- src/HelperPluginManagerFactory.php | 2 +- src/ZendViewRendererFactory.php | 2 +- 5 files changed, 35 insertions(+), 31 deletions(-) diff --git a/composer.json b/composer.json index 291a589..905564c 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,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", @@ -32,6 +33,9 @@ "phpunit/phpunit": "^6.0.8 || ^5.7.15", "zendframework/zend-coding-standard": "~1.0.0" }, + "conflict": { + "container-interop/container-interop": "<1.2.0" + }, "autoload": { "psr-4": { "Zend\\Expressive\\ZendView\\": "src/" diff --git a/composer.lock b/composer.lock index a2f253e..254a46d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "e9020aa38a7834572cf339ede72326ab", + "content-hash": "1fc222d987b65517793735b5498a54cb", "packages": [ { "name": "container-interop/container-interop", @@ -610,29 +610,29 @@ }, { "name": "zendframework/zend-view", - "version": "2.8.1", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-view.git", - "reference": "71b4ebd0c4c9a2d0e0438f9d3a435e08dd769ff8" + "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-view/zipball/71b4ebd0c4c9a2d0e0438f9d3a435e08dd769ff8", - "reference": "71b4ebd0c4c9a2d0e0438f9d3a435e08dd769ff8", + "url": "https://api.github.com/repos/zendframework/zend-view/zipball/3b6342c381c4437a03fc81d0064c0bb8924914d3", + "reference": "3b6342c381c4437a03fc81d0064c0bb8924914d3", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-loader": "^2.5", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "^4.5", + "phpunit/phpunit": "^5.7.15 || ^6.0.8", "zendframework/zend-authentication": "^2.5", "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6", "zendframework/zend-console": "^2.6", "zendframework/zend-escaper": "^2.5", @@ -674,8 +674,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev", - "dev-develop": "2.9-dev" + "dev-master": "2.9-dev", + "dev-develop": "3.0-dev" } }, "autoload": { @@ -693,7 +693,7 @@ "view", "zf2" ], - "time": "2016-06-30T22:28:07+00:00" + "time": "2017-03-21T15:05:56+00:00" } ], "packages-dev": [ @@ -1303,16 +1303,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.0.8", + "version": "6.0.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "47ee3fa1bca5c50f1d25105201eb20df777bd7b6" + "reference": "8a536f409ebae632b92b7e7288e068248fe365ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/47ee3fa1bca5c50f1d25105201eb20df777bd7b6", - "reference": "47ee3fa1bca5c50f1d25105201eb20df777bd7b6", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8a536f409ebae632b92b7e7288e068248fe365ed", + "reference": "8a536f409ebae632b92b7e7288e068248fe365ed", "shasum": "" }, "require": { @@ -1323,18 +1323,18 @@ "ext-xml": "*", "myclabs/deep-copy": "^1.3", "php": "^7.0", - "phpspec/prophecy": "^1.6.2", + "phpspec/prophecy": "^1.7", "phpunit/php-code-coverage": "^5.0", "phpunit/php-file-iterator": "^1.4", "phpunit/php-text-template": "^1.2", "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^4.0", - "sebastian/comparator": "^1.2.4 || ^2.0", + "sebastian/comparator": "^2.0", "sebastian/diff": "^1.2", "sebastian/environment": "^2.0", - "sebastian/exporter": "^2.0 || ^3.0", + "sebastian/exporter": "^3.0", "sebastian/global-state": "^1.1 || ^2.0", - "sebastian/object-enumerator": "^2.0 || ^3.0", + "sebastian/object-enumerator": "^3.0.2", "sebastian/resource-operations": "^1.0", "sebastian/version": "^2.0" }, @@ -1381,7 +1381,7 @@ "testing", "xunit" ], - "time": "2017-03-02T15:24:03+00:00" + "time": "2017-03-19T16:54:28+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -1867,16 +1867,16 @@ }, { "name": "sebastian/object-reflector", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "2201553542d60d25db9c5b2c54330df776648008" + "reference": "afd5797e7af7c9f529879ad5e8e8abe126c89dab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/2201553542d60d25db9c5b2c54330df776648008", - "reference": "2201553542d60d25db9c5b2c54330df776648008", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/afd5797e7af7c9f529879ad5e8e8abe126c89dab", + "reference": "afd5797e7af7c9f529879ad5e8e8abe126c89dab", "shasum": "" }, "require": { @@ -1888,7 +1888,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -1908,7 +1908,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-12T15:10:22+00:00" + "time": "2017-03-16T14:05:21+00:00" }, { "name": "sebastian/recursion-context", diff --git a/src/Exception/MissingHelperException.php b/src/Exception/MissingHelperException.php index 1b5a8e1..c08454b 100644 --- a/src/Exception/MissingHelperException.php +++ b/src/Exception/MissingHelperException.php @@ -8,10 +8,10 @@ namespace Zend\Expressive\ZendView\Exception; use DomainException; -use Interop\Container\Exception\ContainerException; +use Psr\Container\ContainerExceptionInterface; class MissingHelperException extends DomainException implements - ContainerException, + ContainerExceptionInterface, ExceptionInterface { } diff --git a/src/HelperPluginManagerFactory.php b/src/HelperPluginManagerFactory.php index 9491fee..9bab0ef 100644 --- a/src/HelperPluginManagerFactory.php +++ b/src/HelperPluginManagerFactory.php @@ -7,7 +7,7 @@ namespace Zend\Expressive\ZendView; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\ServiceManager\Config; use Zend\View\HelperPluginManager; diff --git a/src/ZendViewRendererFactory.php b/src/ZendViewRendererFactory.php index 5b73714..5d1a95c 100644 --- a/src/ZendViewRendererFactory.php +++ b/src/ZendViewRendererFactory.php @@ -7,7 +7,7 @@ namespace Zend\Expressive\ZendView; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Zend\Expressive\Helper\ServerUrlHelper as BaseServerUrlHelper; use Zend\Expressive\Helper\UrlHelper as BaseUrlHelper; use Zend\View\HelperPluginManager;