From 1ea904d0eb62d56588566862043878990a3267ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20D=C3=A4hne?= Date: Wed, 6 Dec 2023 11:52:10 +0100 Subject: [PATCH 1/3] BUGFIX: node:repair fails with could not be converted to string Fixes the following crash during node:repair ```shell ./flow node:repair --dry-run --only removeBrokenEntityReferences Dry run, not committing any changes. Checking for broken entity references ... Object of class Neos\Flow\Persistence\Doctrine\Proxies\__CG__\Neos\Media\Domain\Model\ImageVariant could not be converted to string Type: Error File: Data/Temporary/Development/SubContextWbWeb/Cache/Code/Flow_Object_Classes/Neos_ContentRepository_Command_NodeCommandControllerPlugin.php Line: 836 ``` resolved #4794 --- .../Classes/Command/NodeCommandControllerPlugin.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Neos.ContentRepository/Classes/Command/NodeCommandControllerPlugin.php b/Neos.ContentRepository/Classes/Command/NodeCommandControllerPlugin.php index ede842d7371..e04bb5aaa72 100644 --- 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 "%s" (%s), property "%s" (%s) referring to %s.', $nodeData->getPath(), $nodeData->getIdentifier(), $propertyName, $propertyType, $propertyValue)); + $this->dispatch(self::EVENT_NOTICE, sprintf( + 'Broken reference in "%s" (%s), property "%s" (%s)%s.', + $nodeData->getPath(), + $nodeData->getIdentifier(), + $propertyName, + $propertyType, + method_exists($propertyValue, '__toString') ? + ' referring to ' . $propertyValue->__toString() . '' : + '' + )); $brokenReferencesCount ++; } } From 08f9dff328b65a2d8de30a5e1951b69092bf0816 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Wed, 13 Dec 2023 21:46:44 +0000 Subject: [PATCH 2/3] TASK: Add changelog for 7.3.18 [skip ci] See https://jenkins.neos.io/job/neos-release/409/ --- .../Appendixes/ChangeLogs/7318.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Neos.Neos/Documentation/Appendixes/ChangeLogs/7318.rst diff --git a/Neos.Neos/Documentation/Appendixes/ChangeLogs/7318.rst b/Neos.Neos/Documentation/Appendixes/ChangeLogs/7318.rst new file mode 100644 index 00000000000..6ffe45df385 --- /dev/null +++ b/Neos.Neos/Documentation/Appendixes/ChangeLogs/7318.rst @@ -0,0 +1,19 @@ +`7.3.18 (2023-12-13) `_ +================================================================================================ + +Overview of merged pull requests +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +`BUGFIX: Filter for assets by asset collection by using constraints `_ +------------------------------------------------------------------------------------------------------------------------------------- + +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 `_ + +* Packages: ``Neos`` ``Media`` + +`Detailed log `_ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From ce38b47d0653aefb83c1661eb58b408c6a14af81 Mon Sep 17 00:00:00 2001 From: Jenkins Date: Wed, 20 Dec 2023 23:48:25 +0000 Subject: [PATCH 3/3] TASK: Update references [skip ci] --- Neos.Neos/Documentation/References/CommandReference.rst | 2 +- Neos.Neos/Documentation/References/EelHelpersReference.rst | 2 +- .../Documentation/References/FlowQueryOperationReference.rst | 2 +- .../Documentation/References/Signals/ContentRepository.rst | 2 +- Neos.Neos/Documentation/References/Signals/Flow.rst | 2 +- Neos.Neos/Documentation/References/Signals/Media.rst | 2 +- Neos.Neos/Documentation/References/Signals/Neos.rst | 2 +- Neos.Neos/Documentation/References/Validators/Flow.rst | 2 +- Neos.Neos/Documentation/References/Validators/Media.rst | 2 +- Neos.Neos/Documentation/References/Validators/Party.rst | 2 +- .../Documentation/References/ViewHelpers/ContentRepository.rst | 2 +- Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst | 2 +- Neos.Neos/Documentation/References/ViewHelpers/Form.rst | 2 +- Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst | 2 +- Neos.Neos/Documentation/References/ViewHelpers/Media.rst | 2 +- Neos.Neos/Documentation/References/ViewHelpers/Neos.rst | 2 +- Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst index 4cd8c6bc068..e3a63c3ab01 100644 --- 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-20 .. _`Neos Command Reference: NEOS.CONTENTREPOSITORY`: diff --git a/Neos.Neos/Documentation/References/EelHelpersReference.rst b/Neos.Neos/Documentation/References/EelHelpersReference.rst index 78e006a8012..87a66e0b0eb 100644 --- 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-20 .. _`Eel Helpers Reference: Api`: diff --git a/Neos.Neos/Documentation/References/FlowQueryOperationReference.rst b/Neos.Neos/Documentation/References/FlowQueryOperationReference.rst index 66ffaa160fd..80cb29c1601 100644 --- 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-20 .. _`FlowQuery Operation Reference: add`: diff --git a/Neos.Neos/Documentation/References/Signals/ContentRepository.rst b/Neos.Neos/Documentation/References/Signals/ContentRepository.rst index 86e66a10692..259fee69ef0 100644 --- 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-20 .. _`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 index 76ac99cfc78..69e25d42418 100644 --- 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-20 .. _`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 index d10281c05b3..8613cc7dd78 100644 --- 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-20 .. _`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 index b113e51299d..f7ce9301702 100644 --- 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-20 .. _`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 index 48e4d5c991b..3df5d44d900 100644 --- 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-20 .. _`Flow Validator Reference: AggregateBoundaryValidator`: diff --git a/Neos.Neos/Documentation/References/Validators/Media.rst b/Neos.Neos/Documentation/References/Validators/Media.rst index cb15488c97e..dc591767c94 100644 --- 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-20 .. _`Media Validator Reference: ImageOrientationValidator`: diff --git a/Neos.Neos/Documentation/References/Validators/Party.rst b/Neos.Neos/Documentation/References/Validators/Party.rst index ec414271ac2..f91ea49777b 100644 --- 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-20 .. _`Party Validator Reference: AimAddressValidator`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/ContentRepository.rst b/Neos.Neos/Documentation/References/ViewHelpers/ContentRepository.rst index 4cd45c61fce..9d1413f5795 100644 --- 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-20 .. _`Content Repository ViewHelper Reference: PaginateViewHelper`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst index c985b023ae0..6035f2227b5 100644 --- 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-20 .. _`FluidAdaptor ViewHelper Reference: f:debug`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst index d91711c1f21..6a397755388 100644 --- 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-20 .. _`Form ViewHelper Reference: neos.form:form`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst b/Neos.Neos/Documentation/References/ViewHelpers/Fusion.rst index 545536c47bc..9b7c4981bf2 100644 --- 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-20 .. _`Fusion ViewHelper Reference: fusion:render`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst index ce6441e11ec..734ff6d5d43 100644 --- 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-20 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst index e3a920b6183..65e4a0c9975 100644 --- 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-20 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`: diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst index 9b2049518c9..c8f10aa993b 100644 --- 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-20 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`: