From d5c55d1749dbd69b8063ddc709d893ae82a41f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Wed, 27 Jun 2018 14:19:29 +0200 Subject: [PATCH] Fix incorrect treatment of boolean value in filtersettings --- .../ext/ep_products/Classes/Domain/Model/FilterSettings.php | 4 ++-- .../Classes/Domain/Repository/AbstractRepository.php | 2 +- .../Classes/Traits/RequestArgumentTypeConversionTrait.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php b/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php index 0a55c339..2a96981c 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Model/FilterSettings.php @@ -136,7 +136,7 @@ class FilterSettings implements \JsonSerializable /** * @var bool */ - protected $bus = false; + protected $bus; /** * @param \DateTime $dateFrom @@ -510,7 +510,7 @@ class FilterSettings implements \JsonSerializable */ public function setBus($bus) { - $this->bus = (bool) $bus; + $this->bus = $bus; } /** diff --git a/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php b/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php index 244aecd9..84625645 100644 --- a/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php +++ b/web/typo3conf/ext/ep_products/Classes/Domain/Repository/AbstractRepository.php @@ -250,7 +250,7 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit protected function addTransportationFilterConditions(QueryBuilder $query, FilterSettings $filterSettings) { // Transportation - if ((bool) $filterSettings->getBus() === true) { + if ($filterSettings->getBus() === true) { $query->andWhere('date.bus_available = 1'); } } diff --git a/web/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php b/web/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php index c24449f1..5df48341 100644 --- a/web/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php +++ b/web/typo3conf/ext/ep_products/Classes/Traits/RequestArgumentTypeConversionTrait.php @@ -94,7 +94,7 @@ trait RequestArgumentTypeConversionTrait $filterSettings['dateFrom'] = !empty($filterSettings['dateFrom']) ? new \DateTime($filterSettings['dateFrom']) : null; $filterSettings['dateTo'] = !empty($filterSettings['dateTo']) ? new \DateTime($filterSettings['dateTo']) : null; - if (!empty($filterSettings['bus'])) { + if ($filterSettings['bus'] !== null) { $filterSettings['bus'] = (bool) $filterSettings['bus']; }