listFlattened bug

Author: sdebacker

src/NestableCollection.php

@@ -15,14 +15,14 @@
 
 class NestableCollection extends Collection
 {
-    private $total;
-    private $parentColumn;
+    private $total = 0;
+    private $parentKey = null;
 
-    public function __construct($items = array())
+    public function __construct(array $items = array(), $parentKey = 'parent_id')
     {
         parent::__construct($items);
-        $this->parentColumn = 'parent_id';
         $this->total = count($items);
+        $this->parentKey = $parentKey;
     }
 
     /**
@@ -32,8 +32,8 @@ public function __construct($items = array())
      */
     public function nest()
     {
-        $parentColumn = $this->parentColumn;
-        if (! $parentColumn) {
+        $parentKey = $this->parentKey;
+        if (! $parentKey) {
             return $this;
         }
 
@@ -51,8 +51,8 @@ public function nest()
 
         // add items to children collection
         foreach ($this->items as $key => $item) {
-            if ($item->$parentColumn && isset($this->items[$item->$parentColumn])) {
-                $this->items[$item->$parentColumn]->items->push($item);
+            if ($item->$parentKey && isset($this->items[$item->$parentKey])) {
+                $this->items[$item->$parentKey]->items->push($item);
                 $keysToDelete[] = $item->id;
             }
         }
@@ -70,15 +70,15 @@ public function nest()
      * @param  BaseCollection|null $collection
      * @param  integer             $level
      * @param  array               &$flattened
-     * @param  string              $key
+     * @param  string              $column
      * @param  string              $indentChars
      * @return array
      */
-    public function listsFlattened(BaseCollection $collection = null, $level = 0, array &$flattened = [], $key = 'title', $indentChars = '    ')
+    public function listsFlattened(BaseCollection $collection = null, $level = 0, array &$flattened = [], $column = 'title', $indentChars = '    ')
     {
         $collection = $collection ? : $this ;
         foreach ($collection as $item) {
-            $flattened[str_repeat($indentChars, $level) . $item->$key] = $item->id;
+            $flattened[$item->id] = str_repeat($indentChars, $level) . $item->$column;
             if ($item->items) {
                 $this->listsFlattened($item->items, $level + 1, $flattened);
             }