Merge remote-tracking branch 'origin/9.0' into 90/bugfix/mark-all-aff…

…ected-dimensions-on-move

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php

@@ -235,6 +235,13 @@ public function determineHierarchyRelationPosition(
                 throw new \RuntimeException(sprintf('Failed to load succeeding sibling relations for content stream %s, anchor point %s and dimension space point %s from database: %s', $contentStreamId->value, $succeedingSiblingAnchorPoint->value, $dimensionSpacePoint->toJson(), $e->getMessage()), 1716474854, $e);
             }
 
+            if (!$succeedingSiblingRelation) {
+                throw new \RuntimeException(
+                    sprintf('Could not fetch succeeding sibling relation for anchor point: %s with dimensionSpacePointHash : %s', $succeedingSiblingAnchorPoint->value, $dimensionSpacePoint->hash),
+                    1696405259
+                );
+            }
+
             $succeedingSiblingPosition = (int)$succeedingSiblingRelation['position'];
             $parentAnchorPoint = NodeRelationAnchorPoint::fromInteger($succeedingSiblingRelation['parentnodeanchor']);
 

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W10-IndividualNodeDiscarding/01-ConstraintChecks.feature

@@ -72,7 +72,7 @@ Feature: Workspace discarding - complex chained functionality
       | workspaceName      | "user-ws"                                                                                                                                                                                                                                    |
       | nodesToDiscard     | [{"workspaceName": "user-ws", "dimensionSpacePoint": {"language": "en"}, "nodeAggregateId": "sir-david-nodenborough"}, {"workspaceName": "user-ws", "dimensionSpacePoint": {"language": "en"}, "nodeAggregateId": "sir-david-nodenborough"}] |
       | newContentStreamId | "user-cs-id-rebased"                                                                                                                                                                                                                         |
-    Then the last command should have thrown the WorkspaceRebaseFailed exception with:
+    Then the last command should have thrown the PartialWorkspaceRebaseFailed exception with:
       | SequenceNumber | Event                               | Exception                                             |
       | 11             | NodeGeneralizationVariantWasCreated | NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint |
 

Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W8-IndividualNodePublication/01-ConstraintChecks.feature

@@ -77,6 +77,8 @@ Feature: Workspace publication - complex chained functionality
       | originDimensionSpacePoint | {"language": "de"}        |
       | propertyValues            | {"text": "Modified text"} |
 
+    Then workspace user-ws has status OUTDATED
+
     When the command PublishIndividualNodesFromWorkspace is executed with payload and exceptions are caught:
       | Key                | Value                                                                             |
       | workspaceName      | "user-ws"                                                                         |
@@ -101,12 +103,14 @@ Feature: Workspace publication - complex chained functionality
       | sourceOrigin    | {"language": "de"} |
       | targetOrigin    | {"language": "en"} |
 
+    Then workspace user-ws has status UP_TO_DATE
+
     When the command PublishIndividualNodesFromWorkspace is executed with payload and exceptions are caught:
       | Key                | Value                                                                                                            |
       | workspaceName      | "user-ws"                                                                                                        |
       | nodesToPublish     | [{"workspaceName": "user-ws", "dimensionSpacePoint": {"language": "en"}, "nodeAggregateId": "nody-mc-nodeface"}] |
       | newContentStreamId | "user-cs-id-rebased"                                                                                             |
-    Then the last command should have thrown the WorkspaceRebaseFailed exception with:
+    Then the last command should have thrown the PartialWorkspaceRebaseFailed exception with:
       | SequenceNumber | Event                               | Exception                                             |
       | 13             | NodeGeneralizationVariantWasCreated | NodeAggregateDoesCurrentlyNotCoverDimensionSpacePoint |
 
@@ -116,3 +120,32 @@ Feature: Workspace publication - complex chained functionality
       | newContentStreamId | "user-cs-id-yet-again-rebased" |
     When I am in workspace "user-ws" and dimension space point {"language": "de"}
     Then I expect node aggregate identifier "nody-mc-nodeface" to lead to node user-cs-id-yet-again-rebased;nody-mc-nodeface;{"language": "de"}
+
+   Scenario: Publish a deletion and try to keep a move node from its descendants
+     see issue: https://github.com/neos/neos-development-collection/issues/5364
+
+     When the command MoveNodeAggregate is executed with payload:
+       | Key                          | Value              |
+       | workspaceName                | "user-ws"          |
+       | nodeAggregateId              | "nody-mc-nodeface" |
+       | dimensionSpacePoint          | {"language": "de"} |
+       | newParentNodeAggregateId     | "sir-nodebelig"    |
+       | relationDistributionStrategy | "gatherAll"        |
+
+     When the command RemoveNodeAggregate is executed with payload:
+       | Key                          | Value                    |
+       | workspaceName                | "user-ws"                |
+       | nodeAggregateId              | "sir-david-nodenborough" |
+       | coveredDimensionSpacePoint   | {"language": "de"}       |
+       | nodeVariantSelectionStrategy | "allVariants"            |
+
+     Then workspace user-ws has status UP_TO_DATE
+
+     When the command PublishIndividualNodesFromWorkspace is executed with payload and exceptions are caught:
+       | Key                | Value                                                                                      |
+       | workspaceName      | "user-ws"                                                                                  |
+       | nodesToPublish     | [{"dimensionSpacePoint": {"language": "de"}, "nodeAggregateId": "sir-david-nodenborough"}] |
+       | newContentStreamId | "user-cs-id-rebased"                                                                       |
+     Then the last command should have thrown the PartialWorkspaceRebaseFailed exception with:
+       | SequenceNumber | Event                 | Exception                          |
+       | 11             | NodeAggregateWasMoved | NodeAggregateCurrentlyDoesNotExist |

Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php

@@ -53,6 +53,7 @@
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Dto\RebaseErrorHandlingStrategy;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceWasRebased;
+use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\PartialWorkspaceRebaseFailed;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed;
 use Neos\ContentRepository\Core\SharedModel\Exception\ContentStreamAlreadyExists;
 use Neos\ContentRepository\Core\SharedModel\Exception\ContentStreamDoesNotExistYet;
@@ -507,8 +508,14 @@ static function ($handle) use ($commandSimulator, $matchingCommands, $remainingC
             yield $this->reopenContentStreamWithoutConstraintChecks(
                 $workspace->currentContentStreamId
             );
-
-            throw WorkspaceRebaseFailed::duringPublish($commandSimulator->getConflictingEvents());
+            match ($workspace->status) {
+                // If the workspace is up-to-date it must be a problem regarding that the order of events cannot be changed
+                WorkspaceStatus::UP_TO_DATE =>
+                    throw PartialWorkspaceRebaseFailed::duringPartialPublish($commandSimulator->getConflictingEvents()),
+                // If the workspace is outdated we cannot know for sure but suspect that the conflict arose due to changes in the base workspace.
+                WorkspaceStatus::OUTDATED =>
+                    throw WorkspaceRebaseFailed::duringPublish($commandSimulator->getConflictingEvents())
+            };
         }
 
         // this could empty and a no-op for the rare case when a command returns empty events e.g. the node was already tagged with this subtree tag
@@ -608,7 +615,6 @@ private function handleDiscardIndividualNodesFromWorkspace(
             // quick path everything was discarded
             yield from $this->discardWorkspace(
                 $workspace,
-                $workspaceContentStreamVersion,
                 $baseWorkspace,
                 $baseWorkspaceContentStreamVersion,
                 $command->newContentStreamId
@@ -630,7 +636,14 @@ static function ($handle) use ($commandsToKeep): void {
             yield $this->reopenContentStreamWithoutConstraintChecks(
                 $workspace->currentContentStreamId
             );
-            throw WorkspaceRebaseFailed::duringDiscard($commandSimulator->getConflictingEvents());
+            match ($workspace->status) {
+                // If the workspace is up-to-date it must be a problem regarding that the order of events cannot be changed
+                WorkspaceStatus::UP_TO_DATE =>
+                    throw PartialWorkspaceRebaseFailed::duringPartialDiscard($commandSimulator->getConflictingEvents()),
+                // If the workspace is outdated we cannot know for sure but suspect that the conflict arose due to changes in the base workspace.
+                WorkspaceStatus::OUTDATED =>
+                    throw WorkspaceRebaseFailed::duringDiscard($commandSimulator->getConflictingEvents())
+            };
         }
 
         yield from $this->forkNewContentStreamAndApplyEvents(
@@ -675,12 +688,11 @@ private function handleDiscardWorkspace(
             return;
         }
 
-        $workspaceContentStreamVersion = $this->requireOpenContentStreamAndVersion($workspace, $commandHandlingDependencies);
+        $this->requireContentStreamToNotBeClosed($workspace->currentContentStreamId, $commandHandlingDependencies);
         $baseWorkspaceContentStreamVersion = $this->requireOpenContentStreamAndVersion($baseWorkspace, $commandHandlingDependencies);
 
         yield from $this->discardWorkspace(
             $workspace,
-            $workspaceContentStreamVersion,
             $baseWorkspace,
             $baseWorkspaceContentStreamVersion,
             $command->newContentStreamId
@@ -692,7 +704,6 @@ private function handleDiscardWorkspace(
      */
     private function discardWorkspace(
         Workspace $workspace,
-        Version $workspaceContentStreamVersion,
         Workspace $baseWorkspace,
         Version $baseWorkspaceContentStreamVersion,
         ContentStreamId $newContentStream

Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Exception/PartialWorkspaceRebaseFailed.php

@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Neos.ContentRepository.Core package.
+ *
+ * (c) Contributors of the Neos Project - www.neos.io
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+declare(strict_types=1);
+
+namespace Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception;
+
+use Neos\ContentRepository\Core\Feature\WorkspaceRebase\ConflictingEvents;
+
+/**
+ * Thrown if the partial publish/discard cannot work because the events cannot be reordered as filtered.
+ *
+ * This can happen for cases like attempting to publish a removal first and wanting as remaining change
+ * a node move out of the removed descendants or publishing a node variant creation before the node is created.
+ *
+ * We cannot reliably detect these cases in advance but in case the workspace is up-to-date its most likely such
+ * an ordering conflict.
+ *
+ * To solve the problem the partial operation should be retried with a different filter _or_ a full publish/discard is required.
+ *
+ * If the workspace is outdated we cannot know for sure but suspect first that the conflict arose due to changes
+ * in the base workspace, thus we throw {@see WorkspaceRebaseFailed} instead.
+ * A forced rebase then might not solve the problem if It's because the order of events cannot be changed.
+ * But attempting a second partial publish/discard (with up-to-date workspace) this exception will be thrown and can be reacted upon.
+ *
+ * @see WorkspaceRebaseFailed which is thrown instead if the workspace is also outdated
+ * @api this exception contains information which events cannot be reordered
+ */
+final class PartialWorkspaceRebaseFailed extends \RuntimeException
+{
+    private function __construct(
+        public readonly ConflictingEvents $conflictingEvents,
+        string $message,
+        int $code,
+        ?\Throwable $previous,
+    ) {
+        parent::__construct($message, $code, $previous);
+    }
+
+    public static function duringPartialPublish(ConflictingEvents $conflictingEvents): self
+    {
+        return new self(
+            $conflictingEvents,
+            sprintf('Publication failed, events cannot be reordered as filtered: %s', self::renderMessage($conflictingEvents)),
+            1729974980,
+            $conflictingEvents->first()?->getException()
+        );
+    }
+
+    public static function duringPartialDiscard(ConflictingEvents $conflictingEvents): self
+    {
+        return new self(
+            $conflictingEvents,
+            sprintf('Discard failed, events cannot be reordered as filtered: %s', self::renderMessage($conflictingEvents)),
+            1729974982,
+            $conflictingEvents->first()?->getException()
+        );
+    }
+
+    private static function renderMessage(ConflictingEvents $conflictingEvents): string
+    {
+        $firstConflict = $conflictingEvents->first();
+        return sprintf('"%s" and %d further ordering conflicts', $firstConflict?->getException()->getMessage(), count($conflictingEvents) - 1);
+    }
+}

Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/Exception/WorkspaceRebaseFailed.php

@@ -19,7 +19,7 @@
 /**
  * @api this exception contains information about what exactly went wrong during rebase
  */
-final class WorkspaceRebaseFailed extends \Exception
+final class WorkspaceRebaseFailed extends \RuntimeException
 {
     private function __construct(
         public readonly ConflictingEvents $conflictingEvents,

Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/GenericCommandExecutionAndEventPublication.php

@@ -53,6 +53,7 @@
 use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishIndividualNodesFromWorkspace;
 use Neos\ContentRepository\Core\Feature\WorkspacePublication\Command\PublishWorkspace;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace;
+use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\PartialWorkspaceRebaseFailed;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\ReferenceName;
@@ -310,7 +311,7 @@ protected function publishEvent(string $eventType, StreamName $streamName, array
      */
     public function theLastCommandShouldHaveThrown(string $shortExceptionName, ?int $expectedCode = null, PyStringNode $expectedMessage = null): void
     {
-        if ($shortExceptionName === 'WorkspaceRebaseFailed') {
+        if ($shortExceptionName === 'WorkspaceRebaseFailed' || $shortExceptionName === 'PartialWorkspaceRebaseFailed') {
             throw new \RuntimeException('Please use the assertion "the last command should have thrown the WorkspaceRebaseFailed exception with" instead.');
         }
 
@@ -332,14 +333,18 @@ public function theLastCommandShouldHaveThrown(string $shortExceptionName, ?int
     }
 
     /**
-     * @Then the last command should have thrown the WorkspaceRebaseFailed exception with:
+     * @Then /^the last command should have thrown the (WorkspaceRebaseFailed|PartialWorkspaceRebaseFailed) exception with:$/
      */
-    public function theLastCommandShouldHaveThrownTheWorkspaceRebaseFailedWith(TableNode $payloadTable)
+    public function theLastCommandShouldHaveThrownTheWorkspaceRebaseFailedWith(string $shortExceptionName, TableNode $payloadTable)
     {
-        /** @var WorkspaceRebaseFailed $exception */
+        /** @var WorkspaceRebaseFailed|PartialWorkspaceRebaseFailed $exception */
         $exception = $this->lastCommandException;
         Assert::assertNotNull($exception, 'Command did not throw exception');
-        Assert::assertInstanceOf(WorkspaceRebaseFailed::class, $exception, sprintf('Actual exception: %s (%s): %s', get_class($exception), $exception->getCode(), $exception->getMessage()));
+
+        match ($shortExceptionName) {
+            'WorkspaceRebaseFailed' => Assert::assertInstanceOf(WorkspaceRebaseFailed::class, $exception, sprintf('Actual exception: %s (%s): %s', get_class($exception), $exception->getCode(), $exception->getMessage())),
+            'PartialWorkspaceRebaseFailed' => Assert::assertInstanceOf(PartialWorkspaceRebaseFailed::class, $exception, sprintf('Actual exception: %s (%s): %s', get_class($exception), $exception->getCode(), $exception->getMessage())),
+        };
 
         $actualComparableHash = [];
         foreach ($exception->conflictingEvents as $conflictingEvent) {

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 2024-11-28
+The following reference was automatically generated from code on 2024-12-04
 
 
 .. _`Neos Command Reference: NEOS.FLOW`:

Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst

@@ -3,7 +3,7 @@
 FluidAdaptor ViewHelper Reference
 #################################
 
-This reference was automatically generated from code on 2024-11-28
+This reference was automatically generated from code on 2024-12-04
 
 
 .. _`FluidAdaptor ViewHelper Reference: f:debug`:

Neos.Neos/Documentation/References/ViewHelpers/Form.rst

@@ -3,7 +3,7 @@
 Form ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-11-28
+This reference was automatically generated from code on 2024-12-04
 
 
 .. _`Form ViewHelper Reference: neos.form:form`:

Neos.Neos/Documentation/References/ViewHelpers/Media.rst

@@ -3,7 +3,7 @@
 Media ViewHelper Reference
 ##########################
 
-This reference was automatically generated from code on 2024-11-28
+This reference was automatically generated from code on 2024-12-04
 
 
 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`:

Neos.Neos/Documentation/References/ViewHelpers/Neos.rst

@@ -3,7 +3,7 @@
 Neos ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-11-28
+This reference was automatically generated from code on 2024-12-04
 
 
 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`:

Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst

@@ -3,7 +3,7 @@
 TYPO3 Fluid ViewHelper Reference
 ################################
 
-This reference was automatically generated from code on 2024-11-28
+This reference was automatically generated from code on 2024-12-04
 
 
 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`:

Neos.Neos/Tests/Behavior/Features/Change/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature → Neos.Neos/Tests/Behavior/Features/PendingChanges/01-NodeCreation/01-CreateNodeAggregateWithNode_WithoutDimensions.feature

@@ -33,10 +33,6 @@ Feature: Create node aggregate with node without dimensions
       | workspaceName      | "user-workspace" |
       | baseWorkspaceName  | "live"           |
       | newContentStreamId | "user-cs-id"     |
-    And the command RebaseWorkspace is executed with payload:
-      | Key           | Value            |
-      | workspaceName | "user-workspace" |
-    And I am in dimension space point {}
 
   Scenario: Nodes on live workspace have been created
     Given I am in workspace "live"

Neos.Neos/Tests/Behavior/Features/Change/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature → Neos.Neos/Tests/Behavior/Features/PendingChanges/01-NodeCreation/02-CreateNodeAggregateWithNode_WithDimensions.feature

@@ -35,10 +35,6 @@ Feature: Create node aggregate with node with dimensions
       | workspaceName      | "user-workspace" |
       | baseWorkspaceName  | "live"           |
       | newContentStreamId | "user-cs-id"     |
-    And the command RebaseWorkspace is executed with payload:
-      | Key           | Value            |
-      | workspaceName | "user-workspace" |
-    And I am in dimension space point {"language": "de"}
 
   Scenario: Nodes on live workspace have been created
     Given I am in workspace "live"