TASK: Upgrade psr/container dependency from ^1.0 to ^1.0 || 2.0

Author: mficzel

Neos.Flow/Classes/ObjectManagement/ObjectManager.php

@@ -164,7 +164,7 @@ public function isRegistered($objectName): bool
      * @param string $objectName
      * @return bool
      */
-    public function has($objectName): bool
+    public function has(string $objectName): bool
     {
         return $this->isRegistered($objectName);
     }
@@ -200,7 +200,7 @@ public function registerShutdownObject($object, $shutdownLifecycleMethodName): v
      * @throws InvalidConfigurationTypeException
      * @api
      */
-    public function get($objectName, ...$constructorArguments): object
+    public function get(string $objectName, ...$constructorArguments): object
     {
         if (!empty($constructorArguments) && isset($this->objects[$objectName]) && $this->objects[$objectName][self::KEY_SCOPE] !== ObjectConfiguration::SCOPE_PROTOTYPE) {
             throw new \InvalidArgumentException('You cannot provide constructor arguments for singleton objects via get(). If you need to pass arguments to the constructor, define them in the Objects.yaml configuration.', 1298049934);

Neos.Flow/Classes/ObjectManagement/ObjectManagerInterface.php

@@ -50,7 +50,7 @@ public function getContext();
      * @return T The object instance
      * @api
      */
-    public function get($objectName, ...$constructorArguments);
+    public function get(string $objectName, ...$constructorArguments);
 
     /**
      * This is the PSR-11 ContainerInterface equivalent to `isRegistered`.
@@ -59,7 +59,7 @@ public function get($objectName, ...$constructorArguments);
      * @return bool
      * @see isRegistered
      */
-    public function has($objectName);
+    public function has(string $objectName): bool;
 
     /**
      * Returns true if an object with the given name has already

Neos.Flow/composer.json

@@ -33,7 +33,7 @@
 
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/container": "^1.0",
+        "psr/container": "^1.0 || ^2.0",
         "psr/log": "^2.0 || ^3.0",
         "psr/http-server-middleware": "^1.0",
         "psr/http-server-handler": "^1.0",

composer.json

@@ -30,7 +30,7 @@
         "neos/composer-plugin": "^2.0",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
-        "psr/container": "^1.0",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-server-middleware": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-client": "^1.0",