formatting

Author: ildyria

phpstan.neon

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

src/Contracts/NodeQueryBuilder.php

@@ -12,22 +12,22 @@
  *
  * @require-extends Illuminate\Database\Eloquent\Builder<NodeModel>
  *
- * @method NodeQueryBuilder                            select(array $columns)
+ * @method NodeQueryBuilder<Tmodel>                    select(string[] $columns)
  * @method Tmodel                                      getModel()
- * @method NodeQueryBuilder                            from(string $table)
- * @method NodeQueryBuilder                            getQuery()
- * @method NodeQueryBuilder                            whereRaw(string $sql, array $bindings = [], string $boolean = 'and')
+ * @method NodeQueryBuilder<Tmodel>                    from(string $table)
+ * @method NodeQueryBuilder<Tmodel>                    getQuery()
+ * @method NodeQueryBuilder<Tmodel>                    whereRaw(string $sql, string[] $bindings = [], string $boolean = 'and')
  * @method \Illuminate\Database\Query\Grammars\Grammar getGrammar()
- * @method NodeQueryBuilder                            whereNested(\Closure|string $callback, string $boolean = 'and')
- * @method NestedSetCollection<Tmodel>                 get(array $columns = ['*'])
+ * @method NodeQueryBuilder<Tmodel>                    whereNested(\Closure|string $callback, string $boolean = 'and')
+ * @method NestedSetCollection<Tmodel>                 get(string[] $columns = ['*'])
  * @method int                                         max(string $column)
- * @method NodeQueryBuilder                            where(string|array|\Closure $column, mixed $operator = null, mixed $value = null, string $boolean = 'and')
- * @method NodeModel|null                              first(array|string $columns = ['*'])
+ * @method NodeQueryBuilder<Tmodel>                    where(string|string[]|\Closure $column, mixed $operator = null, mixed $value = null, string $boolean = 'and')
+ * @method NodeModel|null                              first(string[]|string $columns = ['*'])
  * @method NodeModel                                   findOrFail(int|string $id)
- * @method NodeQueryBuilder                            skip(int $value)
- * @method NodeQueryBuilder                            take(int $value)
- * @method NodeQueryBuilder                            orderBy(string $column, string $direction = 'asc')
- * @method NodeQueryBuilder                            when(bool $value, \Closure $callback)
+ * @method NodeQueryBuilder<Tmodel>                    skip(int $value)
+ * @method NodeQueryBuilder<Tmodel>                    take(int $value)
+ * @method NodeQueryBuilder<Tmodel>                    orderBy(string $column, string $direction = 'asc')
+ * @method NodeQueryBuilder<Tmodel>                    when(bool $value, \Closure $callback)
  * @method BaseQueryBuilder                            toBase()
  */
 interface NodeQueryBuilder extends Builder

src/QueryBuilder.php

@@ -20,6 +20,7 @@
  * @phpstan-type NodeModel Node<Tmodel>&Tmodel
  *
  * @extends Builder<NodeModel>
+ * @implements NodeQueryBuilder<Tmodel>
  */
 class QueryBuilder extends Builder implements NodeQueryBuilder
 {
@@ -617,7 +618,7 @@ public function makeGap($cut, $height): int
 	 *
 	 * @param array{height:int,cut?:int,distance?:int,lft?:int,rgt?:int,to?:int,from?:int} $params
 	 *
-	 * @return array<string,Expression>
+	 * @return array<string,Expression<non-falsy-string>>
 	 */
 	protected function patch(array $params): array
 	{
@@ -640,7 +641,7 @@ protected function patch(array $params): array
 	 * @param string                                                                       $col
 	 * @param array{height:int,cut?:int,distance?:int,lft?:int,rgt?:int,to?:int,from?:int} $params
 	 *
-	 * @return Expression
+	 * @return Expression<non-falsy-string>
 	 */
 	protected function columnPatch(string $col, array $params): Expression
 	{