Merge remote-tracking branch 'origin/9.0' into workspaceAwareCommands

neos · Nov 26, 2023 · 94c8a07 · 94c8a07
2 parents 194b8ed + 8ac066b
commit 94c8a07
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -175,9 +175,9 @@ public function indexAction(string $node = null)
         );
         $rootNode = $rootNodeAggregate->getNodeByCoveredDimensionSpacePoint($defaultDimensionSpacePoint);
 
-        $siteNode = $subgraph->findChildNodeConnectedThroughEdgeName(
-            $rootNode->nodeAggregateId,
-            $siteDetectionResult->siteNodeName->toNodeName()
+        $siteNode = $subgraph->findNodeByPath(
+            $siteDetectionResult->siteNodeName->toNodeName(),
+            $rootNode->nodeAggregateId
         );
 
         if (!$nodeAddress) {

diff --git a/Classes/Domain/Model/Changes/CopyAfter.php b/Classes/Domain/Model/Changes/CopyAfter.php
@@ -86,9 +86,9 @@ public function apply(): void
             $contentRepository->handle($command)->block();
 
             $newlyCreatedNode = $this->contentRepositoryRegistry->subgraphForNode($parentNodeOfPreviousSibling)
-                ->findChildNodeConnectedThroughEdgeName(
-                    $parentNodeOfPreviousSibling->nodeAggregateId,
-                    $targetNodeName
+                ->findNodeByPath(
+                    $targetNodeName,
+                    $parentNodeOfPreviousSibling->nodeAggregateId
                 );
             $this->finish($newlyCreatedNode);
             // NOTE: we need to run "finish" before "addNodeCreatedFeedback"

diff --git a/Classes/Domain/Model/Changes/CopyBefore.php b/Classes/Domain/Model/Changes/CopyBefore.php
@@ -78,9 +78,9 @@ public function apply(): void
             $contentRepository->handle($command)->block();
 
             $newlyCreatedNode = $this->contentRepositoryRegistry->subgraphForNode($parentNodeOfSucceedingSibling)
-                ->findChildNodeConnectedThroughEdgeName(
-                    $parentNodeOfSucceedingSibling->nodeAggregateId,
-                    $targetNodeName
+                ->findNodeByPath(
+                    $targetNodeName,
+                    $parentNodeOfSucceedingSibling->nodeAggregateId
                 );
             $this->finish($newlyCreatedNode);
             // NOTE: we need to run "finish" before "addNodeCreatedFeedback"

diff --git a/Classes/Domain/Model/Changes/CopyInto.php b/Classes/Domain/Model/Changes/CopyInto.php
@@ -87,9 +87,9 @@ public function apply(): void
             $contentRepository->handle($command)->block();
 
             $newlyCreatedNode = $this->contentRepositoryRegistry->subgraphForNode($parentNode)
-                ->findChildNodeConnectedThroughEdgeName(
-                    $parentNode->nodeAggregateId,
-                    $targetNodeName
+                ->findNodeByPath(
+                    $targetNodeName,
+                    $parentNode->nodeAggregateId
                 );
             $this->finish($newlyCreatedNode);
             // NOTE: we need to run "finish" before "addNodeCreatedFeedback"