Backporting psr/container ^2.0 change from laminas/laminas-serviceman…

…ager#188

composer.json

@@ -23,7 +23,7 @@
     "require": {
         "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
         "laminas/laminas-stdlib": "^3.17",
-        "psr/container": "^1.0"
+        "psr/container": "^1.1 || ^2.0"
     },
     "require-dev": {
         "composer/package-versions-deprecated": "^1.11.99.5",
@@ -37,17 +37,14 @@
         "psalm/plugin-phpunit": "^0.18.4",
         "vimeo/psalm": "^5.8.0"
     },
-    "replace": {
-        "container-interop/container-interop": "^1.2.0"
-    },
     "conflict": {
         "ext-psr": "*",
         "laminas/laminas-code": "<4.10.0",
         "zendframework/zend-code": "<3.3.1",
         "zendframework/zend-servicemanager": "*"
     },
     "provide": {
-        "psr/container-implementation": "^1.0"
+        "psr/container-implementation": "^1.0 || ^2.0"
     },
     "suggest": {
         "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services"

psalm-baseline.xml

@@ -218,10 +218,6 @@
       <code>$factory</code>
       <code><![CDATA[(callable(ContainerInterface,string,array<mixed>|null):object)|Factory\FactoryInterface]]></code>
     </MixedReturnTypeCoercion>
-    <ParamNameMismatch>
-      <code>$name</code>
-      <code>$name</code>
-    </ParamNameMismatch>
     <RedundantCastGivenDocblockType>
       <code>(bool) $flag</code>
       <code>(bool) $flag</code>

src/AbstractPluginManager.php

@@ -143,7 +143,6 @@ public function setService($name, $service)
 
     /**
      * @param class-string<InstanceType>|string $name Service name of plugin to retrieve.
-     * @param null|array<mixed> $options Options to use when creating the instance.
      * @return mixed
      * @psalm-return ($name is class-string<InstanceType> ? InstanceType : mixed)
      * @throws Exception\ServiceNotFoundException If the manager does not have
@@ -152,21 +151,21 @@ public function setService($name, $service)
      * @throws InvalidServiceException If the plugin created is invalid for the
      *     plugin context.
      */
-    public function get($name, ?array $options = null)
+    public function get(string $id): mixed
     {
-        if (! $this->has($name)) {
-            if (! $this->autoAddInvokableClass || ! class_exists($name)) {
+        if (! $this->has($id)) {
+            if (! $this->autoAddInvokableClass || ! class_exists($id)) {
                 throw new Exception\ServiceNotFoundException(sprintf(
                     'A plugin by the name "%s" was not found in the plugin manager %s',
-                    $name,
+                    $id,
                     static::class
                 ));
             }
 
-            $this->setFactory($name, Factory\InvokableFactory::class);
+            $this->setFactory($id, Factory\InvokableFactory::class);
         }
 
-        $instance = ! $options ? parent::get($name) : $this->build($name, $options);
+        $instance = parent::get($id);
         $this->validate($instance);
         return $instance;
     }

src/ServiceManager.php

@@ -219,34 +219,34 @@ public function getServiceLocator()
     }
 
     /** {@inheritDoc} */
-    public function get($name)
+    public function get(string $id): mixed
     {
         // We start by checking if we have cached the requested service;
         // this is the fastest method.
-        if (isset($this->services[$name])) {
-            return $this->services[$name];
+        if (isset($this->services[$id])) {
+            return $this->services[$id];
         }
 
         // Determine if the service should be shared.
-        $sharedService = $this->shared[$name] ?? $this->sharedByDefault;
+        $sharedService = $this->shared[$id] ?? $this->sharedByDefault;
 
         // We achieve better performance if we can let all alias
         // considerations out.
         if (! $this->aliases) {
-            $object = $this->doCreate($name);
+            $object = $this->doCreate($id);
 
             // Cache the object for later, if it is supposed to be shared.
             if ($sharedService) {
-                $this->services[$name] = $object;
+                $this->services[$id] = $object;
             }
             return $object;
         }
 
         // We now deal with requests which may be aliases.
-        $resolvedName = $this->aliases[$name] ?? $name;
+        $resolvedName = $this->aliases[$id] ?? $id;
 
         // Update shared service information as we checked if the alias was shared before.
-        if ($resolvedName !== $name) {
+        if ($resolvedName !== $id) {
             $sharedService = $this->shared[$resolvedName] ?? $sharedService;
         }
 
@@ -255,7 +255,7 @@ public function get($name)
 
         // If the alias is configured as a shared service, we are done.
         if ($sharedAlias) {
-            $this->services[$name] = $this->services[$resolvedName];
+            $this->services[$id] = $this->services[$resolvedName];
             return $this->services[$resolvedName];
         }
 
@@ -271,7 +271,7 @@ public function get($name)
         // Also cache under the alias name; this allows sharing based on the
         // service name used.
         if ($sharedAlias) {
-            $this->services[$name] = $object;
+            $this->services[$id] = $object;
         }
 
         return $object;
@@ -291,10 +291,10 @@ public function build($name, ?array $options = null)
      * @param string|class-string $name
      * @return bool
      */
-    public function has($name)
+    public function has(string $id): bool
     {
         // Check static services and factories first to speedup the most common requests.
-        return $this->staticServiceOrFactoryCanCreate($name) || $this->abstractFactoryCanCreate($name);
+        return $this->staticServiceOrFactoryCanCreate($id) || $this->abstractFactoryCanCreate($id);
     }
 
     /**