BUGFIX: fix moving nodes in specific circumstances like fallback dime…

…nsions
neos · Dec 6, 2023 · c7551cd · c7551cd
1 parent 5b0469a
commit c7551cd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Neos.ContentRepository/Classes/Domain/Model/Node.php b/Neos.ContentRepository/Classes/Domain/Model/Node.php
@@ -618,8 +618,8 @@ public function moveBefore(NodeInterface $referenceNode, string $newName = null)
         $name = $newName !== null ? $newName : $this->getName();
         $referenceParentNode = $referenceNode->getParent();
 
-        if ($referenceParentNode !== $this->getParent() && $referenceParentNode->getNode($name) !== null) {
-            throw new NodeExistsException(sprintf('Node with path "%s" already exists.', $name), 1292503468);
+        if ($referenceParentNode !== $this->getParent() && $referenceParentNode->getNode($name) === $this) {
+            throw new NodeExistsException(sprintf('Node with path "%s" already exists.', $this->getPath()), 1292503468);
         }
 
         if (($referenceParentNode instanceof Node && !$referenceParentNode->willChildNodeBeAutoCreated($name)) && !$referenceParentNode->isNodeTypeAllowedAsChildNode($this->getNodeType())) {
@@ -665,8 +665,8 @@ public function moveAfter(NodeInterface $referenceNode, string $newName = null):
         $name = $newName !== null ? $newName : $this->getName();
         $referenceParentNode = $referenceNode->getParent();
 
-        if ($referenceParentNode !== $this->getParent() && $referenceParentNode->getNode($name) !== null) {
-            throw new NodeExistsException(sprintf('Node with path "%s" already exists.', $name), 1292503469);
+        if ($referenceParentNode !== $this->getParent() && $referenceParentNode->getNode($name) === $this) {
+            throw new NodeExistsException(sprintf('Node with path "%s" already exists.', $this->getPath()), 1292503469);
         }
 
         if (($referenceParentNode instanceof Node && !$referenceParentNode->willChildNodeBeAutoCreated($name)) && !$referenceParentNode->isNodeTypeAllowedAsChildNode($this->getNodeType())) {
@@ -711,8 +711,8 @@ public function moveInto(NodeInterface $referenceNode, string $newName = null):
 
         $name = $newName !== null ? $newName : $this->getName();
 
-        if ($referenceNode !== $this->getParent() && $referenceNode->getNode($name) !== null) {
-            throw new NodeExistsException(sprintf('Node with path "%s" already exists.', $name), 1292503470);
+        if ($referenceNode !== $this->getParent() && $referenceNode->getNode($name) === $this) {
+            throw new NodeExistsException(sprintf('Node with path "%s" already exists.', $this->getPath()), 1292503470);
         }
 
         if (($referenceNode instanceof Node && !$referenceNode->willChildNodeBeAutoCreated($name)) && !$referenceNode->isNodeTypeAllowedAsChildNode($this->getNodeType())) {