From 7ec22b3f235e47fe4d41539f177520ebe103ac1d Mon Sep 17 00:00:00 2001
From: Dennis Riehle <webmaster@riehle-web.com>
Date: Fri, 18 Nov 2022 13:03:42 +0100
Subject: [PATCH 1/2] drop container-interop/container-interop

---
 composer.json                                               | 2 +-
 docs/en/authentication.rst                                  | 2 +-
 src/Service/AbstractFactory.php                             | 2 +-
 src/Service/Authentication/AdapterFactory.php               | 2 +-
 src/Service/Authentication/AuthenticationServiceFactory.php | 2 +-
 src/Service/Authentication/StorageFactory.php               | 2 +-
 src/Service/CacheFactory.php                                | 2 +-
 src/Service/CliFactory.php                                  | 2 +-
 src/Service/DriverFactory.php                               | 2 +-
 src/Service/EventManagerFactory.php                         | 2 +-
 src/ServiceFactory/AbstractDoctrineServiceFactory.php       | 2 +-
 src/Validator/Service/AbstractValidatorFactory.php          | 2 +-
 src/Validator/Service/NoObjectExistsFactory.php             | 2 +-
 src/Validator/Service/ObjectExistsFactory.php               | 2 +-
 src/Validator/Service/UniqueObjectFactory.php               | 2 +-
 tests/Validator/Service/NoObjectExistsFactoryTest.php       | 2 +-
 tests/Validator/Service/ObjectExistsFactoryTest.php         | 2 +-
 tests/Validator/Service/UniqueObjectFactoryTest.php         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 617fe8ff..6b67180d 100644
--- 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",
@@ -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": {
diff --git a/docs/en/authentication.rst b/docs/en/authentication.rst
index a461de45..0fb58861 100644
--- 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
index 8ecfc06e..b0169254 100644
--- 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
index 89804dc0..a10111cd 100644
--- 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
index 69db86db..42eda244 100644
--- 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
index 160cc689..e2262e48 100644
--- 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
index 540d6150..f80067c8 100644
--- 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
index c1ebd2d9..4682b8e4 100644
--- 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
index 0299553e..6a59681b 100644
--- 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
index 7556d2a8..d7961b91 100644
--- 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
index b1f40b72..421767f4 100644
--- 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
index 222b44cb..f5950873 100644
--- 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
index e79e98a1..dd9c5427 100644
--- 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
index e4c3a86c..76d5f615 100644
--- 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
index 37255a43..8abcab8f 100644
--- 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
index b790440f..3289ec50 100644
--- 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
index cb0223ae..4493dd33 100644
--- 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
index bf531753..04330171 100644
--- 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.

From 9f02103a7d1ab4bd66edd953fa74948bad55e28d Mon Sep 17 00:00:00 2001
From: Dennis Riehle <webmaster@riehle-web.com>
Date: Fri, 18 Nov 2022 13:16:39 +0100
Subject: [PATCH 2/2] suppress PhpStan error for laminas-cache interfaces

laminas-cache has change signatures from 3.6.0 to 3.8.0 by added the mixed type. This causes troubles for PhpStan, which identifies the mixed type being missing when executed with PHP 8.1. Ignoring these errors for now to keep compatibility with PHP 7.4.
---
 phpstan.neon | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpstan.neon b/phpstan.neon
index fa61ab43..9b9cf836 100644
--- a/phpstan.neon
+++ b/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