Merge

Author: lazychaser

src/NestedSet.php

@@ -42,7 +42,7 @@ public static function columns(Blueprint $table)
         $table->unsignedInteger(self::RGT)->default(0);
         $table->unsignedInteger(self::PARENT_ID)->nullable();
 
-        $table->index(self::getDefaultColumns());
+        $table->index(static::getDefaultColumns());
     }
 
     /**
@@ -52,7 +52,7 @@ public static function columns(Blueprint $table)
      */
     public static function dropColumns(Blueprint $table)
     {
-        $columns = self::getDefaultColumns();
+        $columns = static::getDefaultColumns();
 
         $table->dropIndex($columns);
         $table->dropColumn($columns);
@@ -65,7 +65,7 @@ public static function dropColumns(Blueprint $table)
      */
     public static function getDefaultColumns()
     {
-        return [ self::LFT, self::RGT, self::PARENT_ID ];
+        return [ static::LFT, static::RGT, static::PARENT_ID ];
     }
 
     /**

src/NodeTrait.php

@@ -778,6 +778,8 @@ public static function create(array $attributes = [], self $parent = null)
             $child->setRelation('parent', $instance);
         }
 
+        $instance->refreshNode();
+
         return $instance->setRelation('children', $relation);
     }
 
@@ -1006,6 +1008,19 @@ public function isDescendantOf(self $other)
                $this->getLft() < $other->getRgt();
     }
 
+    /**
+     * Get whether a node is itself or a descendant of other node.
+     *
+     * @param self $other
+     *
+     * @return bool
+     */
+    public function isSelfOrDescendantOf(self $other)
+    {
+        return $this->getLft() >= $other->getLft() &&
+               $this->getLft() < $other->getRgt();
+    }
+
     /**
      * Get whether the node is immediate children of other node.
      *
@@ -1042,6 +1057,18 @@ public function isAncestorOf(self $other)
         return $other->isDescendantOf($this);
     }
 
+    /**
+     * Get whether the node is itself or an ancestor of other node, including immediate parent.
+     *
+     * @param self $other
+     *
+     * @return bool
+     */
+    public function isSelfOrAncestorOf(self $other)
+    {
+        return $other->isSelfOrDescendantOf($this);
+    }
+
     /**
      * Get whether the node has moved since last save.
      *