Fix incorrect typecasting of boolean value in filtersettings
This commit is contained in:
@@ -82,7 +82,7 @@ trait RequestArgumentTypeConversionTrait
|
|||||||
$filterSettingsRaw = $this->request->getArgument('filterSettings');
|
$filterSettingsRaw = $this->request->getArgument('filterSettings');
|
||||||
|
|
||||||
if (is_array($filterSettingsRaw)) {
|
if (is_array($filterSettingsRaw)) {
|
||||||
$filterSettings = (array) $filterSettingsRaw;
|
$filterSettings = $filterSettingsRaw;
|
||||||
} elseif (is_string($filterSettingsRaw)) {
|
} elseif (is_string($filterSettingsRaw)) {
|
||||||
$filterSettingsString = urldecode($filterSettingsRaw);
|
$filterSettingsString = urldecode($filterSettingsRaw);
|
||||||
$filterSettings = FilterSettingsEncoder::decode($filterSettingsString);
|
$filterSettings = FilterSettingsEncoder::decode($filterSettingsString);
|
||||||
@@ -94,8 +94,10 @@ trait RequestArgumentTypeConversionTrait
|
|||||||
$filterSettings['dateFrom'] = !empty($filterSettings['dateFrom']) ? new \DateTime($filterSettings['dateFrom']) : null;
|
$filterSettings['dateFrom'] = !empty($filterSettings['dateFrom']) ? new \DateTime($filterSettings['dateFrom']) : null;
|
||||||
$filterSettings['dateTo'] = !empty($filterSettings['dateTo']) ? new \DateTime($filterSettings['dateTo']) : null;
|
$filterSettings['dateTo'] = !empty($filterSettings['dateTo']) ? new \DateTime($filterSettings['dateTo']) : null;
|
||||||
|
|
||||||
if ($filterSettings['bus'] !== null) {
|
if (!empty($filterSettings['bus'])) {
|
||||||
$filterSettings['bus'] = (bool) $filterSettings['bus'];
|
$filterSettings['bus'] = $filterSettings['bus'] === 'true';
|
||||||
|
} else {
|
||||||
|
$filterSettings['bus'] = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$filterSettingsObject = new FilterSettings();
|
$filterSettingsObject = new FilterSettings();
|
||||||
|
|||||||
Reference in New Issue
Block a user