Drop container-interop/container-interop

composer.json

@@ -51,7 +51,6 @@
     "require": {
         "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
-        "container-interop/container-interop": "^1.2.0",
         "doctrine/dbal": "^2.13.7 || ^3.3.2",
         "doctrine/doctrine-laminas-hydrator": "^3.0.0",
         "doctrine/doctrine-module": "^5.2.0",
@@ -62,8 +61,9 @@
         "laminas/laminas-modulemanager": "^2.11.0",
         "laminas/laminas-mvc": "^3.3.2",
         "laminas/laminas-paginator": "^2.12.2",
-        "laminas/laminas-servicemanager": "^3.10.0",
+        "laminas/laminas-servicemanager": "^3.17.0",
         "laminas/laminas-stdlib": "^3.7.1",
+        "psr/container": "^1.1.2",
         "symfony/console": "^5.4.3 || ^6.0.3"
     },
     "require-dev": {

docs/en/cache.rst

@@ -75,7 +75,7 @@ Db\\Cache\\RedisFactory
 
     namespace Db\Cache;
 
-    use Interop\Container\ContainerInterface;
+    use Psr\Container\ContainerInterface;
     use Redis;
 
     class RedisFactory

phpstan.neon

@@ -12,9 +12,6 @@ parameters:
         -
             message: '#Return type .* of method DoctrineORMModule\\Yuml\\YumlController::indexAction\(\)#'
             path: src/Yuml/YumlController.php
-        -
-            message: '#Method DoctrineORMModule\\CliConfigurator::getHelpers\(\) should return#'
-            path: src/CliConfigurator.php
         -
             message: '#Parameter \#1 .* of method DoctrineORMModule\\Options\\Configuration.* stdClass given#'
             path: tests/Options/ConfigurationOptionsTest.php

src/CliConfigurator.php

@@ -9,8 +9,8 @@
 use Doctrine\Migrations\Tools\Console\Command\VersionCommand;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
-use Interop\Container\ContainerInterface;
 use Laminas\Stdlib\ArrayUtils;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Helper\QuestionHelper;

src/Paginator/Adapter/DoctrinePaginator.php

@@ -13,6 +13,8 @@
  * Paginator adapter for the Laminas\Paginator component
  *
  * @psalm-template T of object
+ * @psalm-template TKey of int
+ * @psalm-template TValue
  */
 class DoctrinePaginator implements AdapterInterface, JsonSerializable
 {
@@ -50,7 +52,7 @@ public function getPaginator(): Paginator
     /**
      * {@inheritDoc}
      *
-     * @psalm-return ArrayIterator<array-key,T>
+     * @psalm-return ArrayIterator<TKey, TValue>
      */
     public function getItems($offset, $itemCountPerPage)
     {

src/Service/CliConfiguratorFactory.php

@@ -5,8 +5,8 @@
 namespace DoctrineORMModule\Service;
 
 use DoctrineORMModule\CliConfigurator;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 final class CliConfiguratorFactory implements FactoryInterface
 {

src/Service/ConfigurationFactory.php

@@ -11,8 +11,8 @@
 use Doctrine\ORM\Mapping\EntityListenerResolver;
 use DoctrineORMModule\Options\Configuration as DoctrineORMModuleConfiguration;
 use DoctrineORMModule\Service\DBALConfigurationFactory as DoctrineConfigurationFactory;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Exception\InvalidArgumentException;
+use Psr\Container\ContainerInterface;
 
 use function is_string;
 use function method_exists;

src/Service/DBALConfigurationFactory.php

@@ -8,9 +8,9 @@
 use Doctrine\DBAL\Driver\Middleware;
 use Doctrine\DBAL\Types\Type;
 use DoctrineORMModule\Options\Configuration as DoctrineORMModuleConfiguration;
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 use UnexpectedValueException;
 

src/Service/DBALConnectionFactory.php

@@ -9,8 +9,8 @@
 use Doctrine\DBAL\Types\Type;
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Options\DBALConnection;
-use Interop\Container\ContainerInterface;
 use PDO;
+use Psr\Container\ContainerInterface;
 
 use function array_key_exists;
 use function array_merge;

src/Service/DoctrineObjectHydratorFactory.php

@@ -5,8 +5,8 @@
 namespace DoctrineORMModule\Service;
 
 use Doctrine\Laminas\Hydrator\DoctrineObject;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 final class DoctrineObjectHydratorFactory implements FactoryInterface
 {

src/Service/EntityManagerAliasCompatFactory.php

@@ -5,8 +5,8 @@
 namespace DoctrineORMModule\Service;
 
 use Doctrine\ORM\EntityManager;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Factory that provides the `Doctrine\ORM\EntityManager` alias for `doctrine.entitymanager.orm_default`

src/Service/EntityManagerFactory.php

@@ -7,7 +7,7 @@
 use Doctrine\ORM\EntityManager;
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Options\EntityManager as DoctrineORMModuleEntityManager;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 use function assert;
 

src/Service/EntityResolverFactory.php

@@ -7,7 +7,7 @@
 use Doctrine\ORM\Tools\ResolveTargetEntityListener;
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Options\EntityResolver;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 use function assert;
 

src/Service/MappingCollectorFactory.php

@@ -7,7 +7,7 @@
 use BadMethodCallException;
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Collector\MappingCollector;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Service factory responsible for instantiating {@see \DoctrineORMModule\Collector\MappingCollector}

src/Service/MigrationsCommandFactory.php

@@ -8,9 +8,9 @@
 use Doctrine\Migrations\Configuration\Migration\ConfigurationArray;
 use Doctrine\Migrations\DependencyFactory;
 use Doctrine\Migrations\Tools\Console\Command\DoctrineCommand;
-use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 use Symfony\Component\Console\Input\ArgvInput;
 

src/Service/ObjectMultiCheckboxFactory.php

@@ -6,8 +6,8 @@
 
 use Doctrine\ORM\EntityManager;
 use DoctrineModule\Form\Element\ObjectMultiCheckbox;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Factory for {@see ObjectMultiCheckbox}

src/Service/ObjectRadioFactory.php

@@ -6,8 +6,8 @@
 
 use Doctrine\ORM\EntityManager;
 use DoctrineModule\Form\Element\ObjectRadio;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Factory for {@see ObjectRadio}

src/Service/ObjectSelectFactory.php

@@ -6,8 +6,8 @@
 
 use Doctrine\ORM\EntityManager;
 use DoctrineModule\Form\Element\ObjectSelect;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * Factory for {@see ObjectSelect}

src/Service/ReservedWordsCommandFactory.php

@@ -6,8 +6,8 @@
 
 use Doctrine\DBAL\Tools\Console\Command\ReservedWordsCommand;
 use Doctrine\DBAL\Tools\Console\ConnectionProvider\SingleConnectionProvider;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 final class ReservedWordsCommandFactory implements FactoryInterface
 {

src/Service/RunSqlCommandFactory.php

@@ -6,8 +6,8 @@
 
 use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand;
 use Doctrine\DBAL\Tools\Console\ConnectionProvider\SingleConnectionProvider;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 final class RunSqlCommandFactory implements FactoryInterface
 {

src/Service/SQLLoggerCollectorFactory.php

@@ -8,8 +8,8 @@
 use Doctrine\DBAL\Logging\LoggerChain;
 use DoctrineORMModule\Collector\SQLLoggerCollector;
 use DoctrineORMModule\Options\SQLLoggerCollectorOptions;
-use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 
 use function sprintf;

src/Yuml/YumlControllerFactory.php

@@ -4,10 +4,10 @@
 
 namespace DoctrineORMModule\Yuml;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Http\Client;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Psr\Container\ContainerInterface;
 
 use function sprintf;