Calculate the depth before calling

Author: larowlan

src/Storage/DbalNestedSet.php

@@ -308,23 +308,23 @@ public function moveSubTreeToRoot(Node $node) {
    */
   public function moveSubTreeBelow(Node $target, Node $node) {
     $newLeftPosition = $target->getLeft() + 1;
-    $this->moveSubTreeToPosition($newLeftPosition, $node);
+    $this->moveSubTreeToPosition($newLeftPosition, $node, $target->getDepth() + 1);
   }
 
   /**
    * {@inheritdoc}
    */
   public function moveSubTreeBefore(Node $target, Node $node) {
     $newLeftPosition = $target->getLeft();
-    $this->moveSubTreeToPosition($newLeftPosition, $node);
+    $this->moveSubTreeToPosition($newLeftPosition, $node, $target->getDepth());
   }
 
   /**
    * {@inheritdoc}
    */
   public function moveSubTreeAfter(Node $target, Node $node) {
     $newLeftPosition = $target->getRight() + 1;
-    $this->moveSubTreeToPosition($newLeftPosition, $node);
+    $this->moveSubTreeToPosition($newLeftPosition, $node, $target->getDepth());
   }
 
   /**
@@ -334,11 +334,13 @@ public function moveSubTreeAfter(Node $target, Node $node) {
    *   The new left position.
    * @param \PNX\NestedSet\Node $node
    *   The node to move.
+   * @param int $newDepth
+   *   Depth of new position.
    *
    * @throws \Exception
    *   If a transaction error occurs.
    */
-  protected function moveSubTreeToPosition($newLeftPosition, Node $node) {
+  protected function moveSubTreeToPosition($newLeftPosition, Node $node, $newDepth) {
     try {
       // Calculate position adjustment variables.
       $width = $node->getRight() - $node->getLeft() + 1;
@@ -348,14 +350,7 @@ protected function moveSubTreeToPosition($newLeftPosition, Node $node) {
       $this->connection->beginTransaction();
 
       // Calculate depth difference.
-      $newNode = $this->getNodeAtPosition($newLeftPosition);
-      if (!$newNode) {
-        // No other children at this position, new depth = 1.
-        $depthDiff = 1 - $node->getDepth();
-      }
-      else {
-        $depthDiff = $newNode->getDepth() - $node->getDepth();
-      }
+      $depthDiff = $newDepth - $node->getDepth();
 
       // Backwards movement must account for new space.
       if ($distance < 0) {

tests/Functional/DbalNestedSetTest.php

@@ -392,12 +392,9 @@ public function testMoveSubTreeBelowEndChildNode() {
     $nodeKey = new NodeKey(7, 1);
     $node = $this->nestedSet->getNode($nodeKey);
 
-    $this->printTree($this->nestedSet->getTree());
     $newRoot = $this->nestedSet->addRootNode(new NodeKey(12, 1));
     $newChild = $this->nestedSet->addNodeBelow($newRoot, new NodeKey(13, 1));
-    $this->printTree($this->nestedSet->getTree());
     $this->nestedSet->moveSubTreeBelow($newChild, $node);
-    $this->printTree($this->nestedSet->getTree());
 
     // Check node is in new position.
     $node = $this->nestedSet->getNode($nodeKey);