Skip to content

fix(database): declare TModel template on where-builder traits #2322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ondrejmirtes wants to merge 1 commit into
base: 3.x
Choose a base branch
from
+20 −4
Open

fix(database): declare TModel template on where-builder traits #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/database/src/Builder/QueryBuilders/CountQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ final class CountQueryBuilder implements BuildsQuery, SupportsWhereStatements
{
use HasConditions;
use OnDatabase;

/** @use HasWhereQueryBuilderMethods<TModel> */
use HasWhereQueryBuilderMethods;

use TransformsQueryBuilder;

private CountStatement $count;
Expand Down
3 changes: 3 additions & 0 deletions packages/database/src/Builder/QueryBuilders/DeleteQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ final class DeleteQueryBuilder implements BuildsQuery, SupportsWhereStatements
{
use HasConditions;
use OnDatabase;

/** @use HasWhereQueryBuilderMethods<TModel> */
use HasWhereQueryBuilderMethods;

use TransformsQueryBuilder;

private DeleteStatement $delete;
Expand Down
5 changes: 5 additions & 0 deletions packages/database/src/Builder/QueryBuilders/HasWhereQueryBuilderMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@

use function Tempest\Support\str;

/**
* @template TModel
*/
trait HasWhereQueryBuilderMethods
{
use HasConvenientWhereMethods;

/** @use HasWhereRelationMethods<TModel> */
use HasWhereRelationMethods;

/**
Expand Down
3 changes: 3 additions & 0 deletions packages/database/src/Builder/QueryBuilders/HasWhereRelationMethods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
use function Tempest\Support\arr;
use function Tempest\Support\str;

/**
* @template TModel
*/
trait HasWhereRelationMethods
{
/**
Expand Down
3 changes: 3 additions & 0 deletions packages/database/src/Builder/QueryBuilders/SelectQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ final class SelectQueryBuilder implements BuildsQuery, SupportsWhereStatements,
{
use HasConditions;
use OnDatabase;

/** @use HasWhereQueryBuilderMethods<TModel> */
use HasWhereQueryBuilderMethods;

use TransformsQueryBuilder;

public ModelInspector $model;
Expand Down
3 changes: 3 additions & 0 deletions packages/database/src/Builder/QueryBuilders/UpdateQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ final class UpdateQueryBuilder implements BuildsQuery, SupportsWhereStatements
{
use HasConditions;
use OnDatabase;

/** @use HasWhereQueryBuilderMethods<TModel> */
use HasWhereQueryBuilderMethods;

use TransformsQueryBuilder;

private UpdateStatement $update;
Expand Down
4 changes: 0 additions & 4 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ parameters:
identifier: property.phpDocType
paths:
- packages/database/src/Builder/*
-
identifier: class.notFound
paths:
- packages/database/src/Builder/*
# End of database ignores

-
Expand Down