From c9f8ce24f26b36a07370db8a75ce6fef3b636b62 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Mon, 14 Oct 2024 22:43:45 +0200
Subject: [PATCH] TASK: Remove outdated comments
---
.../03-RebasingWithConflictingChanges.feature | 2 --
.../W7-WorkspacePublication/02-PublishWorkspace.feature | 2 --
.../04-AllFeaturePublication.feature | 2 --
.../W9-WorkspaceDiscarding/02-DiscardWorkspace.feature | 3 +--
.../Classes/Feature/WorkspaceCommandHandler.php | 2 --
5 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W6-WorkspaceRebasing/03-RebasingWithConflictingChanges.feature b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W6-WorkspaceRebasing/03-RebasingWithConflictingChanges.feature
index d12182497d7..cf7d6746261 100644
--- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W6-WorkspaceRebasing/03-RebasingWithConflictingChanges.feature
+++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W6-WorkspaceRebasing/03-RebasingWithConflictingChanges.feature
@@ -37,8 +37,6 @@ Feature: Workspace rebasing - conflicting changes
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
| propertyValues | {"text": "Original"} |
- # we need to ensure that the projections are up to date now; otherwise a content stream is forked with an out-
- # of-date base version. This means the content stream can never be merged back, but must always be rebased.
And the command CreateWorkspace is executed with payload:
| Key | Value |
| workspaceName | "user-test" |
diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W7-WorkspacePublication/02-PublishWorkspace.feature b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W7-WorkspacePublication/02-PublishWorkspace.feature
index a8d0884563d..ad3ee6db36c 100644
--- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W7-WorkspacePublication/02-PublishWorkspace.feature
+++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W7-WorkspacePublication/02-PublishWorkspace.feature
@@ -37,8 +37,6 @@ Feature: Workspace based content publishing
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
| propertyValues | {"text": "Original"} |
- # we need to ensure that the projections are up to date now; otherwise a content stream is forked with an out-
- # of-date base version. This means the content stream can never be merged back, but must always be rebased.
And the command CreateWorkspace is executed with payload:
| Key | Value |
| workspaceName | "user-test" |
diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W8-IndividualNodePublication/04-AllFeaturePublication.feature b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W8-IndividualNodePublication/04-AllFeaturePublication.feature
index cefedf691f0..f08d5bf47d4 100644
--- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W8-IndividualNodePublication/04-AllFeaturePublication.feature
+++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W8-IndividualNodePublication/04-AllFeaturePublication.feature
@@ -129,8 +129,6 @@ Feature: Publishing hide/show scenario of nodes
| nodeAggregateId | "sir-nodeward-nodington-iii" |
| coveredDimensionSpacePoint | {} |
| nodeVariantSelectionStrategy | "allVariants" |
- # we need to ensure that the projections are up to date now; otherwise a content stream is forked with an out-
- # of-date base version. This means the content stream can never be merged back, but must always be rebased.
Given the command CreateWorkspace is executed with payload:
| Key | Value |
| workspaceName | "user-test" |
diff --git a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W9-WorkspaceDiscarding/02-DiscardWorkspace.feature b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W9-WorkspaceDiscarding/02-DiscardWorkspace.feature
index 2174937dad7..e55d3c8326d 100644
--- a/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W9-WorkspaceDiscarding/02-DiscardWorkspace.feature
+++ b/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W9-WorkspaceDiscarding/02-DiscardWorkspace.feature
@@ -37,8 +37,7 @@ Feature: Workspace discarding - basic functionality
| nodeAggregateId | "nody-mc-nodeface" |
| originDimensionSpacePoint | {} |
| propertyValues | {"text": "Original"} |
- # we need to ensure that the projections are up to date now; otherwise a content stream is forked with an out-
- # of-date base version. This means the content stream can never be merged back, but must always be rebased.
+
And the command CreateWorkspace is executed with payload:
| Key | Value |
| workspaceName | "user-test" |
diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php
index 047e45ab510..edc32a30bd8 100644
--- a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php
+++ b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php
@@ -793,8 +793,6 @@ private function handleDiscardWorkspace(
)
);
- // It is safe to only return the last command result,
- // as the commands which were rebased are already executed "synchronously"
return new EventsToPublish(
$streamName,
$events,