Skip to content

Commit f9601af

Browse files
committed
fix annotations
1 parent 92a00e9 commit f9601af

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/Node.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
namespace Kalnoy\Nestedset;
44

5+
use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
56
use Illuminate\Database\Eloquent\Collection as EloquentCollection;
67
use Illuminate\Database\Eloquent\Relations\BelongsTo;
78
use Illuminate\Database\Eloquent\Relations\HasMany;
9+
use Illuminate\Database\Query\Builder as BaseQueryBuilder;
810

911
/**
1012
* Accompanies {@link \Kalnoy\Nestedset\NodeTrait}.
@@ -153,11 +155,11 @@ public function down(int $amount = 1): bool;
153155
/**
154156
* @since 2.0
155157
*
156-
* @param QueryBuilder<Tmodelkey,Tmodel> $query
158+
* @param BaseQueryBuilder|EloquentBuilder<Tmodel>|QueryBuilder<Tmodelkey,Tmodel> $query
157159
*
158160
* @return QueryBuilder<Tmodelkey,Tmodel>
159161
*/
160-
public function newEloquentBuilder(QueryBuilder $query): QueryBuilder;
162+
public function newEloquentBuilder(BaseQueryBuilder|EloquentBuilder|QueryBuilder $query): QueryBuilder;
161163

162164
/**
163165
* Get a new base query that includes deleted nodes.

src/NodeTrait.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -683,12 +683,13 @@ protected function restoreDescendants($deletedAt)
683683
}
684684

685685
/**
686-
* {@inheritdoc}
686+
* @param BaseQueryBuilder|EloquentBuilder<Tmodel>|QueryBuilder<Tmodelkey,Tmodel> $query
687687
*
688-
* @since 2.0
688+
* @return QueryBuilder<Tmodelkey,Tmodel>
689689
*/
690690
public function newEloquentBuilder($query): QueryBuilder
691691
{
692+
/** @disregard P1006 */
692693
return new QueryBuilder($query);
693694
}
694695

0 commit comments

Comments
 (0)