Fix populateTree() wrong secondary using of variable $depth.

paulzi · Oct 13, 2016 · c4910f5 · c4910f5
1 parent 5a2aa28
commit c4910f5
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 37 deletions.
diff --git a/NestedIntervalsBehavior.php b/NestedIntervalsBehavior.php
@@ -277,8 +277,9 @@ public function populateTree($depth = null)
             $nodes = $this->getDescendants($depth)->all();
         }
 
-        $relates = [];
-        $parents = [$this->owner->getAttribute($this->leftAttribute)];
+        $key = $this->owner->getAttribute($this->leftAttribute);
+        $relates[$key] = [];
+        $parents = [$key];
         $prev = $this->owner->getAttribute($this->depthAttribute);
         foreach($nodes as $node)
         {
@@ -302,8 +303,6 @@ public function populateTree($depth = null)
             $key = $node->getAttribute($this->leftAttribute);
             if (isset($relates[$key])) {
                 $node->populateRelation('children', $relates[$key]);
-            } elseif ($depth === null) {
-                $node->populateRelation('children', []);
             }
         }
 

diff --git a/composer.lock b/composer.lock
diff --git a/tests/NestedIntervalsBehavior64TestCase.php b/tests/NestedIntervalsBehavior64TestCase.php
@@ -119,6 +119,10 @@ public function testPopulateTree()
         $node = MultipleTreeNode64::findOne(19);
         $node->populateTree();
         $this->assertEquals(true, $node->isRelationPopulated('children'));
+
+        $node = MultipleTreeNode64::findOne(19);
+        $node->populateTree(1);
+        $this->assertEquals(true, $node->isRelationPopulated('children'));
     }
 
     public function testIsRoot()

diff --git a/tests/NestedIntervalsBehaviorTestCase.php b/tests/NestedIntervalsBehaviorTestCase.php
@@ -132,6 +132,10 @@ public function testPopulateTree()
         $node = Node::findOne(19);
         $node->populateTree();
         $this->assertEquals(true, $node->isRelationPopulated('children'));
+
+        $node = Node::findOne(19);
+        $node->populateTree(1);
+        $this->assertEquals(true, $node->isRelationPopulated('children'));
     }
 
     public function testIsRoot()