Merge branch '4.0.x' into typesafe-upgrades

Signed-off-by: Marcel Thole <marcel@marcelthole.de>

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.5.0",

src/Symmetric/PaddingPluginManager.php

@@ -16,7 +16,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 array $paddings = [
@@ -27,22 +27,18 @@ 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);
     }
 
     /**
      * 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(

src/SymmetricPluginManager.php

@@ -16,7 +16,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
@@ -30,22 +30,18 @@ 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);
     }
 
     /**
      * 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(