neos · mhsdesign · May 14, 2024 · May 12, 2024 · May 12, 2024 · May 14, 2024
diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php
@@ -106,7 +106,7 @@ public function getPublishableNodeInfo(WorkspaceName $workspaceName, ContentRepo
                 if ($node instanceof Node) {
                     $documentNode = $subgraph->findClosestNode($node->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
                     if ($documentNode instanceof Node) {
-                        $contentRepository = $this->contentRepositoryRegistry->get($documentNode->subgraphIdentity->contentRepositoryId);
+                        $contentRepository = $this->contentRepositoryRegistry->get($documentNode->contentRepositoryId);
                         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
                         $unpublishedNodes[] = [
                             'contextPath' => $nodeAddressFactory->createFromNode($node)->serializeForUri(),

diff --git a/Classes/Domain/Model/AbstractChange.php b/Classes/Domain/Model/AbstractChange.php
@@ -72,14 +72,8 @@ protected function updateWorkspaceInfo(): void
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($this->subject);
             $documentNode = $subgraph->findClosestNode($this->subject->nodeAggregateId, FindClosestNodeFilter::create(nodeTypes: NodeTypeNameFactory::NAME_DOCUMENT));
             if (!is_null($documentNode)) {
-                $contentRepository = $this->contentRepositoryRegistry->get($this->subject->subgraphIdentity->contentRepositoryId);
-                $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId(
-                    $documentNode->subgraphIdentity->contentStreamId
-                );
-                if (!is_null($workspace)) {
-                    $updateWorkspaceInfo = new UpdateWorkspaceInfo($documentNode->subgraphIdentity->contentRepositoryId, $workspace->workspaceName);
-                    $this->feedbackCollection->add($updateWorkspaceInfo);
-                }
+                $updateWorkspaceInfo = new UpdateWorkspaceInfo($documentNode->contentRepositoryId, $documentNode->workspaceName);
+                $this->feedbackCollection->add($updateWorkspaceInfo);
             }
         }
     }

diff --git a/Classes/Domain/Model/Changes/AbstractCreate.php b/Classes/Domain/Model/Changes/AbstractCreate.php
@@ -140,20 +140,13 @@ protected function createNode(
 
         $nodeAggregateId = $this->getNodeAggregateId() ?? NodeAggregateId::create(); // generate a new NodeAggregateId
 
-        $contentRepository = $this->contentRepositoryRegistry->get($parentNode->subgraphIdentity->contentRepositoryId);
-        $workspace = $this->contentRepositoryRegistry->get($this->subject->subgraphIdentity->contentRepositoryId)
-            ->getWorkspaceFinder()->findOneByCurrentContentStreamId($parentNode->subgraphIdentity->contentStreamId);
-        if (!$workspace) {
-            throw new \Exception(
-                'Could not find workspace for content stream "' . $parentNode->subgraphIdentity->contentStreamId->value . '"',
-                1699008140
-            );
-        }
+        $contentRepository = $this->contentRepositoryRegistry->get($parentNode->contentRepositoryId);
+
         $command = CreateNodeAggregateWithNode::create(
-            $workspace->workspaceName,
+            $parentNode->workspaceName,
             $nodeAggregateId,
             $nodeTypeName,
-            OriginDimensionSpacePoint::fromDimensionSpacePoint($parentNode->subgraphIdentity->dimensionSpacePoint),
+            OriginDimensionSpacePoint::fromDimensionSpacePoint($parentNode->dimensionSpacePoint),
             $parentNode->nodeAggregateId,
             $succeedingSiblingNodeAggregateId,
             $nodeName

diff --git a/Classes/Domain/Model/Changes/AbstractStructuralChange.php b/Classes/Domain/Model/Changes/AbstractStructuralChange.php
@@ -116,7 +116,7 @@ public function getSiblingNode(): ?Node
         if ($this->cachedSiblingNode === null) {
             $this->cachedSiblingNode = $this->nodeService->findNodeBySerializedNodeAddress(
                 $this->siblingDomAddress->getContextPath(),
-                $this->getSubject()->subgraphIdentity->contentRepositoryId
+                $this->getSubject()->contentRepositoryId
             );
         }
 
@@ -155,7 +155,7 @@ protected function finish(Node $node)
             // 1) the parent of our new (or copied or moved) node is a ContentCollection;
             // so we can directly update an element of this content collection
 
-            $contentRepository = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId);
+            $contentRepository = $this->contentRepositoryRegistry->get($node->contentRepositoryId);
             if ($parentNode && $this->getNodeType($parentNode)->isOfType('Neos.Neos:ContentCollection') &&
                 // 2) the parent DOM address (i.e. the closest RENDERED node in DOM is actually the ContentCollection;
                 // and no other node in between
@@ -195,7 +195,7 @@ protected function isNodeTypeAllowedAsChildNode(Node $node, NodeType $nodeType):
 
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
         $parentNode = $subgraph->findParentNode($node->nodeAggregateId);
-        $nodeTypeManager = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId)->getNodeTypeManager();
+        $nodeTypeManager = $this->contentRepositoryRegistry->get($node->contentRepositoryId)->getNodeTypeManager();
 
         return !$parentNode || $nodeTypeManager->isNodeTypeAllowedAsChildToTetheredNode(
             $this->getNodeType($parentNode),

diff --git a/Classes/Domain/Model/Changes/CopyAfter.php b/Classes/Domain/Model/Changes/CopyAfter.php
@@ -68,19 +68,15 @@ public function apply(): void
                 // do nothing; $succeedingSibling is null.
             }
 
-            $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
-            $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId($subject->subgraphIdentity->contentStreamId);
-            if (!$workspace) {
-                throw new \Exception('Could not find workspace for content stream', 1699004343);
-            }
+            $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $command = CopyNodesRecursively::createFromSubgraphAndStartNode(
-                $contentRepository->getContentGraph($workspace->workspaceName)->getSubgraph(
-                    $subject->subgraphIdentity->dimensionSpacePoint,
+                $contentRepository->getContentGraph($subject->workspaceName)->getSubgraph(
+                    $subject->dimensionSpacePoint,
                     VisibilityConstraints::withoutRestrictions()
                 ),
-                $workspace->workspaceName,
+                $subject->workspaceName,
                 $subject,
-                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->subgraphIdentity->dimensionSpacePoint),
+                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
                 $parentNodeOfPreviousSibling->nodeAggregateId,
                 $succeedingSibling?->nodeAggregateId,
                 null

diff --git a/Classes/Domain/Model/Changes/CopyBefore.php b/Classes/Domain/Model/Changes/CopyBefore.php
@@ -61,19 +61,15 @@ public function apply(): void
         if ($this->canApply() && !is_null($subject) && !is_null($succeedingSibling)
             && !is_null($parentNodeOfSucceedingSibling)
         ) {
-            $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
-            $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId($subject->subgraphIdentity->contentStreamId);
-            if (!$workspace) {
-                throw new \Exception('Could not find workspace for content stream', 1699004343);
-            }
+            $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $command = CopyNodesRecursively::createFromSubgraphAndStartNode(
-                $contentRepository->getContentGraph($workspace->workspaceName)->getSubgraph(
-                    $subject->subgraphIdentity->dimensionSpacePoint,
-                    $subject->subgraphIdentity->visibilityConstraints
+                $contentRepository->getContentGraph($subject->workspaceName)->getSubgraph(
+                    $subject->dimensionSpacePoint,
+                    $subject->visibilityConstraints
                 ),
-                $workspace->workspaceName,
+                $subject->workspaceName,
                 $subject,
-                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->subgraphIdentity->dimensionSpacePoint),
+                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
                 $parentNodeOfSucceedingSibling->nodeAggregateId,
                 $succeedingSibling->nodeAggregateId,
                 null

diff --git a/Classes/Domain/Model/Changes/CopyInto.php b/Classes/Domain/Model/Changes/CopyInto.php
@@ -69,19 +69,15 @@ public function apply(): void
         $subject = $this->getSubject();
         $parentNode = $this->getParentNode();
         if ($parentNode && $subject && $this->canApply()) {
-            $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
-            $workspace = $contentRepository->getWorkspaceFinder()->findOneByCurrentContentStreamId($subject->subgraphIdentity->contentStreamId);
-            if (!$workspace) {
-                throw new \Exception('Could not find workspace for content stream', 1699004343);
-            }
+            $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $command = CopyNodesRecursively::createFromSubgraphAndStartNode(
-                $contentRepository->getContentGraph($workspace->workspaceName)->getSubgraph(
-                    $subject->subgraphIdentity->dimensionSpacePoint,
-                    $subject->subgraphIdentity->visibilityConstraints
+                $contentRepository->getContentGraph($subject->workspaceName)->getSubgraph(
+                    $subject->dimensionSpacePoint,
+                    $subject->visibilityConstraints
                 ),
-                $workspace->workspaceName,
+                $subject->workspaceName,
                 $subject,
-                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->subgraphIdentity->dimensionSpacePoint),
+                OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->dimensionSpacePoint),
                 $parentNode->nodeAggregateId,
                 null,
                 null

diff --git a/Classes/Domain/Model/Changes/Create.php b/Classes/Domain/Model/Changes/Create.php
@@ -39,7 +39,7 @@ public function canApply(): bool
     {
         $subject = $this->getSubject();
         $nodeTypeName = $this->getNodeTypeName();
-        $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
+        $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
         $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($nodeTypeName);
 
         return $this->isNodeTypeAllowedAsChildNode($subject, $nodeType);

diff --git a/Classes/Domain/Model/Changes/CreateAfter.php b/Classes/Domain/Model/Changes/CreateAfter.php
@@ -37,7 +37,7 @@ public function canApply(): bool
         }
         $parent = $this->findParentNode($this->subject);
         $nodeTypeName = $this->getNodeTypeName();
-        $contentRepository = $this->contentRepositoryRegistry->get($parent->subgraphIdentity->contentRepositoryId);
+        $contentRepository = $this->contentRepositoryRegistry->get($parent->contentRepositoryId);
         $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($nodeTypeName);
 
         return $this->isNodeTypeAllowedAsChildNode($parent, $nodeType);

diff --git a/Classes/Domain/Model/Changes/CreateBefore.php b/Classes/Domain/Model/Changes/CreateBefore.php
@@ -37,7 +37,7 @@ public function canApply(): bool
         }
         $parent = $this->findParentNode($this->subject);
         $nodeTypeName = $this->getNodeTypeName();
-        $contentRepository = $this->contentRepositoryRegistry->get($parent->subgraphIdentity->contentRepositoryId);
+        $contentRepository = $this->contentRepositoryRegistry->get($parent->contentRepositoryId);
         $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($nodeTypeName);
 
         return $this->isNodeTypeAllowedAsChildNode($parent, $nodeType);

diff --git a/Classes/Domain/Model/Changes/MoveAfter.php b/Classes/Domain/Model/Changes/MoveAfter.php
@@ -77,19 +77,11 @@ public function apply(): void
                 ->equals($parentNodeOfPreviousSibling->nodeAggregateId);
 
 
-            $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
-            $workspace = $this->contentRepositoryRegistry->get($this->subject->subgraphIdentity->contentRepositoryId)
-                ->getWorkspaceFinder()->findOneByCurrentContentStreamId($subject->subgraphIdentity->contentStreamId);
-            if (!$workspace) {
-                throw new \Exception(
-                    'Could not find workspace for content stream "' . $subject->subgraphIdentity->contentStreamId->value . '"',
-                    1699008140
-                );
-            }
+            $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
 
             $command = MoveNodeAggregate::create(
-                $workspace->workspaceName,
-                $subject->subgraphIdentity->dimensionSpacePoint,
+                $subject->workspaceName,
+                $subject->dimensionSpacePoint,
                 $subject->nodeAggregateId,
                 RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                 $hasEqualParentNode ? null : $parentNodeOfPreviousSibling->nodeAggregateId,

diff --git a/Classes/Domain/Model/Changes/MoveBefore.php b/Classes/Domain/Model/Changes/MoveBefore.php
@@ -71,20 +71,12 @@ public function apply(): void
             $hasEqualParentNode = $parentNode->nodeAggregateId
                 ->equals($succeedingSiblingParent->nodeAggregateId);
 
-            $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
-            $workspace = $this->contentRepositoryRegistry->get($this->subject->subgraphIdentity->contentRepositoryId)
-                ->getWorkspaceFinder()->findOneByCurrentContentStreamId($subject->subgraphIdentity->contentStreamId);
-            if (!$workspace) {
-                throw new \Exception(
-                    'Could not find workspace for content stream "' . $subject->subgraphIdentity->contentStreamId->value . '"',
-                    1699008140
-                );
-            }
+            $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
 
             $contentRepository->handle(
                 MoveNodeAggregate::create(
-                    $workspace->workspaceName,
-                    $subject->subgraphIdentity->dimensionSpacePoint,
+                    $subject->workspaceName,
+                    $subject->dimensionSpacePoint,
                     $subject->nodeAggregateId,
                     RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                     $hasEqualParentNode

diff --git a/Classes/Domain/Model/Changes/MoveInto.php b/Classes/Domain/Model/Changes/MoveInto.php
@@ -39,7 +39,7 @@ public function getParentNode(): ?Node
 
         return $this->nodeService->findNodeBySerializedNodeAddress(
             $this->parentContextPath,
-            $this->getSubject()->subgraphIdentity->contentRepositoryId
+            $this->getSubject()->contentRepositoryId
         );
     }
 
@@ -82,19 +82,11 @@ public function apply(): void
             $hasEqualParentNode = $otherParent && $otherParent->nodeAggregateId
                     ->equals($parentNode->nodeAggregateId);
 
-            $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
-            $workspace = $this->contentRepositoryRegistry->get($this->subject->subgraphIdentity->contentRepositoryId)
-                ->getWorkspaceFinder()->findOneByCurrentContentStreamId($subject->subgraphIdentity->contentStreamId);
-            if (!$workspace) {
-                throw new \Exception(
-                    'Could not find workspace for content stream "' . $subject->subgraphIdentity->contentStreamId->value . '"',
-                    1699008140
-                );
-            }
+            $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $contentRepository->handle(
                 MoveNodeAggregate::create(
-                    $workspace->workspaceName,
-                    $subject->subgraphIdentity->dimensionSpacePoint,
+                    $subject->workspaceName,
+                    $subject->dimensionSpacePoint,
                     $subject->nodeAggregateId,
                     RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                     $hasEqualParentNode ? null : $parentNode->nodeAggregateId,