Skip to content

Extended possible params for AbstractDoctrineDatabase and GatewayInterface #37

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

Draft
Sztig wants to merge 3 commits into
base: 4.6
Choose a base branch
from
Draft

Extended possible params for AbstractDoctrineDatabase and GatewayInterface #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9cdcd6b
extended possible params for countBy, findBy and findOneBy in Gateway…
Sztig Mar 20, 2026
3be40fd
extended possible params for countBy, findBy and findOneBy in Gateway…
Sztig Mar 20, 2026
8055b41
added symfony/uid to composer.json and extened the params
Sztig Mar 26, 2026
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
1 change: 1 addition & 0 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"symfony/event-dispatcher": "^5.4",
"symfony/http-foundation": "^5.4",
"symfony/http-kernel": "^5.4",
"symfony/uid": "^5.4",
"symfony/yaml": "^5.4"
},
"require-dev": {
Expand Down
8 changes: 4 additions & 4 deletions src/contracts/Gateway/AbstractDoctrineDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function countAll(): int
}

/**
* @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria
* @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null> $criteria
*
* @throws \Doctrine\DBAL\Driver\Exception
* @throws \Doctrine\DBAL\Exception
Expand Down Expand Up @@ -258,7 +258,7 @@ private function applyInheritance(QueryBuilder $qb): void
}

/**
* @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria
* @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null> $criteria
*
* @return \Doctrine\DBAL\Query\Expression\CompositeExpression|string|null
*
Expand Down Expand Up @@ -327,7 +327,7 @@ private function buildConditionExpression(ExpressionVisitor $visitor, QueryBuild
}

/**
* @param scalar|array<scalar>|null $value
* @param scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null $value
*
* @throws \Doctrine\DBAL\Exception
* @throws \Ibexa\Contracts\CorePersistence\Exception\MappingException
Expand Down Expand Up @@ -431,7 +431,7 @@ final protected function applyOrderBy(QueryBuilder $qb, ?array $orderBy = []): v
}

/**
* @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria
* @param \Doctrine\Common\Collections\Expr\Expression|array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|\Stringable|\Symfony\Component\Uid\AbstractUid|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|null> $criteria
*/
final protected function applyCriteria(QueryBuilder $qb, $criteria): void
{
Expand Down
6 changes: 3 additions & 3 deletions src/contracts/Gateway/GatewayInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function getMetadata(): DoctrineSchemaMetadataInterface;
public function countAll(): int;

/**
* @param \Doctrine\Common\Collections\Expr\Expression|array<\Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>> $criteria
* @param \Doctrine\Common\Collections\Expr\Expression|array<array-key, scalar|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|\Stringable|\Symfony\Component\Uid\AbstractUid|\Doctrine\Common\Collections\Expr\Expression> $criteria $criteria
*/
public function countBy($criteria): int;

Expand All @@ -33,7 +33,7 @@ public function countBy($criteria): int;
public function findAll(?int $limit = null, int $offset = 0): array;

/**
* @param \Doctrine\Common\Collections\Expr\Expression|array<\Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria Map of column names to values that will be used as part of WHERE query
* @param \Doctrine\Common\Collections\Expr\Expression|array<array-key, scalar|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|\Stringable|\Symfony\Component\Uid\AbstractUid|\Doctrine\Common\Collections\Expr\Expression> $criteria Map of column names to values that will be used as part of WHERE query
* @param array<string, string>|null $orderBy Map of column names to "ASC" or "DESC", that will be used in SORT query
*
* @phpstan-param array<string, "ASC"|"DESC">|null $orderBy
Expand All @@ -43,7 +43,7 @@ public function findAll(?int $limit = null, int $offset = 0): array;
public function findBy($criteria, ?array $orderBy = null, ?int $limit = null, int $offset = 0): array;

/**
* @param array<string, \Doctrine\Common\Collections\Expr\Expression|scalar|array<scalar>|null> $criteria Map of column names to values that will be used as part of WHERE query
* @param array<array-key, scalar|array<scalar|\Stringable|\Symfony\Component\Uid\AbstractUid>|\Stringable|\Symfony\Component\Uid\AbstractUid|\Doctrine\Common\Collections\Expr\Expression> $criteria Map of column names to values that will be used as part of WHERE query
* @param array<string, string>|null $orderBy Map of column names to "ASC" or "DESC", that will be used in SORT query
*
* @phpstan-param array<string, "ASC"|"DESC">|null $orderBy
Expand Down
Loading