Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/8.1' into 8.2
Browse files Browse the repository at this point in the history
# Conflicts:
#	psalm-baseline.xml
  • Loading branch information
markusguenther committed Apr 20, 2023
2 parents a4f5837 + c4cc244 commit 24fc312
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flow Annotation Reference
=========================

This reference was automatically generated from code on 2023-04-19
This reference was automatically generated from code on 2023-04-20


.. _`Flow Annotation Reference: After`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ commands that may be available, use::

./flow help

The following reference was automatically generated from code on 2023-04-19
The following reference was automatically generated from code on 2023-04-20


.. _`Flow Command Reference: NEOS.FLOW`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flow Signals Reference
======================

This reference was automatically generated from code on 2023-04-19
This reference was automatically generated from code on 2023-04-20


.. _`Flow Signals Reference: AbstractAdvice (``Neos\Flow\Aop\Advice\AbstractAdvice``)`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flow TypeConverter Reference
============================

This reference was automatically generated from code on 2023-04-19
This reference was automatically generated from code on 2023-04-20


.. _`Flow TypeConverter Reference: ArrayConverter`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Flow Validator Reference
========================

This reference was automatically generated from code on 2023-04-19
This reference was automatically generated from code on 2023-04-20


.. _`Flow Validator Reference: AggregateBoundaryValidator`:
Expand Down
2 changes: 1 addition & 1 deletion Neos.Flow/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"egulias/email-validator": "^2.1.17 || ^3.0"
},
"require-dev": {
"vimeo/psalm": "~4.22.0",
"vimeo/psalm": "~4.30.0",
"mikey179/vfsstream": "^1.6.10",
"phpunit/phpunit": "~9.1"
},
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"require-dev": {
"mikey179/vfsstream": "^1.6.10",
"phpunit/phpunit": "~9.1",
"vimeo/psalm": "~4.22.0"
"vimeo/psalm": "~4.30.0"
},
"autoload-dev": {
"psr-4": {
Expand Down

0 comments on commit 24fc312

Please sign in to comment.