lvl 5

Author: ildyria

phpstan.neon

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

src/Contracts/Node.php

@@ -419,7 +419,7 @@ public function isAncestorOf(Node $other): bool;
 	/**
 	 * Get whether a node is a descendant of other node.
 	 *
-	 * @param NodeModel $other
+	 * @param Node<Tmodel> $other
 	 *
 	 * @return bool
 	 */

src/NodeTrait.php

@@ -16,7 +16,7 @@
 use Kalnoy\Nestedset\Contracts\NodeQueryBuilder;
 
 /**
- * @template Tmodel extends Model
+ * @template Tmodel extends \Illuminate\Database\Eloquent\Model
  * @template Tmodelkey of array-key
  *
  * @method void setRelation(string $relation, mixed $value)
@@ -181,7 +181,7 @@ protected function actionAppendOrPrepend(Node $parent, $prepend = false)
 	/**
 	 * Apply parent model.
 	 *
-	 * @param Model|null $value
+	 * @param (Node&Tmodel)|null $value
 	 *
 	 * @return $this
 	 */

src/QueryBuilder.php

@@ -214,7 +214,7 @@ public function orWhereNodeBetween(array $values): NodeQueryBuilder
 	 *
 	 * @since 2.0
 	 *
-	 * @param ?NodeModel $id
+	 * @param ?Node<Tmodel> $id
 	 * @param string     $boolean
 	 * @param bool       $not
 	 * @param bool       $andSelf
@@ -250,7 +250,7 @@ public function whereNotDescendantOf(mixed $id): NodeQueryBuilder
 	}
 
 	/**
-	 * @param NodeModel $id
+	 * @param Node<Tmodel> $id
 	 *
 	 * @return QueryBuilder<Tmodel>
 	 */
@@ -260,7 +260,7 @@ public function orWhereDescendantOf(mixed $id): NodeQueryBuilder
 	}
 
 	/**
-	 * @param NodeModel $id
+	 * @param Node<Tmodel> $id
 	 *
 	 * @return QueryBuilder<Tmodel>
 	 */
@@ -270,7 +270,7 @@ public function orWhereNotDescendantOf(mixed $id): NodeQueryBuilder
 	}
 
 	/**
-	 * @param NodeModel $id
+	 * @param Node<Tmodel> $id
 	 * @param string    $boolean
 	 * @param bool      $not
 	 *
@@ -868,15 +868,15 @@ public function fixTree($root = null): int
 
 		$dictionary = $this->model
 			->newNestedSetQuery()
-			->when($root, function (self $query) use ($root) {
+			->when($root !== null, function (self $query) use ($root) { 
 				return $query->whereDescendantOf($root);
 			})
 			->defaultOrder()
 			->get($columns)
 			->groupBy($this->model->getParentIdName())
 			->all();
 
-		return $this->fixNodes($dictionary, $root);
+		return $this->fixNodes($dictionary, $root);  /** @phpstan-ignore argument.type */
 	}
 
 	/**