Merge pull request #22 from weierophinney/feature/container-interop-r…

…emoval Switch from `container-interop/container-interop` to `psr/container` in a backward compatible manner
laminas · Apr 12, 2022 · 0972bb9 · 0972bb9
2 parents a0008a2 + 9876d05
commit 0972bb9
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 54 deletions.
diff --git a/composer.json b/composer.json
@@ -27,9 +27,10 @@
     "require": {
         "php": "^7.4 || ~8.0.0 || ~8.1.0",
         "ext-mbstring": "*",
-        "container-interop/container-interop": "^1.2",
         "laminas/laminas-math": "^3.4",
-        "laminas/laminas-stdlib": "^3.6"
+        "laminas/laminas-servicemanager": "^3.11.2",
+        "laminas/laminas-stdlib": "^3.6",
+        "psr/container": "^1.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/BlockCipher.php b/src/BlockCipher.php
@@ -2,11 +2,11 @@
 
 namespace Laminas\Crypt;
 
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\NotFoundException;
 use Laminas\Crypt\Key\Derivation\Pbkdf2;
 use Laminas\Crypt\Symmetric\SymmetricInterface;
 use Laminas\Math\Rand;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface as NotFoundException;
 
 use function base64_decode;
 use function base64_encode;

diff --git a/src/Exception/NotFoundException.php b/src/Exception/NotFoundException.php
@@ -3,11 +3,11 @@
 namespace Laminas\Crypt\Exception;
 
 use DomainException;
-use Interop\Container\Exception\NotFoundException as InteropNotFoundException;
+use Psr\Container\NotFoundExceptionInterface as PsrNotFoundException;
 
 /**
  * Runtime argument exception
  */
-class NotFoundException extends DomainException implements InteropNotFoundException
+class NotFoundException extends DomainException implements PsrNotFoundException
 {
 }
diff --git a/src/Symmetric/Mcrypt.php b/src/Symmetric/Mcrypt.php
@@ -2,8 +2,8 @@
 
 namespace Laminas\Crypt\Symmetric;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Stdlib\ArrayUtils;
+use Psr\Container\ContainerInterface;
 use Traversable;
 
 use function array_key_exists;
@@ -82,7 +82,7 @@ class Mcrypt implements SymmetricInterface
     /**
      * Padding plugins
      *
-     * @var Interop\Container\ContainerInterface
+     * @var ContainerInterface
      */
     protected static $paddingPlugins;
 
@@ -239,7 +239,7 @@ public static function setPaddingPluginManager($plugins)
         }
         if (! $plugins instanceof ContainerInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Padding plugins must implements Interop\Container\ContainerInterface; received "%s"',
+                'Padding plugins must implements Psr\Container\ContainerInterface; received "%s"',
                 is_object($plugins) ? get_class($plugins) : gettype($plugins)
             ));
         }

diff --git a/src/Symmetric/Openssl.php b/src/Symmetric/Openssl.php
@@ -2,8 +2,8 @@
 
 namespace Laminas\Crypt\Symmetric;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Stdlib\ArrayUtils;
+use Psr\Container\ContainerInterface;
 use Traversable;
 
 use function array_push;
@@ -80,7 +80,7 @@ class Openssl implements SymmetricInterface
     /**
      * Padding plugins
      *
-     * @var Interop\Container\ContainerInterface
+     * @var ContainerInterface
      */
     protected static $paddingPlugins;
 

diff --git a/src/Symmetric/PaddingPluginManager.php b/src/Symmetric/PaddingPluginManager.php
@@ -2,7 +2,7 @@
 
 namespace Laminas\Crypt\Symmetric;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 use function array_key_exists;
 use function sprintf;

diff --git a/src/SymmetricPluginManager.php b/src/SymmetricPluginManager.php
@@ -2,7 +2,7 @@
 
 namespace Laminas\Crypt;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 use function array_key_exists;
 use function sprintf;

diff --git a/test/BlockCipher/AbstractBlockCipherTest.php b/test/BlockCipher/AbstractBlockCipherTest.php
@@ -2,11 +2,11 @@
 
 namespace LaminasTest\Crypt\BlockCipher;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Crypt\BlockCipher;
 use Laminas\Crypt\Exception;
 use Laminas\Crypt\Symmetric;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 use function file_get_contents;
 use function get_class;

diff --git a/test/Symmetric/AbstractTest.php b/test/Symmetric/AbstractTest.php
@@ -3,12 +3,12 @@
 namespace LaminasTest\Crypt\Symmetric;
 
 use ArrayObject;
-use Interop\Container\ContainerInterface;
 use Laminas\Crypt\Symmetric\Exception;
 use Laminas\Crypt\Symmetric\Padding\NoPadding;
 use Laminas\Crypt\Symmetric\Padding\PKCS7;
 use Laminas\Math\Rand;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 use stdClass;
 
 use function file_get_contents;

diff --git a/test/Symmetric/Padding/PaddingPluginManagerTest.php b/test/Symmetric/Padding/PaddingPluginManagerTest.php
@@ -2,11 +2,11 @@
 
 namespace LaminasTest\Crypt\Symmetric\Padding;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Crypt\Symmetric\Exception;
 use Laminas\Crypt\Symmetric\Padding\PaddingInterface;
 use Laminas\Crypt\Symmetric\PaddingPluginManager;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 class PaddingPluginManagerTest extends TestCase
 {

diff --git a/test/SymmetricPluginManagerTest.php b/test/SymmetricPluginManagerTest.php
@@ -2,12 +2,12 @@
 
 namespace LaminasTest\Crypt;
 
-use Interop\Container\ContainerInterface;
 use Laminas\Crypt\Exception as CryptException;
 use Laminas\Crypt\Symmetric\Exception;
 use Laminas\Crypt\Symmetric\SymmetricInterface;
 use Laminas\Crypt\SymmetricPluginManager;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 use function extension_loaded;