From 8bcdda870f2bbe683909761512f5383e5bc94042 Mon Sep 17 00:00:00 2001 From: Mateusz Drost Date: Sun, 9 Apr 2017 17:49:56 +0200 Subject: [PATCH] Replace Interop\Container with Psr\Container --- composer.json | 3 ++- composer.lock | 20 +++++++++++--------- src/Client.php | 2 +- src/ClientInterface.php | 2 +- src/Factory.php | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 6f9d92c..97cedcc 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "api-clients/service": "dev-master", "api-clients/transport": "dev-master", "league/event": "^2.1", - "php-di/php-di": "^5.4" + "php-di/php-di": "^5.4.1", + "psr/container": "^1.0" }, "require-dev": { "api-clients/test-utilities": "^2.0" diff --git a/composer.lock b/composer.lock index d326c4a..c590349 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": "dd5e47d45d9e98ed17a907746ea9adfd", + "content-hash": "7aef0c8241d6a08e282a60ef2c3c67b9", "packages": [ { "name": "api-clients/command-bus", @@ -1286,26 +1286,28 @@ }, { "name": "php-di/php-di", - "version": "5.4.0", + "version": "5.4.2", "source": { "type": "git", "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "e348393488fa909e4bc0707ba5c9c44cd602a1cb" + "reference": "bbe2ed4b48e5b832436bf50928c30af8aedf61f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/e348393488fa909e4bc0707ba5c9c44cd602a1cb", - "reference": "e348393488fa909e4bc0707ba5c9c44cd602a1cb", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/bbe2ed4b48e5b832436bf50928c30af8aedf61f8", + "reference": "bbe2ed4b48e5b832436bf50928c30af8aedf61f8", "shasum": "" }, "require": { - "container-interop/container-interop": "~1.0", + "container-interop/container-interop": "~1.2", "php": ">=5.5.0", "php-di/invoker": "^1.3.2", - "php-di/phpdoc-reader": "^2.0.1" + "php-di/phpdoc-reader": "^2.0.1", + "psr/container": "~1.0" }, "provide": { - "container-interop/container-interop-implementation": "^1.0" + "container-interop/container-interop-implementation": "^1.0", + "psr/container-implementation": "^1.0" }, "replace": { "mnapoli/php-di": "*" @@ -1342,7 +1344,7 @@ "dependency injection", "di" ], - "time": "2016-08-23T20:18:00+00:00" + "time": "2017-03-27T19:30:46+00:00" }, { "name": "php-di/phpdoc-reader", diff --git a/src/Client.php b/src/Client.php index c27ecf9..f65d0ab 100644 --- a/src/Client.php +++ b/src/Client.php @@ -3,7 +3,7 @@ namespace ApiClients\Foundation; use ApiClients\Tools\CommandBus\CommandBusInterface; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use React\Promise\CancellablePromiseInterface; final class Client implements ClientInterface diff --git a/src/ClientInterface.php b/src/ClientInterface.php index e2ac6ff..c3fe0e9 100644 --- a/src/ClientInterface.php +++ b/src/ClientInterface.php @@ -2,7 +2,7 @@ namespace ApiClients\Foundation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use React\Promise\CancellablePromiseInterface; interface ClientInterface diff --git a/src/Factory.php b/src/Factory.php index cf18d7a..3c4d35b 100644 --- a/src/Factory.php +++ b/src/Factory.php @@ -11,7 +11,7 @@ use ApiClients\Tools\CommandBus\CommandBusInterface; use ApiClients\Tools\CommandBus\Factory as CommandBusFactory; use DI\ContainerBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use InvalidArgumentException; use React\EventLoop\LoopInterface;