drop container-interop/container-interop

doctrine · Nov 18, 2022 · c72eedf · c72eedf
1 parent add6cf4
commit c72eedf
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -37,7 +37,6 @@
     "homepage": "http://www.doctrine-project.org/",
     "require": {
         "php": "^7.4 || ~8.0.0 || ~8.1.0",
-        "container-interop/container-interop": "^1.2.0",
         "doctrine/annotations": "^1.13.2",
         "doctrine/cache": "^1.12.1",
         "doctrine/collections": "^1.6.8",

diff --git a/docs/en/authentication.rst b/docs/en/authentication.rst
@@ -187,7 +187,7 @@ factories as in the example below:
    <?php
    namespace Application\Factory\Controller;
 
-   use Interop\Container\ContainerInterface;
+   use Psr\Container\ContainerInterface;
    use Laminas\ServiceManager\Factory\FactoryInterface;
 
    class ApplicationControllerFactory implements FactoryInterface

diff --git a/src/Service/AbstractFactory.php b/src/Service/AbstractFactory.php
@@ -4,9 +4,9 @@
 
 namespace DoctrineModule\Service;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\Stdlib\AbstractOptions;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function sprintf;

diff --git a/src/Service/Authentication/AdapterFactory.php b/src/Service/Authentication/AdapterFactory.php
@@ -7,7 +7,7 @@
 use DoctrineModule\Authentication\Adapter\ObjectRepository;
 use DoctrineModule\Options\Authentication;
 use DoctrineModule\Service\AbstractFactory;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function get_class;

diff --git a/src/Service/Authentication/AuthenticationServiceFactory.php b/src/Service/Authentication/AuthenticationServiceFactory.php
@@ -6,8 +6,8 @@
 
 use BadMethodCallException;
 use DoctrineModule\Service\AbstractFactory;
-use Interop\Container\ContainerInterface;
 use Laminas\Authentication\AuthenticationService;
+use Psr\Container\ContainerInterface;
 
 /**
  * Factory to create authentication service object.

diff --git a/src/Service/Authentication/StorageFactory.php b/src/Service/Authentication/StorageFactory.php
@@ -7,7 +7,7 @@
 use DoctrineModule\Authentication\Storage\ObjectRepository;
 use DoctrineModule\Options\Authentication;
 use DoctrineModule\Service\AbstractFactory;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function get_class;

diff --git a/src/Service/CacheFactory.php b/src/Service/CacheFactory.php
@@ -8,7 +8,7 @@
 use Doctrine\Common\Cache\CacheProvider;
 use DoctrineModule\Cache\LaminasStorageCache;
 use DoctrineModule\Options\Cache as CacheOptions;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function get_class;

diff --git a/src/Service/CliFactory.php b/src/Service/CliFactory.php
@@ -4,9 +4,9 @@
 
 namespace DoctrineModule\Service;
 
-use Interop\Container\ContainerInterface;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\HelperSet;
 

diff --git a/src/Service/DriverFactory.php b/src/Service/DriverFactory.php
@@ -14,8 +14,8 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use DoctrineModule\Options\Driver;
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function class_exists;

diff --git a/src/Service/EventManagerFactory.php b/src/Service/EventManagerFactory.php
@@ -7,8 +7,8 @@
 use Doctrine\Common\EventManager;
 use Doctrine\Common\EventSubscriber;
 use DoctrineModule\Options\EventManager as EventManagerOptions;
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function class_exists;

diff --git a/src/ServiceFactory/AbstractDoctrineServiceFactory.php b/src/ServiceFactory/AbstractDoctrineServiceFactory.php
@@ -4,9 +4,9 @@
 
 namespace DoctrineModule\ServiceFactory;
 
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
+use Psr\Container\ContainerInterface;
 
 use function preg_match;
 

diff --git a/src/Validator/Service/AbstractValidatorFactory.php b/src/Validator/Service/AbstractValidatorFactory.php
@@ -8,9 +8,9 @@
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Persistence\ObjectRepository;
 use DoctrineModule\Validator\Service\Exception\ServiceCreationException;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\Stdlib\ArrayUtils;
+use Psr\Container\ContainerInterface;
 
 use function class_exists;
 use function is_string;

diff --git a/src/Validator/Service/NoObjectExistsFactory.php b/src/Validator/Service/NoObjectExistsFactory.php
@@ -5,7 +5,7 @@
 namespace DoctrineModule\Validator\Service;
 
 use DoctrineModule\Validator\NoObjectExists;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 final class NoObjectExistsFactory extends AbstractValidatorFactory
 {

diff --git a/src/Validator/Service/ObjectExistsFactory.php b/src/Validator/Service/ObjectExistsFactory.php
@@ -5,7 +5,7 @@
 namespace DoctrineModule\Validator\Service;
 
 use DoctrineModule\Validator\ObjectExists;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 final class ObjectExistsFactory extends AbstractValidatorFactory
 {

diff --git a/src/Validator/Service/UniqueObjectFactory.php b/src/Validator/Service/UniqueObjectFactory.php
@@ -5,7 +5,7 @@
 namespace DoctrineModule\Validator\Service;
 
 use DoctrineModule\Validator\UniqueObject;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 final class UniqueObjectFactory extends AbstractValidatorFactory
 {

diff --git a/tests/Validator/Service/NoObjectExistsFactoryTest.php b/tests/Validator/Service/NoObjectExistsFactoryTest.php
@@ -10,10 +10,10 @@
 use DoctrineModule\Validator\Service\Exception\ServiceCreationException;
 use DoctrineModule\Validator\Service\NoObjectExistsFactory;
 use DoctrineModuleTest\Validator\TestAsset\DummyClass;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2017-09-04 at 11:12:27.

diff --git a/tests/Validator/Service/ObjectExistsFactoryTest.php b/tests/Validator/Service/ObjectExistsFactoryTest.php
@@ -9,9 +9,9 @@
 use DoctrineModule\Validator\ObjectExists;
 use DoctrineModule\Validator\Service\ObjectExistsFactory;
 use DoctrineModuleTest\Validator\TestAsset\DummyClass;
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2017-09-04 at 11:55:36.

diff --git a/tests/Validator/Service/UniqueObjectFactoryTest.php b/tests/Validator/Service/UniqueObjectFactoryTest.php
@@ -9,9 +9,9 @@
 use DoctrineModule\Validator\Service\UniqueObjectFactory;
 use DoctrineModule\Validator\UniqueObject;
 use DoctrineModuleTest\Validator\TestAsset\DummyClass;
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Container\ContainerInterface;
 
 /**
  * Generated by PHPUnit_SkeletonGenerator on 2017-09-04 at 11:57:37.