DateRangeFilter overwrites other filter

stwe · Dec 7, 2018 · 13d208f · 13d208f
2 parents 6a19724 + d5563b0
commit 13d208f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 1.1.1
+
+* Bugfix: DateRangeFilter overwrites other filter (#803)
+
 # Version 1.1.0
 
 * Dropped support for PHP 5 and PHP 7.0. (#850)

diff --git a/Datatable/Filter/AbstractFilter.php b/Datatable/Filter/AbstractFilter.php
@@ -373,7 +373,7 @@ protected function getExpression(Composite $expr, QueryBuilder $qb, $searchType,
             case 'decimal':
             case 'float':
                 if (is_numeric($searchValue)) {
-                    $searchValue = floatval($searchValue);
+                    $searchValue = (float) $searchValue;
                 } else {
                     $incompatibleTypeOfField = true;
                 }
@@ -382,8 +382,8 @@ protected function getExpression(Composite $expr, QueryBuilder $qb, $searchType,
             case 'bigint':
             case 'smallint':
             case 'boolean':
-                if ($searchValue == strval(intval($searchValue))) {
-                    $searchValue = intval($searchValue);
+                if ( $searchValue == (string) (int) $searchValue ) {
+                    $searchValue = (int) $searchValue;
                 } else {
                     $incompatibleTypeOfField = true;
                 }
@@ -465,6 +465,8 @@ protected function getExpression(Composite $expr, QueryBuilder $qb, $searchType,
      */
     protected function getBetweenAndExpression(Andx $andExpr, QueryBuilder $qb, $searchField, $from, $to, $parameterCounter)
     {
+        $parameterCounter++;
+
         $k = $parameterCounter + 1;
         $andExpr->add($qb->expr()->between($searchField, '?'.$parameterCounter, '?'.$k));
         $qb->setParameter($parameterCounter, $from);