From 9a8157becad607a11cad34e47e2d8728889742e4 Mon Sep 17 00:00:00 2001 From: "a.shamavov" Date: Wed, 5 Mar 2025 10:38:04 +0500 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B1=D1=80=D0=BE=D1=81=20=D0=B8=D1=81=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FilterParameterValueIsNullException.php | 15 --------------- src/Filter/Date.php | 6 ++---- src/Filter/DateRange.php | 6 ++---- src/Filter/In.php | 4 +--- src/Filter/Like.php | 4 +--- src/Filter/Range.php | 4 +--- src/Filter/Where.php | 4 +--- 7 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 src/Exception/FilterParameterValueIsNullException.php diff --git a/src/Exception/FilterParameterValueIsNullException.php b/src/Exception/FilterParameterValueIsNullException.php deleted file mode 100644 index 237e74a..0000000 --- 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 0f10384..6456257 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 a8c63f7..946e38f 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 dc44862..f3054bd 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 d87a746..8711c7d 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 5db21ae..012e4b6 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()); -- GitLab