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

paulzi · Oct 13, 2016 · 2d5aaae · 2d5aaae
1 parent d8350ad
commit 2d5aaae
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 36 deletions.
diff --git a/NestedSetsBehavior.php b/NestedSetsBehavior.php
@@ -226,8 +226,10 @@ public function populateTree($depth = null)
             $nodes = $this->getDescendants($depth)->all();
         }
 
+        $key = $this->owner->getAttribute($this->leftAttribute);
         $relates = [];
-        $parents = [$this->owner->getAttribute($this->leftAttribute)];
+        $relates[$key] = [];
+        $parents = [$key];
         $prev = $this->owner->getAttribute($this->depthAttribute);
         foreach($nodes as $node)
         {
@@ -251,8 +253,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/NestedSetsBehaviorTestCase.php b/tests/NestedSetsBehaviorTestCase.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()