diff --git a/src/Exception/FilterParameterValueIsNullException.php b/src/Exception/FilterParameterValueIsNullException.php deleted file mode 100644 index 237e74aa218aaffb5ac3904e0429426c885db359..0000000000000000000000000000000000000000 --- a/src/Exception/FilterParameterValueIsNullException.php +++ /dev/null @@ -1,15 +0,0 @@ -where( @@ -18,11 +16,11 @@ final class Date extends HttpFilter ); if (is_null($this->getHttpValue())) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } if (! \DateTimeImmutable::createFromFormat('Y-m-d', $this->getHttpValue())) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } $queryBuilder->setParameter($this->getParameterKey(), $this->getHttpValue()); diff --git a/src/Filter/DateRange.php b/src/Filter/DateRange.php index 0f103847a2089c4a2efaaeeab776c9a72c6afbd2..6456257dbc20338bfbeeb947a48d62577e3052e9 100644 --- a/src/Filter/DateRange.php +++ b/src/Filter/DateRange.php @@ -5,12 +5,10 @@ declare(strict_types=1); namespace IQDEV\Packages\DoctrineHttpFilter\Filter; use Doctrine\ORM\QueryBuilder; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; final class DateRange extends HttpFilter { - /** @throws FilterParameterValueIsNullException */ public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder { $httpValues = $this->getHttpValue(); @@ -18,14 +16,14 @@ final class DateRange extends HttpFilter $toDate = $httpValues['to'] ?? null; if (is_null($fromDate) && is_null($toDate)) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } $fromDate = \DateTimeImmutable::createFromFormat('Y-m-d', $fromDate ?? ''); $toDate = \DateTimeImmutable::createFromFormat('Y-m-d', $toDate ?? ''); if (! $fromDate && ! $toDate) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } if ($fromDate) { diff --git a/src/Filter/In.php b/src/Filter/In.php index a8c63f79fa1ce4594d02c6f30a31751d0c6211e6..946e38fcee73e370ac1bf9701821ca1e60556f6b 100644 --- a/src/Filter/In.php +++ b/src/Filter/In.php @@ -5,16 +5,14 @@ declare(strict_types=1); namespace IQDEV\Packages\DoctrineHttpFilter\Filter; use Doctrine\ORM\QueryBuilder; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; final class In extends HttpFilter { - /** @throws FilterParameterValueIsNullException */ public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder { if ($this->getHttpValue() === null || ! is_array($this->getHttpValue())) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } $values = array_map(fn($value) => '\'' . $value . '\'', $this->getHttpValue()); diff --git a/src/Filter/Like.php b/src/Filter/Like.php index dc44862cdc9d5fab4d6cfc11a15f98331934f35e..f3054bd3f28b9fbd0df8237f5562059f267ad59b 100644 --- a/src/Filter/Like.php +++ b/src/Filter/Like.php @@ -5,12 +5,10 @@ declare(strict_types=1); namespace IQDEV\Packages\DoctrineHttpFilter\Filter; use Doctrine\ORM\QueryBuilder; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; final class Like extends HttpFilter { - /** @throws FilterParameterValueIsNullException */ public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder { $queryBuilder->where( @@ -18,7 +16,7 @@ final class Like extends HttpFilter ); if ($this->getHttpValue() === null) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } $queryBuilder->setParameter($this->getParameterKey(), '%' . $this->getHttpValue() . '%'); diff --git a/src/Filter/Range.php b/src/Filter/Range.php index d87a7463733a490ba084d62699203885610c5ea6..8711c7d2906b45269c34a9cd7a1a385deb475702 100644 --- a/src/Filter/Range.php +++ b/src/Filter/Range.php @@ -5,17 +5,15 @@ declare(strict_types=1); namespace IQDEV\Packages\DoctrineHttpFilter\Filter; use Doctrine\ORM\QueryBuilder; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; final class Range extends HttpFilter { - /** @throws FilterParameterValueIsNullException */ public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder { if ((! isset($this->getHttpValue()['min']) || ! is_numeric($this->getHttpValue()['min'])) && (! isset($this->getHttpValue()['max']) || ! is_numeric($this->getHttpValue()['max']))) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } if (isset($this->getHttpValue()['min'])) { diff --git a/src/Filter/Where.php b/src/Filter/Where.php index 5db21aeab74cdd339302e82b6a1c25bd6084f6f4..012e4b680877ed0ea43f33cf87f02a5992c2eda1 100644 --- a/src/Filter/Where.php +++ b/src/Filter/Where.php @@ -5,12 +5,10 @@ declare(strict_types=1); namespace IQDEV\Packages\DoctrineHttpFilter\Filter; use Doctrine\ORM\QueryBuilder; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; final class Where extends HttpFilter { - /** @throws FilterParameterValueIsNullException */ public function addToQuery(QueryBuilder $queryBuilder): QueryBuilder { $queryBuilder->where( @@ -18,7 +16,7 @@ final class Where extends HttpFilter ); if ($this->getHttpValue() === null) { - throw new FilterParameterValueIsNullException($this->field); + return $queryBuilder; } $queryBuilder->setParameter($this->getParameterKey(), $this->getHttpValue());