Skip to content

Commit f759cdc

Browse files
authored
fix(database): declare TModel template on where-builder traits (#2322)
1 parent 1509573 commit f759cdc

7 files changed

Lines changed: 20 additions & 4 deletions

File tree

‎packages/database/src/Builder/QueryBuilders/CountQueryBuilder.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ final class CountQueryBuilder implements BuildsQuery, SupportsWhereStatements
2626
{
2727
use HasConditions;
2828
use OnDatabase;
29+
30+
/** @use HasWhereQueryBuilderMethods<TModel> */
2931
use HasWhereQueryBuilderMethods;
32+
3033
use TransformsQueryBuilder;
3134

3235
private CountStatement $count;

‎packages/database/src/Builder/QueryBuilders/DeleteQueryBuilder.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ final class DeleteQueryBuilder implements BuildsQuery, SupportsWhereStatements
2222
{
2323
use HasConditions;
2424
use OnDatabase;
25+
26+
/** @use HasWhereQueryBuilderMethods<TModel> */
2527
use HasWhereQueryBuilderMethods;
28+
2629
use TransformsQueryBuilder;
2730

2831
private DeleteStatement $delete;

‎packages/database/src/Builder/QueryBuilders/HasWhereQueryBuilderMethods.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,14 @@
1010

1111
use function Tempest\Support\str;
1212

13+
/**
14+
* @template TModel
15+
*/
1316
trait HasWhereQueryBuilderMethods
1417
{
1518
use HasConvenientWhereMethods;
19+
20+
/** @use HasWhereRelationMethods<TModel> */
1621
use HasWhereRelationMethods;
1722

1823
/**

‎packages/database/src/Builder/QueryBuilders/HasWhereRelationMethods.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
use function Tempest\Support\arr;
1414
use function Tempest\Support\str;
1515

16+
/**
17+
* @template TModel
18+
*/
1619
trait HasWhereRelationMethods
1720
{
1821
/**

‎packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ final class SelectQueryBuilder implements BuildsQuery, SupportsWhereStatements,
4949
{
5050
use HasConditions;
5151
use OnDatabase;
52+
53+
/** @use HasWhereQueryBuilderMethods<TModel> */
5254
use HasWhereQueryBuilderMethods;
55+
5356
use TransformsQueryBuilder;
5457

5558
public ModelInspector $model;

‎packages/database/src/Builder/QueryBuilders/UpdateQueryBuilder.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ final class UpdateQueryBuilder implements BuildsQuery, SupportsWhereStatements
4444
{
4545
use HasConditions;
4646
use OnDatabase;
47+
48+
/** @use HasWhereQueryBuilderMethods<TModel> */
4749
use HasWhereQueryBuilderMethods;
50+
4851
use TransformsQueryBuilder;
4952

5053
private UpdateStatement $update;

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ parameters:
2121
identifier: property.phpDocType
2222
paths:
2323
- packages/database/src/Builder/*
24-
-
25-
identifier: class.notFound
26-
paths:
27-
- packages/database/src/Builder/*
2824
# End of database ignores
2925

3026
-

0 commit comments

Comments
 (0)