Merge pull request #37 from ans-group/support-false-in-urls

Stop false string in URLs being detected as a truthy value

Author: Gman98ish

src/Filters/BooleanFilter.php

@@ -24,7 +24,13 @@ public function modifyQuery($query, SearchTerm $search)
         if ($search->operator() == 'neq') {
             $op = '!=';
         }
-        $query->where($search->column(), $op, $search->term() == true ? $this->trueVal : $this->falseVal);
+
+        $searchTerm = true;
+        if ($search->term() == 'false') {
+            $searchTerm = false;
+        }
+
+        $query->where($search->column(), $op, $searchTerm ? $this->trueVal : $this->falseVal);
     }
 
     public function operators()

tests/Filters/BooleanFilterTest.php

@@ -16,7 +16,7 @@ public function can_filter_eq()
     {
         $filter = new BooleanFilter;
         $builder = Pet::query()->getQuery();
-        $filter->modifyQuery($builder, $this->searchTerm('eq', true));
+        $filter->modifyQuery($builder, $this->searchTerm('eq', 'true'));
 
         $this->assertEquals(
             "select * from `pets` where `is_active` = ?",
@@ -32,7 +32,7 @@ public function can_filter_neq()
     {
         $filter = new BooleanFilter;
         $builder = Pet::query()->getQuery();
-        $filter->modifyQuery($builder, $this->searchTerm('neq', true));
+        $filter->modifyQuery($builder, $this->searchTerm('neq', 'true'));
 
         $this->assertEquals(
             "select * from `pets` where `is_active` != ?",
@@ -46,10 +46,9 @@ public function can_filter_neq()
      */
     public function can_override_true_and_false_val()
     {
-
         $filter = new BooleanFilter('yes', 'no');
         $builder = Pet::query()->getQuery();
-        $filter->modifyQuery($builder, $this->searchTerm('eq', true));
+        $filter->modifyQuery($builder, $this->searchTerm('eq', 'true'));
 
         $this->assertEquals(
             "select * from `pets` where `is_active` = ?",
@@ -58,6 +57,22 @@ public function can_override_true_and_false_val()
         $this->assertEquals(['yes'], $builder->getBindings());
     }
 
+    /**
+     * @test
+     */
+    public function can_handle_false_in_url_string_as_boolean()
+    {
+        $filter = new BooleanFilter;
+        $builder = Pet::query()->getQuery();
+        $filter->modifyQuery($builder, $this->searchTerm('eq', 'false'));
+
+        $this->assertEquals(
+            "select * from `pets` where `is_active` = ?",
+            $builder->toSql()
+        );
+        $this->assertEquals([0], $builder->getBindings());
+    }
+
     private function searchTerm($operator, $term)
     {
         return new SearchTerm('is_active', $operator, 'is_active', $term);