Merge pull request lazychaser#189 from dcanaud/feature-self-or-descendant-and-ancestor

Add isSelfOrDescendantOf and isSelfOrAncestorOf helpers

Author: lazychaser

src/NodeTrait.php

@@ -1006,6 +1006,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 +1055,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.
      *