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

neos · Dec 21, 2023 · 877a263 · 877a263
2 parents 2d39e63 + ce38b47
commit 877a263
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
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>`_
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~