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 · Apr 19, 2023 · 9fedbcc · 9fedbcc
2 parents 907b37b + 3eb0876
commit 9fedbcc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/doctum.yml b/.github/workflows/doctum.yml
@@ -37,6 +37,10 @@ jobs:
           git config --local --unset-all "http.https://github.com/.extraheader"
           git config --global user.email "ops@neos.io"
           git config --global user.name "Neos Bot"
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "No changes to commit"
+            exit 0
+          fi
           git add .
           git commit -m "TASK: Update API docs from ${{ github.ref_name }}"
 

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``
-  
+
 
 
 
@@ -452,6 +452,23 @@ Arguments
 
 
 
+.. _`Flow Command Reference: NEOS.FLOW neos.flow:core:shell`:
+
+``neos.flow:core:shell``
+************************
+
+**Run the interactive Shell**
+
+The shell command runs Flow's interactive shell. This shell allows for
+entering commands like through the regular command line interface but
+additionally supports autocompletion and a user-based command history.
+
+
+
+
+
+
+
 .. _`Flow Command Reference: NEOS.FLOW neos.flow:database:setcharset`:
 
 ``neos.flow:database:setcharset``

diff --git a/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/SignalsReference.rst b/Neos.Flow/Documentation/TheDefinitiveGuide/PartV/SignalsReference.rst
@@ -477,8 +477,8 @@ before passing it on to further rendering
 
 .. _`Flow Signals Reference: SlaveRequestHandler (``Neos\Flow\Cli\SlaveRequestHandler``)`:
 
-SlaveRequestHandler (``Neos\Flow\Cli\SlaveRequestHandler``) (deprecated)
-------------------------------------------------------------------------
+SlaveRequestHandler (``Neos\Flow\Cli\SlaveRequestHandler``)
+-----------------------------------------------------------
 
 This class contains the following signals.
 
@@ -490,9 +490,6 @@ Emits a signal that a CLI slave request was dispatched.
 
 
 
-**DEPRECATED** This will probably move to a separate package and be renamed in a future version, you should not rely on it.
-
-
 
 
 .. _`Flow Signals Reference: StandardController (``Neos\Flow\Mvc\Controller\StandardController``)`: