Drop container-interop/container-interop

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",
@@ -55,6 +54,7 @@
         "laminas/laminas-servicemanager": "^3.10.0",
         "laminas/laminas-stdlib": "^3.7.1",
         "laminas/laminas-validator": "^2.16.0",
+        "psr/container": "^1.1.2",
         "symfony/console": "^5.4.3 || ^6.0.3"
     },
     "require-dev": {

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

phpstan.neon

@@ -4,6 +4,10 @@ parameters:
     paths:
         - src
         - tests
+    ignoreErrors:
+        -
+          message: '#internal(G|S)etItem\(\) has parameter \$(casToken|value) with no type specified#'
+          path: src/Cache/DoctrineCacheStorage.php
 includes:
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon

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;

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;

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.

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;

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;

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;
 

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;

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;

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;
 

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;

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
 {

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
 {

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
 {

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.

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.

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.