Merge remote-tracking branch 'origin/8.1' into 8.2

neos · May 5, 2023 · 497e9dd · 497e9dd
2 parents ed4ce00 + 24b5b8d
commit 497e9dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/AnnotationReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/AnnotationReference.rst
@@ -290,16 +290,16 @@ Arguments
 
 * ``path`` (string|null): Path of a configuration which should be injected into the property.
   Can be specified as anonymous argument: InjectConfiguration("some.path")
-
+  
   For type "Settings" this refers to the relative path (excluding the package key)
-
+  
   Example: session.name
 
 * ``package`` (string|null): Defines the package key to be used for retrieving settings. If no package key is specified, we'll assume the
   package to be the same which contains the class where the InjectConfiguration annotation is used.
-
+  
   Note: This property is only supported for type "Settings"
-
+  
   Example: Neos.Flow
 
 * ``type`` (string one of the ConfigurationManager::CONFIGURATION_TYPE_* constants): Type of Configuration (defaults to "Settings").

diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/CommandReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/CommandReference.rst
@@ -170,7 +170,7 @@ Arguments
 ^^^^^^^^^
 
 ``--cache-identifier``
-
+  
 
 
 

diff --git a/composer.json b/composer.json
@@ -6,10 +6,10 @@
     ],
     "type": "neos-package-collection",
     "require": {
-        "php": "^7.3 || ^8.0",
-        "psr/simple-cache": "^1.0",
-        "psr/cache": "~1.0",
-        "psr/log": "^1.0",
+        "php": "^8.0",
+        "psr/simple-cache": "^2.0 || ^3.0",
+        "psr/cache": "^2.0 || ^3.0",
+        "psr/log": "^2.0 || ^3.0",
         "ext-zlib": "*",
         "ext-SPL": "*",
         "ext-json": "*",
@@ -20,6 +20,7 @@
         "psr/container": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "psr/http-server-handler": "^1.0",
+        "psr/http-client": "^1.0",
         "ramsey/uuid": "^3.0 || ^4.0",
         "doctrine/orm": "^2.9.3",
         "doctrine/migrations": "^3.0",
@@ -41,6 +42,8 @@
         "symfony/polyfill-php71": "*",
         "symfony/polyfill-php72": "*",
         "symfony/polyfill-php73": "*",
+        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*",
         "symfony/polyfill-mbstring": "*",
         "neos/cache": "self.version",
         "neos/eel": "self.version",
@@ -120,7 +123,7 @@
         }
     },
     "require-dev": {
-        "mikey179/vfsstream": "^1.6.1",
+        "mikey179/vfsstream": "^1.6.10",
         "phpunit/phpunit": "~9.1",
         "vimeo/psalm": "~4.30.0"
     },