From 0dbf005f2c3b22fea8673f2413b100ca05ea75fb Mon Sep 17 00:00:00 2001
From: Marcel Thole <marcel@marcelthole.de>
Date: Mon, 15 Jul 2024 11:29:38 +0200
Subject: [PATCH 1/2] Allow psr/container v2

Signed-off-by: Marcel Thole <marcel@marcelthole.de>
---
 composer.json                          | 2 +-
 composer.lock                          | 6 +++---
 src/Symmetric/PaddingPluginManager.php | 8 ++------
 src/SymmetricPluginManager.php         | 8 ++------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/composer.json b/composer.json
index 10cfbdc3..95ad6790 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "ext-mbstring": "*",
         "laminas/laminas-math": "^3.4",
         "laminas/laminas-stdlib": "^3.8",
-        "psr/container": "^1.1"
+        "psr/container": "^1.1 || ^2.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.4.0",
diff --git a/composer.lock b/composer.lock
index bbbc29e8..a61a0fb0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "19311d0dfaaf5ea3310ccbed134ba734",
+    "content-hash": "e7317805781232fe01860ac47b8a5a11",
     "packages": [
         {
             "name": "laminas/laminas-math",
@@ -2105,12 +2105,12 @@
             "version": "3.7.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
                 "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
                 "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
                 "shasum": ""
             },
diff --git a/src/Symmetric/PaddingPluginManager.php b/src/Symmetric/PaddingPluginManager.php
index 10a70f54..4d2acd29 100644
--- a/src/Symmetric/PaddingPluginManager.php
+++ b/src/Symmetric/PaddingPluginManager.php
@@ -25,11 +25,8 @@ class PaddingPluginManager implements ContainerInterface
 
     /**
      * Do we have the padding plugin?
-     *
-     * @param  string $id
-     * @return bool
      */
-    public function has($id)
+    public function has(string $id): bool
     {
         return array_key_exists($id, $this->paddings);
     }
@@ -37,10 +34,9 @@ public function has($id)
     /**
      * Retrieve the padding plugin
      *
-     * @param  string $id
      * @return Padding\PaddingInterface
      */
-    public function get($id)
+    public function get(string $id)
     {
         if (! $this->has($id)) {
             throw new Exception\NotFoundException(sprintf(
diff --git a/src/SymmetricPluginManager.php b/src/SymmetricPluginManager.php
index 6434d159..021913cf 100644
--- a/src/SymmetricPluginManager.php
+++ b/src/SymmetricPluginManager.php
@@ -28,11 +28,8 @@ class SymmetricPluginManager implements ContainerInterface
 
     /**
      * Do we have the symmetric plugin?
-     *
-     * @param  string $id
-     * @return bool
      */
-    public function has($id)
+    public function has(string $id): bool
     {
         return array_key_exists($id, $this->symmetric);
     }
@@ -40,10 +37,9 @@ public function has($id)
     /**
      * Retrieve the symmetric plugin
      *
-     * @param  string $id
      * @return Symmetric\SymmetricInterface
      */
-    public function get($id)
+    public function get(string $id)
     {
         if (! $this->has($id)) {
             throw new Exception\NotFoundException(sprintf(

From e0ac25a7b74208157a731e406f0e2fc80e48cd57 Mon Sep 17 00:00:00 2001
From: Marcel Thole <marcel@marcelthole.de>
Date: Mon, 15 Jul 2024 12:58:08 +0200
Subject: [PATCH 2/2] use final on PluginManager to avoid backwards
 compatibility breaks with psr/container

---
 src/Symmetric/PaddingPluginManager.php | 2 +-
 src/SymmetricPluginManager.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Symmetric/PaddingPluginManager.php b/src/Symmetric/PaddingPluginManager.php
index 4d2acd29..14362eb2 100644
--- a/src/Symmetric/PaddingPluginManager.php
+++ b/src/Symmetric/PaddingPluginManager.php
@@ -14,7 +14,7 @@
  * Padding\PaddingInterface. Additionally, it registers a number of default
  * padding adapters available.
  */
-class PaddingPluginManager implements ContainerInterface
+final class PaddingPluginManager implements ContainerInterface
 {
     /** @var array<string, string> */
     private $paddings = [
diff --git a/src/SymmetricPluginManager.php b/src/SymmetricPluginManager.php
index 021913cf..83db8b68 100644
--- a/src/SymmetricPluginManager.php
+++ b/src/SymmetricPluginManager.php
@@ -14,7 +14,7 @@
  * Symmetric\SymmetricInterface. Additionally, it registers a number of default
  * symmetric adapters available.
  */
-class SymmetricPluginManager implements ContainerInterface
+final class SymmetricPluginManager implements ContainerInterface
 {
     /**
      * Default set of symmetric adapters