Resolved conflicts

Author: lazychaser

src/Collection.php

@@ -2,7 +2,8 @@
 
 namespace Kalnoy\Nestedset;
 
-use \Illuminate\Database\Eloquent\Collection as BaseCollection;
+use Illuminate\Database\Eloquent\Collection as BaseCollection;
+use Illuminate\Database\Eloquent\Model;
 
 class Collection extends BaseCollection
 {
@@ -19,15 +20,15 @@ public function linkNodes()
 
         $groupedChildren = $this->groupBy($this->first()->getParentIdName());
 
-        /** @var Node $node */
+        /** @var NodeTrait|Model $node */
         foreach ($this->items as $node) {
             if ( ! isset($node->parent)) {
                 $node->setRelation('parent', null);
             }
 
             $children = $groupedChildren->get($node->getKey(), [ ]);
 
-            /** @var Node $child */
+            /** @var Model|NodeTrait $child */
             foreach ($children as $child) {
                 $child->setRelation('parent', $node);
             }
@@ -46,7 +47,7 @@ public function linkNodes()
      * If `$rootNodeId` is provided, the tree will contain only descendants
      * of the node with such primary key value.
      *
-     * @param int|Node|null $root
+     * @param int|Model|null $root
      *
      * @return Collection
      */
@@ -59,7 +60,7 @@ public function toTree($root = null)
 
             $root = $this->getRootNodeId($root);
 
-            /** @var Node $node */
+            /** @var Model|NodeTrait $node */
             foreach ($this->items as $node) {
                 if ($node->getParentId() == $root) $items[] = $node;
             }
@@ -75,14 +76,16 @@ public function toTree($root = null)
      */
     protected function getRootNodeId($root = null)
     {
-        if ($root instanceof Node) return $root->getKey();
+        if (NodeTrait::hasTrait($root)) {
+            return $root->getKey();
+        }
 
         // If root node is not specified we take parent id of node with
         // least lft value as root node id.
         if ($root === null) {
             $leastValue = null;
 
-            /** @var Node $node */
+            /** @var Model|NodeTrait $node */
             foreach ($this->items as $node) {
                 if ($leastValue === null || $node->getLft() < $leastValue) {
                     $leastValue = $node->getLft();

src/NestedSet.php

@@ -2,22 +2,35 @@
 
 namespace Kalnoy\Nestedset;
 
-use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Blueprint;
 
-class NestedSet {
+class NestedSet
+{
+    /**
+     * The name of default lft column.
+     */
+    const LFT = '_lft';
+
+    /**
+     * The name of default rgt column.
+     */
+    const RGT = '_rgt';
+
+    /**
+     * The name of default parent id column.
+     */
+    const PARENT_ID = 'parent_id';
 
     /**
      * Add default nested set columns to the table. Also create an index.
      *
      * @param \Illuminate\Database\Schema\Blueprint $table
-     * @param string $primaryKey
      */
-    public static function columns(Blueprint $table, $primaryKey = 'id')
+    public static function columns(Blueprint $table)
     {
-        $table->unsignedInteger(Node::LFT);
-        $table->unsignedInteger(Node::RGT);
-        $table->unsignedInteger(Node::PARENT_ID)->nullable();
+        $table->unsignedInteger(self::LFT);
+        $table->unsignedInteger(self::RGT);
+        $table->unsignedInteger(self::PARENT_ID)->nullable();
 
         $table->index(self::getDefaultColumns());
     }
@@ -37,12 +50,12 @@ public static function dropColumns(Blueprint $table)
 
     /**
      * Get a list of default columns.
-     * 
+     *
      * @return array
      */
     public static function getDefaultColumns()
     {
-        return [ Node::LFT, Node::RGT, Node::PARENT_ID ];
+        return [ self::LFT, self::RGT, self::PARENT_ID ];
     }
 
 }