From 77320f6e9de68d3edf1185e5007736d0cf8bd92e Mon Sep 17 00:00:00 2001 From: Westin Shafer Date: Wed, 10 May 2017 21:00:01 -0600 Subject: [PATCH] Update deprecated container-interop with PSR-11 --- composer.json | 2 +- src/AbstractFactory.php | 2 +- src/CacheFactory.php | 2 +- src/ConfigurationFactory.php | 2 +- src/ConnectionFactory.php | 2 +- src/DriverFactory.php | 2 +- src/EntityManagerFactory.php | 2 +- src/EventManagerFactory.php | 2 +- test/AbstractFactoryTest.php | 4 ++-- test/CacheFactoryTest.php | 2 +- test/ConnectionFactoryTest.php | 2 +- test/DriverFactoryTest.php | 2 +- test/EntityManagerFactoryTest.php | 2 +- test/EventManagerFactoryTest.php | 2 +- test/TestAsset/StubFactory.php | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 0a9f2e3..b13348b 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "require": { "php": "^5.5|^7.0", "doctrine/orm": "^2.5", - "container-interop/container-interop": "^1.1", + "psr/container": "^1.0.0", "doctrine/dbal": "^2.5", "doctrine/common": "^2.6" }, diff --git a/src/AbstractFactory.php b/src/AbstractFactory.php index 2984d01..cd2f14f 100644 --- a/src/AbstractFactory.php +++ b/src/AbstractFactory.php @@ -9,7 +9,7 @@ namespace ContainerInteropDoctrine; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; abstract class AbstractFactory { diff --git a/src/CacheFactory.php b/src/CacheFactory.php index 1859a6b..4ab377d 100644 --- a/src/CacheFactory.php +++ b/src/CacheFactory.php @@ -23,7 +23,7 @@ use Doctrine\Common\Cache\XcacheCache; use Doctrine\Common\Cache\ZendDataCache; use Doctrine\Common\Proxy\Exception\OutOfBoundsException; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * @method Cache __invoke(ContainerInterface $container) diff --git a/src/ConfigurationFactory.php b/src/ConfigurationFactory.php index 24401b6..b20352e 100644 --- a/src/ConfigurationFactory.php +++ b/src/ConfigurationFactory.php @@ -13,7 +13,7 @@ use Doctrine\ORM\Cache\DefaultCacheFactory; use Doctrine\ORM\Cache\RegionsConfiguration; use Doctrine\ORM\Configuration; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * @method Configuration __invoke(ContainerInterface $container) diff --git a/src/ConnectionFactory.php b/src/ConnectionFactory.php index 46a1c28..27820b5 100644 --- a/src/ConnectionFactory.php +++ b/src/ConnectionFactory.php @@ -12,7 +12,7 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\Driver\PDOMySql\Driver as PdoMysqlDriver; use Doctrine\DBAL\DriverManager; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * @method Connection __invoke(ContainerInterface $container) diff --git a/src/DriverFactory.php b/src/DriverFactory.php index 84e4917..411ff60 100644 --- a/src/DriverFactory.php +++ b/src/DriverFactory.php @@ -18,7 +18,7 @@ use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver; use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\Common\Proxy\Exception\OutOfBoundsException; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * @method MappingDriver __invoke(ContainerInterface $container) diff --git a/src/EntityManagerFactory.php b/src/EntityManagerFactory.php index 8283ed0..5edd984 100644 --- a/src/EntityManagerFactory.php +++ b/src/EntityManagerFactory.php @@ -11,7 +11,7 @@ use Doctrine\DBAL\Types\Type; use Doctrine\ORM\EntityManager; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * @method EntityManager __invoke(ContainerInterface $container) diff --git a/src/EventManagerFactory.php b/src/EventManagerFactory.php index fe25927..0d720c3 100644 --- a/src/EventManagerFactory.php +++ b/src/EventManagerFactory.php @@ -12,7 +12,7 @@ use ContainerInteropDoctrine\Exception\DomainException; use Doctrine\Common\EventManager; use Doctrine\Common\EventSubscriber; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * @method EventManager __invoke(ContainerInterface $container) diff --git a/test/AbstractFactoryTest.php b/test/AbstractFactoryTest.php index fbb9542..878cda3 100644 --- a/test/AbstractFactoryTest.php +++ b/test/AbstractFactoryTest.php @@ -11,7 +11,7 @@ use ContainerInteropDoctrine\Exception\DomainException; use ContainerInteropDoctrineTest\TestAsset\StubFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PHPUnit_Framework_TestCase; class AbstractFactoryTest extends PHPUnit_Framework_TestCase @@ -40,7 +40,7 @@ public function testStaticCallWithoutContainer() { $this->setExpectedException( DomainException::class, - 'The first argument must be of type Interop\Container\ContainerInterface' + 'The first argument must be of type Psr\Container\ContainerInterface' ); StubFactory::orm_other(); } diff --git a/test/CacheFactoryTest.php b/test/CacheFactoryTest.php index 52f6185..b7663df 100644 --- a/test/CacheFactoryTest.php +++ b/test/CacheFactoryTest.php @@ -13,7 +13,7 @@ use ContainerInteropDoctrine\CacheFactory; use Doctrine\Common\Cache\ChainCache; use Doctrine\Common\Cache\FilesystemCache; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PHPUnit_Framework_TestCase; /** diff --git a/test/ConnectionFactoryTest.php b/test/ConnectionFactoryTest.php index b4f1e59..f43791f 100644 --- a/test/ConnectionFactoryTest.php +++ b/test/ConnectionFactoryTest.php @@ -15,7 +15,7 @@ use Doctrine\DBAL\Exception\ConnectionException; use Doctrine\DBAL\Types\Type; use Doctrine\ORM\Configuration; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PHPUnit_Framework_TestCase; use Prophecy\Prophecy\ObjectProphecy; diff --git a/test/DriverFactoryTest.php b/test/DriverFactoryTest.php index 1a8228a..76393aa 100644 --- a/test/DriverFactoryTest.php +++ b/test/DriverFactoryTest.php @@ -8,7 +8,7 @@ use Doctrine\ORM\Mapping\Driver; use OutOfBoundsException; use ContainerInteropDoctrine\DriverFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PHPUnit_Framework_TestCase as TestCase; class DriverFactoryTest extends TestCase diff --git a/test/EntityManagerFactoryTest.php b/test/EntityManagerFactoryTest.php index 3a73f5f..6bc2309 100644 --- a/test/EntityManagerFactoryTest.php +++ b/test/EntityManagerFactoryTest.php @@ -15,7 +15,7 @@ use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain; use Doctrine\DBAL\Connection; use Doctrine\ORM\Configuration; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PHPUnit_Framework_TestCase; class EntityManagerFactoryTest extends PHPUnit_Framework_TestCase diff --git a/test/EventManagerFactoryTest.php b/test/EventManagerFactoryTest.php index 9abcfe1..1504f3d 100644 --- a/test/EventManagerFactoryTest.php +++ b/test/EventManagerFactoryTest.php @@ -12,7 +12,7 @@ use ContainerInteropDoctrine\EventManagerFactory; use ContainerInteropDoctrine\Exception\DomainException; use ContainerInteropDoctrineTest\TestAsset\StubEventSubscriber; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use PHPUnit_Framework_TestCase; use Prophecy\Prophecy\ObjectProphecy; use stdClass; diff --git a/test/TestAsset/StubFactory.php b/test/TestAsset/StubFactory.php index b1aba18..856afc1 100644 --- a/test/TestAsset/StubFactory.php +++ b/test/TestAsset/StubFactory.php @@ -10,7 +10,7 @@ namespace ContainerInteropDoctrineTest\TestAsset; use ContainerInteropDoctrine\AbstractFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; class StubFactory extends AbstractFactory {