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

neos · Dec 21, 2023 · 255e588 · 255e588
2 parents e264d97 + f25da6f
commit 255e588
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 21 deletions.
diff --git a/.composer.json b/.composer.json
@@ -4,8 +4,7 @@
   "license": ["GPL-3.0-or-later"],
   "type": "neos-package-collection",
   "require": {
-    "neos/flow-development-collection": "8.1.x-dev",
-    "neos/neos-setup": "^1.0"
+    "neos/flow-development-collection": "8.1.x-dev"
   },
   "replace": {
   },

diff --git a/Neos.ContentRepository/Classes/Command/NodeCommandControllerPlugin.php b/Neos.ContentRepository/Classes/Command/NodeCommandControllerPlugin.php
@@ -833,7 +833,16 @@ public function removeBrokenEntityReferences($workspaceName)
                             $convertedProperty->__load();
                         } /** @noinspection PhpRedundantCatchClauseInspection */ catch (EntityNotFoundException $e) {
                             $nodesWithBrokenEntityReferences[$nodeData->getIdentifier()][$propertyName] = $nodeData;
-                            $this->dispatch(self::EVENT_NOTICE, sprintf('Broken reference in "<i>%s</i>" (%s), property "<i>%s</i>" (<i>%s</i>) referring to <i>%s</i>.', $nodeData->getPath(), $nodeData->getIdentifier(), $propertyName, $propertyType, $propertyValue));
+                            $this->dispatch(self::EVENT_NOTICE, sprintf(
+                                'Broken reference in "<i>%s</i>" (%s), property "<i>%s</i>" (<i>%s</i>)%s.',
+                                $nodeData->getPath(),
+                                $nodeData->getIdentifier(),
+                                $propertyName,
+                                $propertyType,
+                                method_exists($propertyValue, '__toString') ?
+                                    ' referring to <i>' . $propertyValue->__toString() . '</i>' :
+                                    ''
+                            ));
                             $brokenReferencesCount ++;
                         }
                     }

diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/7318.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/7318.rst
@@ -0,0 +1,19 @@
+`7.3.18 (2023-12-13) <https://github.com/neos/neos-development-collection/releases/tag/7.3.18>`_
+================================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Filter for assets by asset collection by using constraints <https://github.com/neos/neos-development-collection/pull/4802>`_
+-------------------------------------------------------------------------------------------------------------------------------------
+
+Fixes a bug, that was introduced with: https://github.com/neos/neos-development-collection/pull/4724
+
+Because of using the QueryBuilder twice, the count of the paramter and for the query is not correct anymore.
+
+* Fixes: `#4801 <https://github.com/neos/neos-development-collection/issues/4801>`_
+
+* Packages: ``Neos`` ``Media``
+
+`Detailed log <https://github.com/neos/neos-development-collection/compare/7.3.17...7.3.18>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/8015.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/8015.rst
@@ -0,0 +1,19 @@
+`8.0.15 (2023-12-13) <https://github.com/neos/neos-development-collection/releases/tag/8.0.15>`_
+================================================================================================
+
+Overview of merged pull requests
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`BUGFIX: Filter for assets by asset collection by using constraints <https://github.com/neos/neos-development-collection/pull/4802>`_
+-------------------------------------------------------------------------------------------------------------------------------------
+
+Fixes a bug, that was introduced with: https://github.com/neos/neos-development-collection/pull/4724
+
+Because of using the QueryBuilder twice, the count of the paramter and for the query is not correct anymore.
+
+* Fixes: `#4801 <https://github.com/neos/neos-development-collection/issues/4801>`_
+
+* Packages: ``Neos`` ``Media``
+
+`Detailed log <https://github.com/neos/neos-development-collection/compare/8.0.14...8.0.15>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst
@@ -19,7 +19,7 @@ commands that may be available, use::
 
   ./flow help
 
-The following reference was automatically generated from code on 2023-12-13
+The following reference was automatically generated from code on 2023-12-21
 
 
 .. _`Neos Command Reference: NEOS.CONTENTREPOSITORY`:

diff --git a/Neos.Neos/Documentation/References/EelHelpersReference.rst b/Neos.Neos/Documentation/References/EelHelpersReference.rst
@@ -3,7 +3,7 @@
 Eel Helpers Reference
 =====================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Eel Helpers Reference: Api`:

diff --git a/Neos.Neos/Documentation/References/FlowQueryOperationReference.rst b/Neos.Neos/Documentation/References/FlowQueryOperationReference.rst
@@ -3,7 +3,7 @@
 FlowQuery Operation Reference
 =============================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`FlowQuery Operation Reference: add`:

diff --git a/Neos.Neos/Documentation/References/Signals/ContentRepository.rst b/Neos.Neos/Documentation/References/Signals/ContentRepository.rst
@@ -3,7 +3,7 @@
 Content Repository Signals Reference
 ====================================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Content Repository Signals Reference: Context (``Neos\ContentRepository\Domain\Service\Context``)`:

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

diff --git a/Neos.Neos/Documentation/References/Signals/Media.rst b/Neos.Neos/Documentation/References/Signals/Media.rst
@@ -3,7 +3,7 @@
 Media Signals Reference
 =======================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Media Signals Reference: AssetCollectionController (``Neos\Media\Browser\Controller\AssetCollectionController``)`:

diff --git a/Neos.Neos/Documentation/References/Signals/Neos.rst b/Neos.Neos/Documentation/References/Signals/Neos.rst
@@ -3,7 +3,7 @@
 Neos Signals Reference
 ======================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Neos Signals Reference: AbstractCreate (``Neos\Neos\Ui\Domain\Model\Changes\AbstractCreate``)`:

diff --git a/Neos.Neos/Documentation/References/Validators/Flow.rst b/Neos.Neos/Documentation/References/Validators/Flow.rst
@@ -3,7 +3,7 @@
 Flow Validator Reference
 ========================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Flow Validator Reference: AggregateBoundaryValidator`:

diff --git a/Neos.Neos/Documentation/References/Validators/Media.rst b/Neos.Neos/Documentation/References/Validators/Media.rst
@@ -3,7 +3,7 @@
 Media Validator Reference
 =========================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Media Validator Reference: ImageOrientationValidator`:

diff --git a/Neos.Neos/Documentation/References/Validators/Party.rst b/Neos.Neos/Documentation/References/Validators/Party.rst
@@ -3,7 +3,7 @@
 Party Validator Reference
 =========================
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Party Validator Reference: AimAddressValidator`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/ContentRepository.rst b/Neos.Neos/Documentation/References/ViewHelpers/ContentRepository.rst
@@ -3,7 +3,7 @@
 Content Repository ViewHelper Reference
 #######################################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Content Repository ViewHelper Reference: PaginateViewHelper`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
@@ -3,7 +3,7 @@
 FluidAdaptor ViewHelper Reference
 #################################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`FluidAdaptor ViewHelper Reference: f:debug`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
@@ -3,7 +3,7 @@
 Form ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Form ViewHelper Reference: neos.form:form`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst b/Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst
@@ -3,7 +3,7 @@
 Fusion ViewHelper Reference
 ###########################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Fusion ViewHelper Reference: fusion:render`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
@@ -3,7 +3,7 @@
 Media ViewHelper Reference
 ##########################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
@@ -3,7 +3,7 @@
 Neos ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
@@ -3,7 +3,7 @@
 TYPO3 Fluid ViewHelper Reference
 ################################
 
-This reference was automatically generated from code on 2023-12-13
+This reference was automatically generated from code on 2023-12-21
 
 
 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`:

diff --git a/composer.json b/composer.json
@@ -7,7 +7,6 @@
     "type": "neos-package-collection",
     "require": {
         "neos/flow-development-collection": "8.1.x-dev",
-        "neos/neos-setup": "^1.0",
         "php": "^8.0",
         "neos/flow": "*",
         "neos/cache": "*",