Merge pull request neos#4976 from neos/4942-refactorStructureCommands

TASK: 4942 - refactor global transformation commands…
kitsunet · Apr 5, 2024 · 3e38b36 · 3e38b36
2 parents f1e7d73 + 1dc8c01
commit 3e38b36
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 87 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/Feature/Common/RebasableToOtherWorkspaceInterface.php b/Neos.ContentRepository.Core/Classes/Feature/Common/RebasableToOtherWorkspaceInterface.php
@@ -15,7 +15,6 @@
 namespace Neos\ContentRepository\Core\Feature\Common;
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
-use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
@@ -30,7 +29,6 @@ interface RebasableToOtherWorkspaceInterface
 {
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): CommandInterface;
 
     /**

diff --git a/...sitory.Core/Classes/Feature/DimensionSpaceAdjustment/Command/AddDimensionShineThrough.php b/...sitory.Core/Classes/Feature/DimensionSpaceAdjustment/Command/AddDimensionShineThrough.php
@@ -25,7 +25,7 @@
  * basically making all content available not just in the source(original) DSP,
  * but also in the target-DimensionSpacePoint.
  *
- * NOTE: the Source Dimension Space Point must be a parent of the target Dimension Space Point.
+ * NOTE: the Source Dimension Space Point must be a generalization of the target Dimension Space Point.
  *
  * This is needed if "de" exists, and you want to create a "de_CH" specialization.
  *
@@ -39,27 +39,28 @@
     RebasableToOtherWorkspaceInterface
 {
     /**
-     * @param ContentStreamId $contentStreamId The id of the content stream to perform the operation in.
-     *      This content stream is specifically created for this operation and thus not prone to conflicts,
-     *      thus we don't need the workspace name
+     * @param WorkspaceName $workspaceName The name of the workspace to perform the operation in.
      * @param DimensionSpacePoint $source source dimension space point
      * @param DimensionSpacePoint $target target dimension space point
      */
     private function __construct(
-        public ContentStreamId $contentStreamId,
+        public WorkspaceName $workspaceName,
         public DimensionSpacePoint $source,
         public DimensionSpacePoint $target
     ) {
     }
 
     /**
-     * @param ContentStreamId $contentStreamId The id of the content stream to perform the operation in
+     * @param WorkspaceName $workspaceName The name of the workspace to perform the operation in
      * @param DimensionSpacePoint $source source dimension space point
      * @param DimensionSpacePoint $target target dimension space point
      */
-    public static function create(ContentStreamId $contentStreamId, DimensionSpacePoint $source, DimensionSpacePoint $target): self
-    {
-        return new self($contentStreamId, $source, $target);
+    public static function create(
+        WorkspaceName $workspaceName,
+        DimensionSpacePoint $source,
+        DimensionSpacePoint $target
+    ): self {
+        return new self($workspaceName, $source, $target);
     }
 
     /**
@@ -68,16 +69,16 @@ public static function create(ContentStreamId $contentStreamId, DimensionSpacePo
     public static function fromArray(array $array): self
     {
         return new self(
-            ContentStreamId::fromString($array['contentStreamId']),
+            WorkspaceName::fromString($array['workspaceName']),
             DimensionSpacePoint::fromArray($array['source']),
             DimensionSpacePoint::fromArray($array['target'])
         );
     }
 
-    public function createCopyForWorkspace(WorkspaceName $targetWorkspaceName, ContentStreamId $targetContentStreamId): self
+    public function createCopyForWorkspace(WorkspaceName $targetWorkspaceName): self
     {
         return new self(
-            $targetContentStreamId,
+            $targetWorkspaceName,
             $this->source,
             $this->target
         );

diff --git a/...ository.Core/Classes/Feature/DimensionSpaceAdjustment/Command/MoveDimensionSpacePoint.php b/...ository.Core/Classes/Feature/DimensionSpaceAdjustment/Command/MoveDimensionSpacePoint.php
@@ -17,7 +17,6 @@
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\Feature\Common\RebasableToOtherWorkspaceInterface;
-use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
@@ -35,27 +34,28 @@
     RebasableToOtherWorkspaceInterface
 {
     /**
-     * @param ContentStreamId $contentStreamId The id of the content stream to perform the operation in.
-     *       This content stream is specifically created for this operation and thus not prone to conflicts,
-     *       thus we don't need the workspace name
+     * @param WorkspaceName $workspaceName The name of the workspace to perform the operation in.
      * @param DimensionSpacePoint $source source dimension space point
      * @param DimensionSpacePoint $target target dimension space point
      */
     private function __construct(
-        public ContentStreamId $contentStreamId,
+        public WorkspaceName $workspaceName,
         public DimensionSpacePoint $source,
-        public DimensionSpacePoint $target
+        public DimensionSpacePoint $target,
     ) {
     }
 
     /**
-     * @param ContentStreamId $contentStreamId The id of the content stream to perform the operation in
+     * @param WorkspaceName $workspaceName The name of the workspace to perform the operation in
      * @param DimensionSpacePoint $source source dimension space point
      * @param DimensionSpacePoint $target target dimension space point
      */
-    public static function create(ContentStreamId $contentStreamId, DimensionSpacePoint $source, DimensionSpacePoint $target): self
-    {
-        return new self($contentStreamId, $source, $target);
+    public static function create(
+        WorkspaceName $workspaceName,
+        DimensionSpacePoint $source,
+        DimensionSpacePoint $target
+    ): self {
+        return new self($workspaceName, $source, $target);
     }
 
     /**
@@ -64,18 +64,17 @@ public static function create(ContentStreamId $contentStreamId, DimensionSpacePo
     public static function fromArray(array $array): self
     {
         return new self(
-            ContentStreamId::fromString($array['contentStreamId']),
+            WorkspaceName::fromString($array['workspaceName']),
             DimensionSpacePoint::fromArray($array['source']),
             DimensionSpacePoint::fromArray($array['target'])
         );
     }
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
-            $targetContentStreamId,
+            $targetWorkspaceName,
             $this->source,
             $this->target
         );

diff --git a/...Repository.Core/Classes/Feature/DimensionSpaceAdjustment/DimensionSpaceCommandHandler.php b/...Repository.Core/Classes/Feature/DimensionSpaceAdjustment/DimensionSpaceCommandHandler.php
@@ -67,22 +67,22 @@ private function handleMoveDimensionSpacePoint(
         MoveDimensionSpacePoint $command,
         ContentRepository $contentRepository
     ): EventsToPublish {
-        $this->requireContentStream($command->contentStreamId, $contentRepository);
-        $streamName = ContentStreamEventStreamName::fromContentStreamId($command->contentStreamId)
+        $contentStreamId = $this->requireContentStreamForWorkspaceName($command->workspaceName, $contentRepository);
+        $streamName = ContentStreamEventStreamName::fromContentStreamId($contentStreamId)
             ->getEventStreamName();
 
         self::requireDimensionSpacePointToBeEmptyInContentStream(
             $command->target,
-            $command->contentStreamId,
+            $contentStreamId,
             $contentRepository->getContentGraph()
         );
-        $this->requireDimensionSpacePointToExistInConfiguration($command->target);
+        $this->requireDimensionSpacePointToExist($command->target);
 
         return new EventsToPublish(
             $streamName,
             Events::with(
                 new DimensionSpacePointWasMoved(
-                    $command->contentStreamId,
+                    $contentStreamId,
                     $command->source,
                     $command->target
                 ),
@@ -95,24 +95,24 @@ private function handleAddDimensionShineThrough(
         AddDimensionShineThrough $command,
         ContentRepository $contentRepository
     ): EventsToPublish {
-        $this->requireContentStream($command->contentStreamId, $contentRepository);
-        $streamName = ContentStreamEventStreamName::fromContentStreamId($command->contentStreamId)
+        $contentStreamId = $this->requireContentStreamForWorkspaceName($command->workspaceName, $contentRepository);
+        $streamName = ContentStreamEventStreamName::fromContentStreamId($contentStreamId)
             ->getEventStreamName();
 
         self::requireDimensionSpacePointToBeEmptyInContentStream(
             $command->target,
-            $command->contentStreamId,
+            $contentStreamId,
             $contentRepository->getContentGraph()
         );
-        $this->requireDimensionSpacePointToExistInConfiguration($command->target);
+        $this->requireDimensionSpacePointToExist($command->target);
 
         $this->requireDimensionSpacePointToBeSpecialization($command->target, $command->source);
 
         return new EventsToPublish(
             $streamName,
             Events::with(
                 new DimensionShineThroughWasAdded(
-                    $command->contentStreamId,
+                    $contentStreamId,
                     $command->source,
                     $command->target
                 )
@@ -124,7 +124,7 @@ private function handleAddDimensionShineThrough(
     /**
      * @throws DimensionSpacePointNotFound
      */
-    protected function requireDimensionSpacePointToExistInConfiguration(DimensionSpacePoint $dimensionSpacePoint): void
+    protected function requireDimensionSpacePointToExist(DimensionSpacePoint $dimensionSpacePoint): void
     {
         $allowedDimensionSubspace = $this->contentDimensionZookeeper->getAllowedDimensionSubspace();
         if (!$allowedDimensionSubspace->contains($dimensionSpacePoint)) {
@@ -183,19 +183,4 @@ protected function requireContentStreamForWorkspaceName(
 
         return $contentStreamId;
     }
-
-    /**
-     * @throws ContentStreamDoesNotExistYet
-     */
-    protected function requireContentStream(
-        ContentStreamId $contentStreamId,
-        ContentRepository $contentRepository
-    ): void {
-        if (!$contentRepository->getContentStreamFinder()->hasContentStream($contentStreamId)) {
-            throw new ContentStreamDoesNotExistYet(
-                'Content stream "' . $contentStreamId->value . '" does not exist yet.',
-                1521386692
-            );
-        }
-    }
 }
diff --git a/...asses/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php b/...asses/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php
@@ -145,7 +145,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/DisableNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/DisableNodeAggregate.php
@@ -91,7 +91,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/EnableNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/EnableNodeAggregate.php
@@ -91,7 +91,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Command/CopyNodesRecursively.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Command/CopyNodesRecursively.php
@@ -156,7 +156,6 @@ public function withNodeAggregateIdMapping(
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/...tRepository.Core/Classes/Feature/NodeModification/Command/SetSerializedNodeProperties.php b/...tRepository.Core/Classes/Feature/NodeModification/Command/SetSerializedNodeProperties.php
@@ -110,7 +110,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Command/MoveNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Command/MoveNodeAggregate.php
@@ -120,7 +120,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/...ntRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php b/...ntRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php
@@ -98,7 +98,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php
@@ -111,7 +111,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php
@@ -85,7 +85,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/...ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php b/...ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php
@@ -109,7 +109,6 @@ public function withTetheredDescendantNodeAggregateIds(NodeAggregateIdsByNodePat
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php
@@ -90,7 +90,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/...ository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php b/...ository.Core/Classes/Feature/RootNodeCreation/Command/CreateRootNodeAggregateWithNode.php
@@ -127,7 +127,6 @@ public function jsonSerialize(): array
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/...itory.Core/Classes/Feature/RootNodeCreation/Command/UpdateRootNodeAggregateDimensions.php b/...itory.Core/Classes/Feature/RootNodeCreation/Command/UpdateRootNodeAggregateDimensions.php
@@ -72,7 +72,6 @@ public function jsonSerialize(): array
 
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
-        ContentStreamId $targetContentStreamId
     ): self {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Command/TagSubtree.php b/Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Command/TagSubtree.php
@@ -78,7 +78,7 @@ public static function fromArray(array $array): self
         );
     }
 
-    public function createCopyForWorkspace(WorkspaceName $targetWorkspaceName, ContentStreamId $targetContentStreamId): self
+    public function createCopyForWorkspace(WorkspaceName $targetWorkspaceName): self
     {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Command/UntagSubtree.php b/Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Command/UntagSubtree.php
@@ -79,7 +79,7 @@ public static function fromArray(array $array): self
         );
     }
 
-    public function createCopyForWorkspace(WorkspaceName $targetWorkspaceName, ContentStreamId $targetContentStreamId): self
+    public function createCopyForWorkspace(WorkspaceName $targetWorkspaceName): self
     {
         return new self(
             $targetWorkspaceName,

diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php
@@ -519,7 +519,7 @@ private function handlePublishIndividualNodesFromWorkspace(
             // 4) using the new content stream, apply the matching commands
             ContentStreamIdOverride::applyContentStreamIdToClosure(
                 $command->contentStreamIdForMatchingPart,
-                function () use ($matchingCommands, $contentRepository, $baseWorkspace, $command): void {
+                function () use ($matchingCommands, $contentRepository, $baseWorkspace): void {
                     foreach ($matchingCommands as $matchingCommand) {
                         if (!($matchingCommand instanceof RebasableToOtherWorkspaceInterface)) {
                             throw new \RuntimeException(
@@ -530,7 +530,6 @@ function () use ($matchingCommands, $contentRepository, $baseWorkspace, $command
 
                         $contentRepository->handle($matchingCommand->createCopyForWorkspace(
                             $baseWorkspace->workspaceName,
-                            $command->contentStreamIdForMatchingPart
                         ))->block();
                     }
                 }
@@ -656,7 +655,7 @@ private function handleDiscardIndividualNodesFromWorkspace(
         try {
             ContentStreamIdOverride::applyContentStreamIdToClosure(
                 $command->newContentStreamId,
-                function () use ($commandsToKeep, $contentRepository, $baseWorkspace, $command): void {
+                function () use ($commandsToKeep, $contentRepository, $baseWorkspace): void {
                     foreach ($commandsToKeep as $matchingCommand) {
                         if (!($matchingCommand instanceof RebasableToOtherWorkspaceInterface)) {
                             throw new \RuntimeException(
@@ -667,7 +666,6 @@ function () use ($commandsToKeep, $contentRepository, $baseWorkspace, $command):
 
                         $contentRepository->handle($matchingCommand->createCopyForWorkspace(
                             $baseWorkspace->workspaceName,
-                            $command->newContentStreamId
                         ))->block();
                     }
                 }