Revert "Support for psr/container v2"

.laminas-ci.json

@@ -1,15 +1,5 @@
 {
     "ignore_php_platform_requirements": {
         "8.1": true
-    },
-    "additional_checks": [
-        {
-            "name": "Psalm for psr/container v1",
-            "job": {
-                "php": "@lowest",
-                "dependencies": "locked",
-                "command": "composer require -W psr/container:^1 && vendor/bin/psalm --stats --output-format=github --no-cache"
-            }
-        }
-    ]
+    }
 }

composer.json

@@ -26,18 +26,21 @@
         },
         "sort-packages": true,
         "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true,
+            "laminas/laminas-dependency-plugin": true
         }
     },
     "require": {
         "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
-        "composer-plugin-api": "^2.0",
         "laminas/laminas-stdlib": "^3.2.1",
-        "psr/container": "^1.1 || ^2.0.2"
+        "psr/container": "^1.0"
     },
     "require-dev": {
+        "composer/package-versions-deprecated": "^1.0",
         "laminas/laminas-coding-standard": "~2.3.0",
         "laminas/laminas-container-config-test": "^0.6",
+        "laminas/laminas-dependency-plugin": "^2.1.2",
         "mikey179/vfsstream": "^1.6.10@alpha",
         "ocramius/proxy-manager": "^2.11",
         "phpbench/phpbench": "^1.1",
@@ -47,7 +50,7 @@
         "vimeo/psalm": "^4.8"
     },
     "provide": {
-        "psr/container-implementation": "^1.1 || ^2.0"
+        "psr/container-implementation": "^1.0"
     },
     "conflict": {
         "ext-psr": "*",

phpcs.xml.dist

@@ -16,8 +16,6 @@
     <file>bin</file>
     <file>src</file>
     <file>test</file>
-    <!-- psr/container v2 exclusion -->
-    <exclude-pattern>src/AbstractUntypedContainerImplementation.php</exclude-pattern>
     <exclude-pattern>test/TestAsset/laminas-code/*.php</exclude-pattern>
 
     <!-- Include all rules from the Laminas Coding Standard -->

psalm-baseline.xml

@@ -141,6 +141,10 @@
       <code>$config['services']</code>
       <code>$config['shared']</code>
     </MixedOperand>
+    <ParamNameMismatch occurrences="2">
+      <code>$name</code>
+      <code>$name</code>
+    </ParamNameMismatch>
     <RedundantCastGivenDocblockType occurrences="2">
       <code>(bool) $flag</code>
       <code>(bool) $flag</code>

psalm.xml.dist

@@ -47,22 +47,6 @@
                 <referencedClass name="Interop\Container\Exception\ContainerException"/>
             </errorLevel>
         </InvalidThrow>
-        <MethodSignatureMismatch>
-            <errorLevel type="suppress">
-                <!-- <editor-fold desc="psr/container v2 hacks"> -->
-                <file name="src/AbstractTypedContainerImplementation.php"/>
-                <file name="src/AbstractUntypedContainerImplementation.php"/>
-                <!-- </editor-fold> -->
-            </errorLevel>
-        </MethodSignatureMismatch>
-        <TypeDoesNotContainType>
-            <errorLevel type="suppress">
-                <!-- <editor-fold desc="psr/container v2 hacks"> -->
-                <file name="src/AbstractTypedContainerImplementation.php"/>
-                <file name="src/AbstractUntypedContainerImplementation.php"/>
-                <!-- </editor-fold> -->
-            </errorLevel>
-        </TypeDoesNotContainType>
     </issueHandlers>
 
     <plugins>

src/AbstractPluginManager.php

@@ -174,7 +174,8 @@ public function get($name, ?array $options = null)
     }
 
     /**
-     * @param mixed $instance
+     * {@inheritDoc}
+     *
      * @psalm-assert InstanceType $instance
      */
     public function validate($instance)