diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php index 6bab043f..d03302dd 100644 --- a/.phpstorm.meta.php +++ b/.phpstorm.meta.php @@ -5,8 +5,8 @@ \DI\Container::get('') => [ "" == "@", ], - \Interop\Container\ContainerInterface::get('') => [ + \Psr\Container\ContainerInterface::get('') => [ "" == "@", ], ]; -} \ No newline at end of file +} diff --git a/composer.json b/composer.json index ba00868b..3163f7b6 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "php" : ">=7.2", "ext-pdo_sqlite": "*", "php-di/php-di": "^6.0", - "container-interop/container-interop": "^1.0", + "psr/container": "^1.0", "symfony/process": "^3.0 | ^4.0", "symfony/filesystem": "^3.0 | ^4.0", "fzaninotto/faker": "^1.5", diff --git a/composer.lock b/composer.lock index 97dc75f2..0ffb5fe7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "731f2dc2865e6d45cb0258cfca6f5f48", + "content-hash": "a81c30520f22f84239ca2f5380f3e7e4", "packages": [ { "name": "aydin-hassan/cli-md-renderer", @@ -119,42 +119,6 @@ }, "time": "2019-12-19T17:51:41+00:00" }, - { - "name": "container-interop/container-interop", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "homepage": "https://github.com/container-interop/container-interop", - "support": { - "issues": "https://github.com/container-interop/container-interop/issues", - "source": "https://github.com/container-interop/container-interop/tree/master" - }, - "abandoned": "psr/container", - "time": "2017-02-14T19:40:03+00:00" - }, { "name": "fzaninotto/faker", "version": "v1.9.1", diff --git a/test/CommandRouterTest.php b/test/CommandRouterTest.php index 72714ef1..a1b18bc2 100644 --- a/test/CommandRouterTest.php +++ b/test/CommandRouterTest.php @@ -2,7 +2,7 @@ namespace PhpSchool\PhpWorkshopTest; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use InvalidArgumentException; use PhpSchool\PhpWorkshop\CommandArgument; use PhpSchool\PhpWorkshop\Event\EventDispatcher; diff --git a/test/Factory/CliRendererFactoryTest.php b/test/Factory/CliRendererFactoryTest.php index a0169cc2..bc0560f0 100644 --- a/test/Factory/CliRendererFactoryTest.php +++ b/test/Factory/CliRendererFactoryTest.php @@ -5,7 +5,7 @@ use AydinHassan\CliMdRenderer\CliRenderer; use Colors\Color; use PhpSchool\PhpWorkshop\Factory\MarkdownCliRendererFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PhpSchool\Terminal\Terminal; use PHPUnit\Framework\TestCase; diff --git a/test/Factory/EventDispatcherFactoryTest.php b/test/Factory/EventDispatcherFactoryTest.php index 93567bf8..f1086db8 100644 --- a/test/Factory/EventDispatcherFactoryTest.php +++ b/test/Factory/EventDispatcherFactoryTest.php @@ -4,7 +4,7 @@ use DI\ContainerBuilder; use PhpSchool\PhpWorkshop\Event\Event; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PhpSchool\PhpWorkshop\Event\EventDispatcher; use PhpSchool\PhpWorkshop\Exception\InvalidArgumentException; use PhpSchool\PhpWorkshop\Factory\EventDispatcherFactory; diff --git a/test/Factory/MenuFactoryTest.php b/test/Factory/MenuFactoryTest.php index 3c240e6b..117f92b2 100644 --- a/test/Factory/MenuFactoryTest.php +++ b/test/Factory/MenuFactoryTest.php @@ -2,7 +2,7 @@ namespace PhpSchool\PhpWorkshopTest\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PhpSchool\CliMenu\CliMenu; use PhpSchool\PhpWorkshop\Command\CreditsCommand; use PhpSchool\PhpWorkshop\Command\HelpCommand;