Merge remote-tracking branch 'origin/1.1'

Author: lazychaser

.gitignore

@@ -2,4 +2,4 @@
 /.idea
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store

CHANGELOG.markdown

@@ -0,0 +1,2 @@
+### 1.0.1
+*   `Collection::toDictionary` is now obsolete. 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.18",
+        "illuminate/database": "~4.1.18"
     },
 
     "require-dev": {
@@ -24,6 +25,5 @@
         "psr-0": {
             "Kalnoy\\Nestedset": "src/"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }

src/Kalnoy/Nestedset/Collection.php

@@ -9,76 +9,85 @@ class Collection extends BaseCollection {
      *
      * If no key is specified then "parent_id" is used.
      *
-     * @param string $key 
+     * @param string $key
      *
      * @return  array
+     * @deprecated since 1.1
      */
     public function toDictionary($key = null)
     {
-        if (empty($this->items)) {
-            return array();
-        }
-
-        if ($key === null) {
-            $key = $this->first()->getParentIdName();
-        }
-
-        $result = array();
-
-        foreach ($this->items as $item) {
-            $result[$item->$key][] = $item;
-        }
+        if ($key === null) $key = $this->first()->getParentIdName();
 
-        return $result;
+        return $this->groupBy($key)->all();
     }
 
     /**
-     * Build tree from node list.
+     * Build tree from node list. Each item will have set children relation.
      *
      * 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
      *
      * @return  Collection
      */
     public function toTree($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) 
-        {
-            $leastValue = null;
+        if (empty($this->items)) return $result;
 
-            foreach ($this->items as $item) {
-                if ($leastValue === null || $item->getLft() < $leastValue)
-                {
-                    $leastValue = $item->getLft();
-                    $rootNodeId = $item->getParentId();
-                }
-            }
-        }
+        $key = $this->first()->getParentIdName();
+        $dictionary = $this->groupBy($key);
 
-        $result->items = isset($dictionary[$rootNodeId]) ? $dictionary[$rootNodeId] : array();
+        $rootNodeId = $this->getRootNodeId($rootNodeId);
 
-        if (empty($result->items)) 
+        if (!$dictionary->has($rootNodeId))
         {
             return $result;
         }
 
-        foreach ($this->items as $item) 
+        $result->items = $dictionary->get($rootNodeId);
+
+        foreach ($this->items as $item)
         {
             $key = $item->getKey();
 
-            $children = new BaseCollection(isset($dictionary[$key]) ? $dictionary[$key] : array());
-            $item->setRelation('children', $children);
+            $children = $dictionary->has($key)
+                ? $dictionary->get($key)
+                : array();
+
+            $item->setRelation('children', new BaseCollection($children));
         }
 
         return $result;
     }
+
+    /**
+     * @param null|int $rootNodeId
+     *
+     * @return int
+     */
+    public function getRootNodeId($rootNodeId = null)
+    {
+        // If root node is not specified we take parent id of node with
+        // least lft value as root node id.
+        if ($rootNodeId === null)
+        {
+            $leastValue = null;
+
+            foreach ($this->items as $item)
+            {
+                if ($leastValue === null || $item->getLft() < $leastValue)
+                {
+                    $leastValue = $item->getLft();
+                    $rootNodeId = $item->getParentId();
+                }
+            }
+        }
+
+        return $rootNodeId;
+    }
 }