FIX: Correctly use movedTo path when searching for referencedShadowNode in NodeData::move()

Benjamin-K · Benjamin-K · commit e60f1f54c858 · 2025-05-26T10:42:53.000+02:00
diff --git a/Neos.ContentRepository/Classes/Domain/Model/NodeData.php b/Neos.ContentRepository/Classes/Domain/Model/NodeData.php
@@ -897,7 +897,7 @@ public function move($targetPath, Workspace $targetWorkspace)
                     $this->nodeDataRepository->remove($movedNodeDataInTargetWorkspace);
                 }
 
-                $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData);
+                $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData->getMovedTo());
                 if ($referencedShadowNode !== null) {
                     $this->nodeDataRepository->remove($referencedShadowNode);
                 }
@@ -925,7 +925,7 @@ public function move($targetPath, Workspace $targetWorkspace)
                 $movedNodeData->createShadow($originalPath);
             }
         } else {
-            $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData);
+            $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData->getMovedTo());
             if ($targetPathShadowNodeData === null) {
                 if ($referencedShadowNode === null) {
                     // There is no shadow node on the original or target path, so the current node data will be turned to a shadow node and a new node data will be created for the moved node.

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ public function move($targetPath, Workspace $targetWorkspace)`
`897`	`897`	`$this->nodeDataRepository->remove($movedNodeDataInTargetWorkspace);`
`898`	`898`	`}`
`899`	`899`
`900`		`- $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData);`
	`900`	`+ $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData->getMovedTo());`
`901`	`901`	`if ($referencedShadowNode !== null) {`
`902`	`902`	`$this->nodeDataRepository->remove($referencedShadowNode);`
`903`	`903`	`}`
`@@ -925,7 +925,7 @@ public function move($targetPath, Workspace $targetWorkspace)`
`925`	`925`	`$movedNodeData->createShadow($originalPath);`
`926`	`926`	`}`
`927`	`927`	`} else {`
`928`		`- $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData);`
	`928`	`+ $referencedShadowNode = $this->nodeDataRepository->findOneByMovedTo($sourceNodeData->getMovedTo());`
`929`	`929`	`if ($targetPathShadowNodeData === null) {`
`930`	`930`	`if ($referencedShadowNode === null) {`
`931`	`931`	`// There is no shadow node on the original or target path, so the current node data will be turned to a shadow node and a new node data will be created for the moved node.`