!!! FEATURE: Add workspaceName to relevant events

Neos.ContentRepository.BehavioralTests/Classes/Command/PerformanceMeasurementService.php

@@ -45,6 +45,7 @@
 class PerformanceMeasurementService implements ContentRepositoryServiceInterface
 {
     private ContentStreamId $contentStreamId;
+    private WorkspaceName $workspaceName;
     private DimensionSpacePointSet $dimensionSpacePoints;
     private ContentStreamEventStreamName $contentStreamEventStream;
 
@@ -55,6 +56,7 @@ public function __construct(
         private readonly ContentRepositoryId $contentRepositoryId
     ) {
         $this->contentStreamId = contentStreamId::fromString('cs-identifier');
+        $this->workspaceName = WorkspaceName::fromString('some-workspace');
         $this->dimensionSpacePoints = new DimensionSpacePointSet([
             DimensionSpacePoint::fromArray(['language' => 'mul']),
             DimensionSpacePoint::fromArray(['language' => 'de']),
@@ -86,6 +88,7 @@ public function createNodesForPerformanceTest(int $nodesPerLevel, int $levels):
 
         $rootNodeAggregateId = nodeAggregateId::fromString('lady-eleonode-rootford');
         $rootNodeAggregateWasCreated = new RootNodeAggregateWithNodeWasCreated(
+            $this->workspaceName,
             $this->contentStreamId,
             $rootNodeAggregateId,
             NodeTypeName::fromString('Neos.ContentRepository:Root'),
@@ -129,6 +132,7 @@ private function createHierarchy(
             for ($i = 0; $i < $numberOfNodes; $i++) {
                 $nodeAggregateId = nodeAggregateId::create();
                 $events[] = new NodeAggregateWithNodeWasCreated(
+                    $this->workspaceName,
                     $this->contentStreamId,
                     $nodeAggregateId,
                     NodeTypeName::fromString('Neos.ContentRepository:Testing'),

Neos.ContentRepository.Core/Classes/EventStore/EventNormalizer.php

@@ -164,8 +164,8 @@ public function denormalize(Event $event): EventInterface
         $eventInstance = $eventClassName::fromArray($eventDataAsArray);
         return match ($eventInstance::class) {
             // upcast disabled / enabled events to the corresponding SubtreeTag events
-            NodeAggregateWasDisabled::class => new SubtreeWasTagged($eventInstance->contentStreamId, $eventInstance->nodeAggregateId, $eventInstance->affectedDimensionSpacePoints, SubtreeTag::disabled()),
-            NodeAggregateWasEnabled::class => new SubtreeWasUntagged($eventInstance->contentStreamId, $eventInstance->nodeAggregateId, $eventInstance->affectedDimensionSpacePoints, SubtreeTag::disabled()),
+            NodeAggregateWasDisabled::class => new SubtreeWasTagged($eventInstance->workspaceName, $eventInstance->contentStreamId, $eventInstance->nodeAggregateId, $eventInstance->affectedDimensionSpacePoints, SubtreeTag::disabled()),
+            NodeAggregateWasEnabled::class => new SubtreeWasUntagged($eventInstance->workspaceName, $eventInstance->contentStreamId, $eventInstance->nodeAggregateId, $eventInstance->affectedDimensionSpacePoints, SubtreeTag::disabled()),
             default => $eventInstance,
         };
     }

Neos.ContentRepository.Core/Classes/Feature/Common/NodeAggregateEventPublisher.php

@@ -38,13 +38,13 @@ public static function enrichWithCommand(
         foreach ($events as $event) {
             if ($event instanceof DecoratedEvent) {
                 $undecoratedEvent = $event->innerEvent;
-                if (!$undecoratedEvent instanceof PublishableToOtherContentStreamsInterface) {
+                if (!$undecoratedEvent instanceof PublishableToWorkspaceInterface) {
                     throw new \RuntimeException(sprintf(
                         'TODO: Event %s has to implement PublishableToOtherContentStreamsInterface',
                         get_class($event)
                     ));
                 }
-            } elseif (!$event instanceof PublishableToOtherContentStreamsInterface) {
+            } elseif (!$event instanceof PublishableToWorkspaceInterface) {
                 throw new \RuntimeException(sprintf(
                     'TODO: Event %s has to implement PublishableToOtherContentStreamsInterface',
                     get_class($event)

Neos.ContentRepository.Core/Classes/Feature/Common/NodeVariationInternals.php

@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\Core\Feature\Common;
 
-use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
@@ -28,7 +27,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
-use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * @internal implementation details of command handlers
@@ -102,6 +100,7 @@ protected function collectNodeSpecializationVariantsThatWillHaveBeenCreated(
         array $events
     ): array {
         $events[] = new NodeSpecializationVariantWasCreated(
+            $contentGraph->getWorkspaceName(),
             $contentGraph->getContentStreamId(),
             $nodeAggregate->nodeAggregateId,
             $sourceOrigin,
@@ -164,6 +163,7 @@ protected function collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
         array $events
     ): array {
         $events[] = new NodeGeneralizationVariantWasCreated(
+            $contentGraph->getWorkspaceName(),
             $contentGraph->getContentStreamId(),
             $nodeAggregate->nodeAggregateId,
             $sourceOrigin,
@@ -226,6 +226,7 @@ protected function collectNodePeerVariantsThatWillHaveBeenCreated(
         array $events
     ): array {
         $events[] = new NodePeerVariantWasCreated(
+            $contentGraph->getWorkspaceName(),
             $contentGraph->getContentStreamId(),
             $nodeAggregate->nodeAggregateId,
             $sourceOrigin,

Neos.ContentRepository.Core/Classes/Feature/Common/PublishableToOtherContentStreamsInterface.php → Neos.ContentRepository.Core/Classes/Feature/Common/PublishableToWorkspaceInterface.php

@@ -15,17 +15,18 @@
 namespace Neos\ContentRepository\Core\Feature\Common;
 
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
- * This interface is implemented by **events** which can be published to different content streams.
+ * This interface is implemented by **events** which can be published to different workspaces.
  *
  * Reminder: Event Publishing to a target content stream can not fail if the source content stream is based
  *           on the target content stream, and no events have been committed to the target content stream in
  *           the meantime. This is because event's effects have to be fully deterministic.
  *
- * @internal used internally for the publishing mechanism of content streams
+ * @internal used internally for the publishing mechanism of workspaces
  */
-interface PublishableToOtherContentStreamsInterface
+interface PublishableToWorkspaceInterface
 {
-    public function createCopyForContentStream(ContentStreamId $targetContentStreamId): self;
+    public function withWorkspaceNameAndContentStreamId(WorkspaceName $targetWorkspaceName, ContentStreamId $contentStreamId): self;
 }

Neos.ContentRepository.Core/Classes/Feature/Common/TetheredNodeInternals.php

@@ -81,7 +81,8 @@ protected function createEventsForMissingTetheredNode(
                     $rootGeneralizationOrigin = OriginDimensionSpacePoint::fromDimensionSpacePoint($rootGeneralization);
                     if ($creationOriginDimensionSpacePoint) {
                         $events[] = new NodePeerVariantWasCreated(
-                            $parentNodeAggregate->contentStreamId,
+                            $contentGraph->getWorkspaceName(),
+                            $contentGraph->getContentStreamId(),
                             $tetheredNodeAggregateId,
                             $creationOriginDimensionSpacePoint,
                             $rootGeneralizationOrigin,
@@ -91,7 +92,8 @@ protected function createEventsForMissingTetheredNode(
                         );
                     } else {
                         $events[] = new NodeAggregateWithNodeWasCreated(
-                            $parentNodeAggregate->contentStreamId,
+                            $contentGraph->getWorkspaceName(),
+                            $contentGraph->getContentStreamId(),
                             $tetheredNodeAggregateId,
                             $tetheredNodeTypeDefinition->nodeTypeName,
                             $rootGeneralizationOrigin,
@@ -107,44 +109,43 @@ protected function createEventsForMissingTetheredNode(
                     }
                 }
                 return Events::fromArray($events);
-            } else {
-                return Events::with(
-                    new NodeAggregateWithNodeWasCreated(
-                        $parentNodeAggregate->contentStreamId,
-                        $tetheredNodeAggregateId ?: NodeAggregateId::create(),
-                        $tetheredNodeTypeDefinition->nodeTypeName,
-                        $originDimensionSpacePoint,
-                        InterdimensionalSiblings::fromDimensionSpacePointSetWithoutSucceedingSiblings(
-                            $parentNodeAggregate->getCoverageByOccupant($originDimensionSpacePoint)
-                        ),
-                        $parentNodeAggregate->nodeAggregateId,
-                        $tetheredNodeTypeDefinition->name,
-                        $defaultProperties,
-                        NodeAggregateClassification::CLASSIFICATION_TETHERED,
-                    )
-                );
             }
-        } else {
-            if (!$childNodeAggregate->classification->isTethered()) {
-                throw new \RuntimeException(
-                    'We found a child node aggregate through the given node path; but it is not tethered.'
-                        . ' We do not support re-tethering yet'
-                        . ' (as this case should happen very rarely as far as we think).'
-                );
-            }
-
-            $childNodeSource = null;
-            foreach ($childNodeAggregate->getNodes() as $node) {
-                $childNodeSource = $node;
-                break;
-            }
-            /** @var Node $childNodeSource Node aggregates are never empty */
-            return $this->createEventsForVariations(
-                $contentGraph,
-                $childNodeSource->originDimensionSpacePoint,
-                $originDimensionSpacePoint,
-                $parentNodeAggregate
+            return Events::with(
+                new NodeAggregateWithNodeWasCreated(
+                    $contentGraph->getWorkspaceName(),
+                    $contentGraph->getContentStreamId(),
+                    $tetheredNodeAggregateId ?: NodeAggregateId::create(),
+                    $tetheredNodeTypeDefinition->nodeTypeName,
+                    $originDimensionSpacePoint,
+                    InterdimensionalSiblings::fromDimensionSpacePointSetWithoutSucceedingSiblings(
+                        $parentNodeAggregate->getCoverageByOccupant($originDimensionSpacePoint)
+                    ),
+                    $parentNodeAggregate->nodeAggregateId,
+                    $tetheredNodeTypeDefinition->name,
+                    $defaultProperties,
+                    NodeAggregateClassification::CLASSIFICATION_TETHERED,
+                )
+            );
+        }
+        if (!$childNodeAggregate->classification->isTethered()) {
+            throw new \RuntimeException(
+                'We found a child node aggregate through the given node path; but it is not tethered.'
+                    . ' We do not support re-tethering yet'
+                    . ' (as this case should happen very rarely as far as we think).'
             );
         }
+
+        $childNodeSource = null;
+        foreach ($childNodeAggregate->getNodes() as $node) {
+            $childNodeSource = $node;
+            break;
+        }
+        /** @var Node $childNodeSource Node aggregates are never empty */
+        return $this->createEventsForVariations(
+            $contentGraph,
+            $childNodeSource->originDimensionSpacePoint,
+            $originDimensionSpacePoint,
+            $parentNodeAggregate
+        );
     }
 }

Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/DimensionSpaceCommandHandler.php

@@ -79,6 +79,7 @@ private function handleMoveDimensionSpacePoint(
             $streamName,
             Events::with(
                 new DimensionSpacePointWasMoved(
+                    $contentGraph->getWorkspaceName(),
                     $contentGraph->getContentStreamId(),
                     $command->source,
                     $command->target
@@ -108,6 +109,7 @@ private function handleAddDimensionShineThrough(
             $streamName,
             Events::with(
                 new DimensionShineThroughWasAdded(
+                    $contentGraph->getWorkspaceName(),
                     $contentGraph->getContentStreamId(),
                     $command->source,
                     $command->target

Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/Event/DimensionShineThroughWasAdded.php

@@ -16,8 +16,9 @@
 
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\EventStore\EventInterface;
-use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface;
+use Neos\ContentRepository\Core\Feature\Common\PublishableToWorkspaceInterface;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * Add a Dimension Space Point Shine-Through;
@@ -32,19 +33,21 @@
  *
  * @api events are the persistence-API of the content repository
  */
-final readonly class DimensionShineThroughWasAdded implements EventInterface, PublishableToOtherContentStreamsInterface
+final readonly class DimensionShineThroughWasAdded implements EventInterface, PublishableToWorkspaceInterface
 {
     public function __construct(
+        public WorkspaceName $workspaceName,
         public ContentStreamId $contentStreamId,
         public DimensionSpacePoint $source,
         public DimensionSpacePoint $target
     ) {
     }
 
-    public function createCopyForContentStream(ContentStreamId $targetContentStreamId): self
+    public function withWorkspaceNameAndContentStreamId(WorkspaceName $targetWorkspaceName, ContentStreamId $contentStreamId): self
     {
         return new self(
-            $targetContentStreamId,
+            $targetWorkspaceName,
+            $contentStreamId,
             $this->source,
             $this->target
         );
@@ -53,6 +56,7 @@ public function createCopyForContentStream(ContentStreamId $targetContentStreamI
     public static function fromArray(array $values): self
     {
         return new self(
+            WorkspaceName::fromString($values['workspaceName']),
             ContentStreamId::fromString($values['contentStreamId']),
             DimensionSpacePoint::fromArray($values['source']),
             DimensionSpacePoint::fromArray($values['target'])

Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/Event/DimensionSpacePointWasMoved.php

@@ -16,8 +16,9 @@
 
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\EventStore\EventInterface;
-use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface;
+use Neos\ContentRepository\Core\Feature\Common\PublishableToWorkspaceInterface;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * Moved a dimension space point to a new location; basically moving all content to the new dimension space point.
@@ -28,19 +29,21 @@
  *
  * @api events are the persistence-API of the content repository
  */
-final readonly class DimensionSpacePointWasMoved implements EventInterface, PublishableToOtherContentStreamsInterface
+final readonly class DimensionSpacePointWasMoved implements EventInterface, PublishableToWorkspaceInterface
 {
     public function __construct(
+        public WorkspaceName $workspaceName,
         public ContentStreamId $contentStreamId,
         public DimensionSpacePoint $source,
         public DimensionSpacePoint $target
     ) {
     }
 
-    public function createCopyForContentStream(ContentStreamId $targetContentStreamId): self
+    public function withWorkspaceNameAndContentStreamId(WorkspaceName $targetWorkspaceName, ContentStreamId $contentStreamId): self
     {
         return new self(
-            $targetContentStreamId,
+            $targetWorkspaceName,
+            $contentStreamId,
             $this->source,
             $this->target
         );
@@ -49,6 +52,7 @@ public function createCopyForContentStream(ContentStreamId $targetContentStreamI
     public static function fromArray(array $values): self
     {
         return new self(
+            WorkspaceName::fromString($values['workspaceName']),
             ContentStreamId::fromString($values['contentStreamId']),
             DimensionSpacePoint::fromArray($values['source']),
             DimensionSpacePoint::fromArray($values['target'])

Neos.ContentRepository.Core/Classes/Feature/NodeCreation/Event/NodeAggregateWithNodeWasCreated.php

@@ -19,13 +19,14 @@
 use Neos\ContentRepository\Core\EventStore\EventInterface;
 use Neos\ContentRepository\Core\Feature\Common\EmbedsContentStreamAndNodeAggregateId;
 use Neos\ContentRepository\Core\Feature\Common\InterdimensionalSiblings;
-use Neos\ContentRepository\Core\Feature\Common\PublishableToOtherContentStreamsInterface;
+use Neos\ContentRepository\Core\Feature\Common\PublishableToWorkspaceInterface;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\SerializedPropertyValues;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * A node aggregate with its initial node was created
@@ -34,10 +35,11 @@
  */
 final readonly class NodeAggregateWithNodeWasCreated implements
     EventInterface,
-    PublishableToOtherContentStreamsInterface,
+    PublishableToWorkspaceInterface,
     EmbedsContentStreamAndNodeAggregateId
 {
     public function __construct(
+        public WorkspaceName $workspaceName,
         public ContentStreamId $contentStreamId,
         public NodeAggregateId $nodeAggregateId,
         public NodeTypeName $nodeTypeName,
@@ -65,10 +67,11 @@ public function getOriginDimensionSpacePoint(): OriginDimensionSpacePoint
         return $this->originDimensionSpacePoint;
     }
 
-    public function createCopyForContentStream(ContentStreamId $targetContentStreamId): self
+    public function withWorkspaceNameAndContentStreamId(WorkspaceName $targetWorkspaceName, ContentStreamId $contentStreamId): self
     {
         return new self(
-            $targetContentStreamId,
+            $targetWorkspaceName,
+            $contentStreamId,
             $this->nodeAggregateId,
             $this->nodeTypeName,
             $this->originDimensionSpacePoint,
@@ -83,6 +86,7 @@ public function createCopyForContentStream(ContentStreamId $targetContentStreamI
     public static function fromArray(array $values): self
     {
         return new self(
+            WorkspaceName::fromString($values['workspaceName']),
             ContentStreamId::fromString($values['contentStreamId']),
             NodeAggregateId::fromString($values['nodeAggregateId']),
             NodeTypeName::fromString($values['nodeTypeName']),

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

@@ -231,6 +231,7 @@ private function createRegularWithNode(
         SerializedPropertyValues $initialPropertyValues,
     ): NodeAggregateWithNodeWasCreated {
         return new NodeAggregateWithNodeWasCreated(
+            $contentGraph->getWorkspaceName(),
             $contentGraph->getContentStreamId(),
             $command->nodeAggregateId,
             $command->nodeTypeName,
@@ -277,6 +278,7 @@ private function handleTetheredChildNodes(
             );
 
             $events[] = new NodeAggregateWithNodeWasCreated(
+                $contentGraph->getWorkspaceName(),
                 $contentGraph->getContentStreamId(),
                 $childNodeAggregateId,
                 $tetheredNodeTypeDefinition->nodeTypeName,