Remove Collection::toDictionary

Author: lazychaser

.gitignore

@@ -1,4 +1,5 @@
 /vendor
+/.idea
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store

CHANGELOG.markdown

@@ -0,0 +1,2 @@
+### 1.0.1
+*   Removed `Collection::toDictionary`. Use `Collection::groupBy`.

composer.json

@@ -1,19 +1,20 @@
 {
     "name": "kalnoy/nestedset",
     "description": "Nested Set Model for Laravel 4",
-    "keywords": ["laravel", "nested set", "database", "hierarchy"],
+    "keywords": ["laravel", "nested sets", "database", "hierarchy"],
     "licence": "MIT",
-    
+
     "authors": [
         {
-            "name": "Aleksander Kalnoy",
+            "name": "Alexander Kalnoy",
             "email": "[email protected]"
         }
     ],
+
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": ">=4.0,<4.2",
-        "illuminate/database": ">=4.0,<4.2"
+        "illuminate/support": "4.1.*",
+        "illuminate/database": "4.1.*"
     },
 
     "require-dev": {
@@ -25,5 +26,6 @@
             "Kalnoy\\Nestedset": "src/"
         }
     },
+
     "minimum-stability": "dev"
 }

src/Kalnoy/Nestedset/Collection.php

@@ -5,57 +5,62 @@
 class Collection extends BaseCollection {
 
     /**
-     * Convert list of nodes to dictionary with specified key.
+     * Build tree from node list. Each item will have set children relation.
      *
-     * If no key is specified then "parent_id" is used.
+     * To succesfully build tree "id", "_lft" and "parent_id" keys must present.
+     *
+     * If {@link rootNodeId} is provided, the tree will contain only descendants
+     * of the node with such primary key value.
      *
-     * @param string $key 
+     * @param integer $rootNodeId
      *
-     * @return  array
+     * @return  Collection
      */
-    public function toDictionary($key = null)
+    public function toTree($rootNodeId = null)
     {
-        if (empty($this->items)) {
-            return array();
-        }
+        $result = new static();
+
+        if (empty($this->items)) return $result;
+
+        $key = $this->first()->getParentIdName();
+        $dictionary = $this->groupBy($key);
 
-        if ($key === null) {
-            $key = $this->first()->getParentIdName();
+        $rootNodeId = $this->getRootNodeId($rootNodeId);
+
+        if (!isset($dictionary[$rootNodeId]))
+        {
+            return $result;
         }
 
-        $result = array();
+        $result->items = $dictionary[$rootNodeId];
+
+        foreach ($this->items as $item)
+        {
+            $key = $item->getKey();
+
+            $children = new BaseCollection(isset($dictionary[$key]) ? $dictionary[$key] : array());
 
-        foreach ($this->items as $item) {
-            $result[$item->$key][] = $item;
+            $item->setRelation('children', $children);
         }
 
         return $result;
     }
 
     /**
-     * Build tree from node list.
-     *
-     * To succesfully build tree "id", "_lft" and "parent_id" keys must present.
-     * 
-     * If {@link rootNodeId} is provided, the tree will contain only descendants
-     * of the node with such primary key value.
-     * 
-     * @param integer $rootNodeId
+     * @param null|int $rootNodeId
      *
-     * @return  Collection
+     * @return int
      */
-    public function toTree($rootNodeId = null)
+    public function getRootNodeId($rootNodeId = null)
     {
-        $dictionary = $this->toDictionary();
-        $result = new static();
-
         // If root node is not specified we take parent id of node with
         // least lft value as root node id.
-        if ($rootNodeId === null) 
+        if ($rootNodeId === null)
         {
             $leastValue = null;
 
-            foreach ($this->items as $item) {
+            foreach ($this->items as $item)
+            {
                 if ($leastValue === null || $item->getLft() < $leastValue)
                 {
                     $leastValue = $item->getLft();
@@ -64,21 +69,6 @@ public function toTree($rootNodeId = null)
             }
         }
 
-        $result->items = isset($dictionary[$rootNodeId]) ? $dictionary[$rootNodeId] : array();
-
-        if (empty($result->items)) 
-        {
-            return $result;
-        }
-
-        foreach ($this->items as $item) 
-        {
-            $key = $item->getKey();
-
-            $children = new BaseCollection(isset($dictionary[$key]) ? $dictionary[$key] : array());
-            $item->setRelation('children', $children);
-        }
-
-        return $result;
+        return $rootNodeId;
     }
 }