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

# Conflicts: # Neos.Flow/Documentation/TheDefinitiveGuide/PartV/AnnotationReference.rst # Neos.Flow/Documentation/TheDefinitiveGuide/PartV/CommandReference.rst # Neos.Flow/Documentation/TheDefinitiveGuide/PartV/SignalsReference.rst # Neos.Flow/Documentation/TheDefinitiveGuide/PartV/TypeConverterReference.rst # Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ValidatorReference.rst
neos · May 5, 2023 · ed4ce00 · ed4ce00
2 parents af6ade4 + 32b0217
commit ed4ce00
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 20 deletions.
diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/AnnotationReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/AnnotationReference.rst
@@ -3,7 +3,7 @@
 Flow Annotation Reference
 =========================
 
-This reference was automatically generated from code on 2023-04-21
+This reference was automatically generated from code on 2023-05-05
 
 
 .. _`Flow Annotation Reference: After`:
@@ -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/ChangeLogs/7311.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ChangeLogs/7311.rst
@@ -0,0 +1,54 @@
+`7.3.11 (2023-04-21) <https://github.com/neos/flow-development-collection/releases/tag/7.3.11>`_
+================================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Adjust psalm baseline <https://github.com/neos/flow-development-collection/pull/3020>`_
+------------------------------------------------------------------------------------------------
+
+
+
+* Packages: ``Flow``
+
+`TASK: Upgrade psalm to version 4.30.0 <https://github.com/neos/flow-development-collection/pull/3019>`_
+--------------------------------------------------------------------------------------------------------
+
+Upgrades psalm to version 4.30.0 to prevent issues.
+
+* Packages: ``.github`` ``Flow``
+
+`TASK: Apply fixes from StyleCI <https://github.com/neos/flow-development-collection/pull/2985>`_
+-------------------------------------------------------------------------------------------------
+
+This pull request applies code style fixes from an analysis carried out by `StyleCI <https://github.styleci.io>`_.
+
+---
+
+For more information, click `here <https://github.styleci.io/analyses/N4xEny>`_.
+
+* Packages: ``Flow`` ``Cache`` ``Eel`` ``FluidAdaptor`` ``Utility.ObjectHandling`` ``Utility.Unicode``
+
+`TASK: Fix `ProtectedContext` tests <https://github.com/neos/flow-development-collection/pull/2977>`_
+-----------------------------------------------------------------------------------------------------
+
+**Upgrade instructions**
+
+**Review instructions**
+
+Only using ``Array`` doesn`t work as allow path and we need to use the glob star.
+This was previously not noticed because expectException is set to early
+
+
+* Packages: ``Flow`` ``Eel``
+
+`TASK: extending phpstorm autocomplete information, focused on attributes <https://github.com/neos/flow-development-collection/pull/2961>`_
+-------------------------------------------------------------------------------------------------------------------------------------------
+
+This only adds some autocomplete hints to PHP-Storm, especially the Validate and Scope - Attributes.
+
+
+* Packages: ``Flow``
+
+`Detailed log <https://github.com/neos/flow-development-collection/compare/7.3.10...7.3.11>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ChangeLogs/808.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ChangeLogs/808.rst
@@ -0,0 +1,54 @@
+`8.0.8 (2023-04-21) <https://github.com/neos/flow-development-collection/releases/tag/8.0.8>`_
+==============================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Adjust psalm baseline <https://github.com/neos/flow-development-collection/pull/3020>`_
+------------------------------------------------------------------------------------------------
+
+
+
+* Packages: ``Flow``
+
+`TASK: Upgrade psalm to version 4.30.0 <https://github.com/neos/flow-development-collection/pull/3019>`_
+--------------------------------------------------------------------------------------------------------
+
+Upgrades psalm to version 4.30.0 to prevent issues.
+
+* Packages: ``.github`` ``Flow``
+
+`TASK: Apply fixes from StyleCI <https://github.com/neos/flow-development-collection/pull/2985>`_
+-------------------------------------------------------------------------------------------------
+
+This pull request applies code style fixes from an analysis carried out by `StyleCI <https://github.styleci.io>`_.
+
+---
+
+For more information, click `here <https://github.styleci.io/analyses/N4xEny>`_.
+
+* Packages: ``Flow`` ``Cache`` ``Eel`` ``FluidAdaptor`` ``Utility.ObjectHandling`` ``Utility.Unicode``
+
+`TASK: Fix `ProtectedContext` tests <https://github.com/neos/flow-development-collection/pull/2977>`_
+-----------------------------------------------------------------------------------------------------
+
+**Upgrade instructions**
+
+**Review instructions**
+
+Only using ``Array`` doesn`t work as allow path and we need to use the glob star.
+This was previously not noticed because expectException is set to early
+
+
+* Packages: ``Flow`` ``Eel``
+
+`TASK: extending phpstorm autocomplete information, focused on attributes <https://github.com/neos/flow-development-collection/pull/2961>`_
+-------------------------------------------------------------------------------------------------------------------------------------------
+
+This only adds some autocomplete hints to PHP-Storm, especially the Validate and Scope - Attributes.
+
+
+* Packages: ``Flow``
+
+`Detailed log <https://github.com/neos/flow-development-collection/compare/8.0.7...8.0.8>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ChangeLogs/814.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ChangeLogs/814.rst
@@ -0,0 +1,54 @@
+`8.1.4 (2023-04-21) <https://github.com/neos/flow-development-collection/releases/tag/8.1.4>`_
+==============================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Adjust psalm baseline <https://github.com/neos/flow-development-collection/pull/3020>`_
+------------------------------------------------------------------------------------------------
+
+
+
+* Packages: ``Flow``
+
+`TASK: Upgrade psalm to version 4.30.0 <https://github.com/neos/flow-development-collection/pull/3019>`_
+--------------------------------------------------------------------------------------------------------
+
+Upgrades psalm to version 4.30.0 to prevent issues.
+
+* Packages: ``.github`` ``Flow``
+
+`TASK: Apply fixes from StyleCI <https://github.com/neos/flow-development-collection/pull/2985>`_
+-------------------------------------------------------------------------------------------------
+
+This pull request applies code style fixes from an analysis carried out by `StyleCI <https://github.styleci.io>`_.
+
+---
+
+For more information, click `here <https://github.styleci.io/analyses/N4xEny>`_.
+
+* Packages: ``Flow`` ``Cache`` ``Eel`` ``FluidAdaptor`` ``Utility.ObjectHandling`` ``Utility.Unicode``
+
+`TASK: Fix `ProtectedContext` tests <https://github.com/neos/flow-development-collection/pull/2977>`_
+-----------------------------------------------------------------------------------------------------
+
+**Upgrade instructions**
+
+**Review instructions**
+
+Only using ``Array`` doesn`t work as allow path and we need to use the glob star.
+This was previously not noticed because expectException is set to early
+
+
+* Packages: ``Flow`` ``Eel``
+
+`TASK: extending phpstorm autocomplete information, focused on attributes <https://github.com/neos/flow-development-collection/pull/2961>`_
+-------------------------------------------------------------------------------------------------------------------------------------------
+
+This only adds some autocomplete hints to PHP-Storm, especially the Validate and Scope - Attributes.
+
+
+* Packages: ``Flow``
+
+`Detailed log <https://github.com/neos/flow-development-collection/compare/8.1.3...8.1.4>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/CommandReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/CommandReference.rst
@@ -19,7 +19,7 @@ commands that may be available, use::
 
   ./flow help
 
-The following reference was automatically generated from code on 2023-04-21
+The following reference was automatically generated from code on 2023-05-05
 
 
 .. _`Flow Command Reference: NEOS.FLOW`:
@@ -170,7 +170,7 @@ Arguments
 ^^^^^^^^^
 
 ``--cache-identifier``
-  
+
 
 
 

diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/SignalsReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/SignalsReference.rst
@@ -3,7 +3,7 @@
 Flow Signals Reference
 ======================
 
-This reference was automatically generated from code on 2023-04-21
+This reference was automatically generated from code on 2023-05-05
 
 
 .. _`Flow Signals Reference: AbstractAdvice (``Neos\Flow\Aop\Advice\AbstractAdvice``)`:

diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/TypeConverterReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/TypeConverterReference.rst
@@ -3,7 +3,7 @@
 Flow TypeConverter Reference
 ============================
 
-This reference was automatically generated from code on 2023-04-21
+This reference was automatically generated from code on 2023-05-05
 
 
 .. _`Flow TypeConverter Reference: ArrayConverter`:

diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ValidatorReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/ValidatorReference.rst
@@ -3,7 +3,7 @@
 Flow Validator Reference
 ========================
 
-This reference was automatically generated from code on 2023-04-21
+This reference was automatically generated from code on 2023-05-05
 
 
 .. _`Flow Validator Reference: AggregateBoundaryValidator`:

diff --git a/Neos.FluidAdaptor/composer.json b/Neos.FluidAdaptor/composer.json
@@ -11,7 +11,7 @@
     "neos/cache": "*",
     "neos/utility-files": "*",
     "neos/utility-objecthandling": "*",
-    "typo3fluid/fluid": "^2.7.0",
+    "typo3fluid/fluid": "~2.7.0",
     "psr/log": "^2.0 || ^3.0"
   },
   "autoload": {

diff --git a/composer.json b/composer.json
@@ -6,10 +6,10 @@
     ],
     "type": "neos-package-collection",
     "require": {
-        "php": "^8.0",
-        "psr/simple-cache": "^2.0 || ^3.0",
-        "psr/cache": "^2.0 || ^3.0",
-        "psr/log": "^2.0 || ^3.0",
+        "php": "^7.3 || ^8.0",
+        "psr/simple-cache": "^1.0",
+        "psr/cache": "~1.0",
+        "psr/log": "^1.0",
         "ext-zlib": "*",
         "ext-SPL": "*",
         "ext-json": "*",
@@ -20,7 +20,6 @@
         "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",
@@ -33,7 +32,7 @@
         "neos/composer-plugin": "^2.0",
         "composer/composer": "^1.10.22 || ^2.0.13",
         "egulias/email-validator": "^2.1.17 || ^3.0",
-        "typo3fluid/fluid": "^2.7.0",
+        "typo3fluid/fluid": "~2.7.0",
         "guzzlehttp/psr7": "^1.8.4 || ^2.1.1",
         "ext-mbstring": "*"
     },
@@ -42,8 +41,6 @@
         "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",
@@ -123,7 +120,7 @@
         }
     },
     "require-dev": {
-        "mikey179/vfsstream": "^1.6.10",
+        "mikey179/vfsstream": "^1.6.1",
         "phpunit/phpunit": "~9.1",
         "vimeo/psalm": "~4.30.0"
     },