!!! 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

@@ -172,8 +172,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/EmbedsContentStreamAndNodeAggregateId.php

@@ -16,6 +16,7 @@
 
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * This interface is implemented by **events** which contain ContentStreamId and NodeAggregateId.
@@ -26,6 +27,7 @@
  */
 interface EmbedsContentStreamAndNodeAggregateId
 {
+    public function getWorkspaceName(): WorkspaceName;
     public function getContentStreamId(): ContentStreamId;
     public function getNodeAggregateId(): NodeAggregateId;
 }

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 PublishableInterface) {
                     throw new \RuntimeException(sprintf(
                         'TODO: Event %s has to implement PublishableToOtherContentStreamsInterface',
                         get_class($event)
                     ));
                 }
-            } elseif (!$event instanceof PublishableToOtherContentStreamsInterface) {
+            } elseif (!$event instanceof PublishableInterface) {
                 throw new \RuntimeException(sprintf(
                     'TODO: Event %s has to implement PublishableToOtherContentStreamsInterface',
                     get_class($event)

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

@@ -24,11 +24,11 @@
 use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated;
 use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodeSpecializationVariantWasCreated;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindSucceedingSiblingNodesFilter;
-use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 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\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * @internal implementation details of command handlers
@@ -38,6 +38,7 @@ trait NodeVariationInternals
     abstract protected function getInterDimensionalVariationGraph(): DimensionSpace\InterDimensionalVariationGraph;
 
     protected function createEventsForVariations(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -51,20 +52,23 @@ protected function createEventsForVariations(
             )
         ) {
             DimensionSpace\VariantType::TYPE_SPECIALIZATION => $this->handleCreateNodeSpecializationVariant(
+                $workspaceName,
                 $contentStreamId,
                 $sourceOrigin,
                 $targetOrigin,
                 $nodeAggregate,
                 $contentRepository
             ),
             DimensionSpace\VariantType::TYPE_GENERALIZATION => $this->handleCreateNodeGeneralizationVariant(
+                $workspaceName,
                 $contentStreamId,
                 $sourceOrigin,
                 $targetOrigin,
                 $nodeAggregate,
                 $contentRepository
             ),
             default => $this->handleCreateNodePeerVariant(
+                $workspaceName,
                 $contentStreamId,
                 $sourceOrigin,
                 $targetOrigin,
@@ -75,6 +79,7 @@ protected function createEventsForVariations(
     }
 
     protected function handleCreateNodeSpecializationVariant(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -83,6 +88,7 @@ protected function handleCreateNodeSpecializationVariant(
     ): Events {
         $specializationVisibility = $this->calculateEffectiveVisibility($targetOrigin, $nodeAggregate);
         $events = $this->collectNodeSpecializationVariantsThatWillHaveBeenCreated(
+            $workspaceName,
             $contentStreamId,
             $sourceOrigin,
             $targetOrigin,
@@ -100,6 +106,7 @@ protected function handleCreateNodeSpecializationVariant(
      * @return array<int,EventInterface>
      */
     protected function collectNodeSpecializationVariantsThatWillHaveBeenCreated(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -109,6 +116,7 @@ protected function collectNodeSpecializationVariantsThatWillHaveBeenCreated(
         ContentRepository $contentRepository
     ): array {
         $events[] = new NodeSpecializationVariantWasCreated(
+            $workspaceName,
             $contentStreamId,
             $nodeAggregate->nodeAggregateId,
             $sourceOrigin,
@@ -129,6 +137,7 @@ protected function collectNodeSpecializationVariantsThatWillHaveBeenCreated(
             ) as $tetheredChildNodeAggregate
         ) {
             $events = $this->collectNodeSpecializationVariantsThatWillHaveBeenCreated(
+                $workspaceName,
                 $contentStreamId,
                 $sourceOrigin,
                 $targetOrigin,
@@ -143,6 +152,7 @@ protected function collectNodeSpecializationVariantsThatWillHaveBeenCreated(
     }
 
     protected function handleCreateNodeGeneralizationVariant(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -151,6 +161,7 @@ protected function handleCreateNodeGeneralizationVariant(
     ): Events {
         $generalizationVisibility = $this->calculateEffectiveVisibility($targetOrigin, $nodeAggregate);
         $events = $this->collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
+            $workspaceName,
             $contentStreamId,
             $sourceOrigin,
             $targetOrigin,
@@ -168,6 +179,7 @@ protected function handleCreateNodeGeneralizationVariant(
      * @return array<int,EventInterface>
      */
     protected function collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -177,6 +189,7 @@ protected function collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
         ContentRepository $contentRepository
     ): array {
         $events[] = new NodeGeneralizationVariantWasCreated(
+            $workspaceName,
             $contentStreamId,
             $nodeAggregate->nodeAggregateId,
             $sourceOrigin,
@@ -197,6 +210,7 @@ protected function collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
             ) as $tetheredChildNodeAggregate
         ) {
             $events = $this->collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
+                $workspaceName,
                 $contentStreamId,
                 $sourceOrigin,
                 $targetOrigin,
@@ -211,6 +225,7 @@ protected function collectNodeGeneralizationVariantsThatWillHaveBeenCreated(
     }
 
     protected function handleCreateNodePeerVariant(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -219,6 +234,7 @@ protected function handleCreateNodePeerVariant(
     ): Events {
         $peerVisibility = $this->calculateEffectiveVisibility($targetOrigin, $nodeAggregate);
         $events = $this->collectNodePeerVariantsThatWillHaveBeenCreated(
+            $workspaceName,
             $contentStreamId,
             $sourceOrigin,
             $targetOrigin,
@@ -236,6 +252,7 @@ protected function handleCreateNodePeerVariant(
      * @return array<int,EventInterface>
      */
     protected function collectNodePeerVariantsThatWillHaveBeenCreated(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -245,6 +262,7 @@ protected function collectNodePeerVariantsThatWillHaveBeenCreated(
         ContentRepository $contentRepository
     ): array {
         $events[] = new NodePeerVariantWasCreated(
+            $workspaceName,
             $contentStreamId,
             $nodeAggregate->nodeAggregateId,
             $sourceOrigin,
@@ -265,6 +283,7 @@ protected function collectNodePeerVariantsThatWillHaveBeenCreated(
             ) as $tetheredChildNodeAggregate
         ) {
             $events = $this->collectNodePeerVariantsThatWillHaveBeenCreated(
+                $workspaceName,
                 $contentStreamId,
                 $sourceOrigin,
                 $targetOrigin,

Neos.ContentRepository.Core/Classes/Feature/Common/PublishableToOtherContentStreamsInterface.php → Neos.ContentRepository.Core/Classes/Feature/Common/PublishableInterface.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
  */
-interface PublishableToOtherContentStreamsInterface
+interface PublishableInterface
 {
-    public function createCopyForContentStream(ContentStreamId $targetContentStreamId): self;
+    public function createCopyForContentStream(WorkspaceName $targetWorkspaceName, ContentStreamId $targetContentStreamId): self;
 }

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

@@ -29,6 +29,7 @@
 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;
 
 /**
  * @internal implementation details of command handlers
@@ -40,6 +41,7 @@ trait TetheredNodeInternals
     abstract protected function getPropertyConverter(): PropertyConverter;
 
     abstract protected function createEventsForVariations(
+        WorkspaceName $workspaceName,
         ContentStreamId $contentStreamId,
         OriginDimensionSpacePoint $sourceOrigin,
         OriginDimensionSpacePoint $targetOrigin,
@@ -88,6 +90,7 @@ protected function createEventsForMissingTetheredNode(
                     $rootGeneralizationOrigin = OriginDimensionSpacePoint::fromDimensionSpacePoint($rootGeneralization);
                     if ($creationOriginDimensionSpacePoint) {
                         $events[] = new NodePeerVariantWasCreated(
+                            WorkspaceName::fromString('todo'), // TODO read from $parentNodeAggregate
                             $parentNodeAggregate->contentStreamId,
                             $tetheredNodeAggregateId,
                             $creationOriginDimensionSpacePoint,
@@ -98,6 +101,7 @@ protected function createEventsForMissingTetheredNode(
                         );
                     } else {
                         $events[] = new NodeAggregateWithNodeWasCreated(
+                            WorkspaceName::fromString('todo'), // TODO read from $parentNodeAggregate
                             $parentNodeAggregate->contentStreamId,
                             $tetheredNodeAggregateId,
                             $expectedTetheredNodeType->name,
@@ -117,6 +121,7 @@ protected function createEventsForMissingTetheredNode(
             } else {
                 return Events::with(
                     new NodeAggregateWithNodeWasCreated(
+                        WorkspaceName::fromString('todo'), // TODO read from $parentNodeAggregate
                         $parentNodeAggregate->contentStreamId,
                         $tetheredNodeAggregateId ?: NodeAggregateId::create(),
                         $expectedTetheredNodeType->name,
@@ -149,6 +154,7 @@ protected function createEventsForMissingTetheredNode(
             }
             /** @var Node $childNodeSource Node aggregates are never empty */
             return $this->createEventsForVariations(
+                WorkspaceName::fromString('todo'), // TODO read from $parentNodeAggregate
                 $parentNodeAggregate->contentStreamId,
                 $childNodeSource->originDimensionSpacePoint,
                 $originDimensionSpacePoint,

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

@@ -82,6 +82,7 @@ private function handleMoveDimensionSpacePoint(
             $streamName,
             Events::with(
                 new DimensionSpacePointWasMoved(
+                    $command->workspaceName,
                     $contentStreamId,
                     $command->source,
                     $command->target
@@ -112,6 +113,7 @@ private function handleAddDimensionShineThrough(
             $streamName,
             Events::with(
                 new DimensionShineThroughWasAdded(
+                    $command->workspaceName,
                     $contentStreamId,
                     $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\PublishableInterface;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
  * Add a Dimension Space Point Shine-Through;
@@ -32,18 +33,25 @@
  *
  * @api events are the persistence-API of the content repository
  */
-final readonly class DimensionShineThroughWasAdded implements EventInterface, PublishableToOtherContentStreamsInterface
+final readonly class DimensionShineThroughWasAdded implements EventInterface, PublishableInterface
 {
     public function __construct(
+        public WorkspaceName $workspaceName,
         public ContentStreamId $contentStreamId,
         public DimensionSpacePoint $source,
         public DimensionSpacePoint $target
     ) {
     }
 
-    public function createCopyForContentStream(ContentStreamId $targetContentStreamId): self
+    public function getWorkspaceName(): WorkspaceName
+    {
+        return $this->workspaceName;
+    }
+
+    public function createCopyForContentStream(WorkspaceName $targetWorkspaceName, ContentStreamId $targetContentStreamId): self
     {
         return new self(
+            $targetWorkspaceName,
             $targetContentStreamId,
             $this->source,
             $this->target
@@ -53,6 +61,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'])