lvl 4 completed

Author: ildyria

phpstan.neon

@@ -4,7 +4,7 @@ includes:
 	- phpstan-baseline.neon
 
 parameters:
-	level: 5
+	level: 4
 	paths:
 		- src
 		- tests/models/

src/Contracts/Node.php

@@ -128,7 +128,7 @@ public function ancestors(): Relation;
 	 *
 	 * @return $this
 	 */
-	public function makeRoot(): Node;
+	public function makeRoot(): self;
 
 	/**
 	 * Save node as root.
@@ -144,7 +144,7 @@ public function saveAsRoot(): bool;
 	 *
 	 * @return $this
 	 */
-	public function rawNode(int $lft, int $rgt, mixed $parentId): Node;
+	public function rawNode(int $lft, int $rgt, mixed $parentId): self;
 
 	/**
 	 * Move node up given amount of positions.
@@ -338,14 +338,14 @@ public function getPrevSiblings(array $columns = ['*']);
 	 *
 	 * @return NodeModel
 	 */
-	public function getNextSibling(array $columns = ['*']);
+	public function getNextSibling(array $columns = ['*']): Node;
 
 	/**
 	 * @param string[] $columns
 	 *
 	 * @return NodeModel
 	 */
-	public function getPrevSibling(array $columns = ['*']);
+	public function getPrevSibling(array $columns = ['*']): Node;
 
 	/**
 	 * @return array<int>
@@ -357,21 +357,21 @@ public function getBounds();
 	 *
 	 * @return NodeModel
 	 */
-	public function setLft(int $value): Node;
+	public function setLft(int $value): self;
 
 	/**
 	 * @param $value
 	 *
 	 * @return NodeModel
 	 */
-	public function setRgt(int $value): Node;
+	public function setRgt(int $value): self;
 
 	/**
 	 * @param array-key|null $id
 	 *
 	 * @return NodeModel
 	 */
-	public function setParentId(mixed $id): Node;
+	public function setParentId(mixed $id): self;
 
 	/**
 	 * @param string[]|null $except
@@ -396,7 +396,7 @@ public function appendNode(Node $node): bool;
 	 *
 	 * @return NodeModel
 	 */
-	public function appendToNode(Node $parent): Node;
+	public function appendToNode(Node $parent): self;
 
 	/**
 	 * Prepend a node to the new parent.
@@ -405,7 +405,7 @@ public function appendToNode(Node $parent): Node;
 	 *
 	 * @return NodeModel
 	 */
-	public function prependToNode(Node $parent): Node;
+	public function prependToNode(Node $parent): self;
 
 	/**
 	 * Get whether the node is an ancestor of other node, including immediate parent.

src/NodeTrait.php

@@ -73,9 +73,9 @@ public static function bootNodeTrait(): void
 	 *
 	 * @param string $action
 	 *
-	 * @return Node
+	 * @return self
 	 */
-	protected function setNodeAction($action): Node
+	protected function setNodeAction($action): self
 	{
 		$this->pending = func_get_args();
 
@@ -400,9 +400,9 @@ public function prependNode(Node $node): bool
 	 *
 	 * @param Node&Tmodel $parent
 	 *
-	 * @return Node&Tmodel
+	 * @return self
 	 */
-	public function appendToNode(Node $parent): Node
+	public function appendToNode(Node $parent): self
 	{
 		return $this->appendOrPrependTo($parent);
 	}
@@ -423,9 +423,9 @@ public function prependToNode(Node $parent): Node
 	 * @param Node $parent
 	 * @param bool $prepend
 	 *
-	 * @return Node
+	 * @return self
 	 */
-	public function appendOrPrependTo(Node $parent, bool $prepend = false)
+	public function appendOrPrependTo(Node $parent, bool $prepend = false): self
 	{
 		$this->assertNodeExists($parent)
 			->assertNotDescendant($parent)
@@ -740,7 +740,7 @@ public function newScopedQuery($table = null): NodeQueryBuilder
 	public function applyNestedSetScope($query, $table = null)
 	{
 		$scoped = $this->getScopeAttributes();
-		if ($scoped === null || $scoped === []) {
+		if ($scoped === null || $scoped === []) { /** @phpstan-ignore identical.alwaysFalse */
 			return $query;
 		}
 
@@ -855,7 +855,7 @@ public function setParentIdAttribute(mixed $value): void
 			return;
 		}
 
-		if ($value !== null && $value !== 0 && $value !== '') {
+		if ($value !== null) {
 			$node = $this->newScopedQuery()->findOrFail($value);
 			$this->appendToNode($node);
 		} else {
@@ -1009,7 +1009,7 @@ public function getPrevSiblings(array $columns = ['*'])
 	 *
 	 * @return Node
 	 */
-	public function getNextSibling(array $columns = ['*'])
+	public function getNextSibling(array $columns = ['*']): Node
 	{
 		return $this->nextSiblings()->defaultOrder()->first($columns);
 	}
@@ -1019,7 +1019,7 @@ public function getNextSibling(array $columns = ['*'])
 	 *
 	 * @return Node
 	 */
-	public function getPrevSibling(array $columns = ['*'])
+	public function getPrevSibling(array $columns = ['*']): Node
 	{
 		return $this->prevSiblings()->defaultOrder('desc')->first($columns);
 	}
@@ -1222,7 +1222,7 @@ protected function assertNodeExists(Node $node)
 	protected function assertSameScope(Node $node): void
 	{
 		$scoped = $this->getScopeAttributes();
-		if ($scoped === null || $scoped === []) {
+		if ($scoped === null || $scoped === []) { /** @phpstan-ignore identical.alwaysFalse */
 			return;
 		}
 

src/QueryBuilder.php

@@ -876,7 +876,7 @@ public function fixTree($root = null): int
 			->groupBy($this->model->getParentIdName())
 			->all();
 
-		return $this->fixNodes($dictionary, $root);  /** @phpstan-ignore argument.type */
+		return $this->fixNodes($dictionary, $root);
 	}
 
 	/**