TASK: Remove obsolete workspaceName from NodeIdToPublishOrDiscard

ahaeslich · Mar 14, 2024 · 43827ba · 43827ba
1 parent 25e0d3b
commit 43827ba
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 30 deletions.
diff --git a/...asses/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php b/...asses/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php
@@ -138,8 +138,7 @@ public function jsonSerialize(): array
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
         return (
-            $this->workspaceName === $nodeIdToPublish->workspaceName
-                && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
+            $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
                 && $this->originDimensionSpacePoint->equals($nodeIdToPublish->dimensionSpacePoint)
         );
     }

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/DisableNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/DisableNodeAggregate.php
@@ -84,8 +84,7 @@ public function jsonSerialize(): array
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
         return (
-            $this->workspaceName === $nodeIdToPublish->workspaceName
-                && $this->coveredDimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint
+           $this->coveredDimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint
                 && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
         );
     }

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/EnableNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDisabling/Command/EnableNodeAggregate.php
@@ -84,8 +84,7 @@ public function jsonSerialize(): array
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
         return (
-            $this->workspaceName === $nodeIdToPublish->workspaceName
-                && $this->coveredDimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint
+            $this->coveredDimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint
                 && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
         );
     }

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Command/CopyNodesRecursively.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Command/CopyNodesRecursively.php
@@ -135,7 +135,6 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
         );
         return (
             !is_null($targetNodeAggregateId)
-                && $this->workspaceName === $nodeIdToPublish->workspaceName
                 && $this->targetDimensionSpacePoint->equals($nodeIdToPublish->dimensionSpacePoint)
                 && $targetNodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
         );

diff --git a/...tRepository.Core/Classes/Feature/NodeModification/Command/SetSerializedNodeProperties.php b/...tRepository.Core/Classes/Feature/NodeModification/Command/SetSerializedNodeProperties.php
@@ -103,8 +103,7 @@ public function jsonSerialize(): array
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
         return (
-            $this->workspaceName === $nodeIdToPublish->workspaceName
-                && $this->originDimensionSpacePoint->equals($nodeIdToPublish->dimensionSpacePoint)
+            $this->originDimensionSpacePoint->equals($nodeIdToPublish->dimensionSpacePoint)
                 && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
         );
     }

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Command/MoveNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeMove/Command/MoveNodeAggregate.php
@@ -114,8 +114,7 @@ public function jsonSerialize(): array
 
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
-        return $this->workspaceName === $nodeIdToPublish->workspaceName
-            && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
+        return $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
             && $this->dimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint;
     }
 

diff --git a/...ntRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php b/...ntRepository.Core/Classes/Feature/NodeReferencing/Command/SetSerializedNodeReferences.php
@@ -91,9 +91,7 @@ public function jsonSerialize(): array
 
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
-        return (
-            $this->workspaceName === $nodeIdToPublish->workspaceName
-                && $this->sourceOriginDimensionSpacePoint->equals($nodeIdToPublish->dimensionSpacePoint)
+        return ($this->sourceOriginDimensionSpacePoint->equals($nodeIdToPublish->dimensionSpacePoint)
                 && $this->sourceNodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
         );
     }

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRemoval/Command/RemoveNodeAggregate.php
@@ -104,8 +104,7 @@ public function jsonSerialize(): array
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
         return (
-            $this->workspaceName === $nodeIdToPublish->workspaceName
-                && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
+            $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
                 && $this->coveredDimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint
         );
     }

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php b/Neos.ContentRepository.Core/Classes/Feature/NodeRenaming/Command/ChangeNodeAggregateName.php
@@ -80,10 +80,7 @@ public function jsonSerialize(): array
 
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
-        return (
-            $this->workspaceName->equals($nodeIdToPublish->workspaceName)
-                && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
-        );
+        return $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId);
     }
 
     public function createCopyForWorkspace(

diff --git a/...ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php b/...ContentRepository.Core/Classes/Feature/NodeTypeChange/Command/ChangeNodeAggregateType.php
@@ -79,8 +79,7 @@ public static function fromArray(array $array): self
 
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
-        return $this->workspaceName === $nodeIdToPublish->workspaceName
-            && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId);
+        return $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId);
     }
 
     /**

diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php b/Neos.ContentRepository.Core/Classes/Feature/NodeVariation/Command/CreateNodeVariant.php
@@ -84,8 +84,7 @@ public function jsonSerialize(): array
 
     public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
     {
-        return $this->workspaceName->equals($nodeIdToPublish->workspaceName)
-            && $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
+        return $this->nodeAggregateId->equals($nodeIdToPublish->nodeAggregateId)
             && $this->targetOrigin->equals($nodeIdToPublish->dimensionSpacePoint);
     }
 

diff --git a/...tentRepository.Core/Classes/Feature/WorkspacePublication/Dto/NodeIdToPublishOrDiscard.php b/...tentRepository.Core/Classes/Feature/WorkspacePublication/Dto/NodeIdToPublishOrDiscard.php
@@ -30,8 +30,6 @@
 final readonly class NodeIdToPublishOrDiscard implements \JsonSerializable
 {
     public function __construct(
-        /** @todo do we really need this? should be unique per command, not per node in the command */
-        public WorkspaceName $workspaceName,
         public NodeAggregateId $nodeAggregateId,
         public DimensionSpacePoint $dimensionSpacePoint,
     ) {
@@ -43,7 +41,6 @@ public function __construct(
     public static function fromArray(array $array): self
     {
         return new self(
-            WorkspaceName::fromString($array['workspaceName']),
             NodeAggregateId::fromString($array['nodeAggregateId']),
             DimensionSpacePoint::fromArray($array['dimensionSpacePoint']),
         );

diff --git a/Neos.ContentRepositoryRegistry/Classes/Service/EventMigrationService.php b/Neos.ContentRepositoryRegistry/Classes/Service/EventMigrationService.php
@@ -20,6 +20,7 @@
 use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant;
 use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode;
 use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\UpdateRootNodeAggregateDimensions;
+use Neos\ContentRepository\Core\Feature\WorkspacePublication\Dto\NodeIdToPublishOrDiscard;
 use Neos\ContentRepositoryRegistry\Command\MigrateEventsCommandController;
 use Neos\ContentRepositoryRegistry\Factory\EventStore\DoctrineEventStoreFactory;
 use Neos\EventStore\EventStoreInterface;

diff --git a/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php b/Neos.Neos/Classes/Controller/Module/Management/WorkspacesController.php
@@ -522,7 +522,6 @@ public function publishNodeAction(string $nodeAddress, WorkspaceName $selectedWo
             $selectedWorkspace,
             NodeIdsToPublishOrDiscard::create(
                 new NodeIdToPublishOrDiscard(
-                    $selectedWorkspace,
                     $nodeAddress->nodeAggregateId,
                     $nodeAddress->dimensionSpacePoint
                 )
@@ -560,7 +559,6 @@ public function discardNodeAction(string $nodeAddress, WorkspaceName $selectedWo
             $selectedWorkspace,
             NodeIdsToPublishOrDiscard::create(
                 new NodeIdToPublishOrDiscard(
-                    $selectedWorkspace,
                     $nodeAddress->nodeAggregateId,
                     $nodeAddress->dimensionSpacePoint
                 )
@@ -598,7 +596,6 @@ public function publishOrDiscardNodesAction(array $nodes, string $action, string
         foreach ($nodes as $node) {
             $nodeAddress = $nodeAddressFactory->createFromUriString($node);
             $nodesToPublishOrDiscard[] = new NodeIdToPublishOrDiscard(
-                $selectedWorkspaceName,
                 $nodeAddress->nodeAggregateId,
                 $nodeAddress->dimensionSpacePoint
             );