Merge pull request #309 from FriendsOfCake/issue-308

Fix return value for Boolean::process().
FriendsOfCake · Feb 18, 2021 · 67aaee5 · 67aaee5
2 parents 2523851 + f128a1b
commit 67aaee5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/Model/Filter/Boolean.php b/src/Model/Filter/Boolean.php
@@ -41,25 +41,27 @@ public function process(): bool
             $bool = false;
         }
 
-        if ($bool !== null) {
-            if (!$this->manager()->getRepository() instanceof Table) {
-                foreach ($this->fields() as $field) {
-                    $this->getQuery()->where([
-                        $field => $bool,
-                    ]);
-                }
-
-                return true;
-            }
+        if ($bool === null) {
+            return false;
+        }
 
+        if ($this->manager()->getRepository() instanceof Table) {
             $conditions = [];
             foreach ($this->fields() as $field) {
                 $conditions[] = [$field => $bool];
             }
 
             $this->getQuery()->andWhere([$this->getConfig('mode') => $conditions]);
+
+            return true;
+        }
+
+        foreach ($this->fields() as $field) {
+            $this->getQuery()->where([
+                $field => $bool,
+            ]);
         }
 
-        return false;
+        return true;
     }
 }
diff --git a/tests/TestCase/Model/Filter/BooleanTest.php b/tests/TestCase/Model/Filter/BooleanTest.php
@@ -29,8 +29,9 @@ public function testProcessWithFlagOn()
         $filter = new Boolean('is_active', $manager);
         $filter->setArgs(['is_active' => 'on']);
         $filter->setQuery($articles->find());
-        $filter->process();
+        $result = $filter->process();
 
+        $this->assertTrue($result);
         $this->assertRegExp(
             '/WHERE Articles\.is_active = \:c0$/',
             $filter->getQuery()->sql()
@@ -246,8 +247,9 @@ public function testProcessWithFlagInvalid()
         $filter = new Boolean('is_active', $manager);
         $filter->setArgs(['is_active' => 'neitherTruthyNorFalsy']);
         $filter->setQuery($articles->find());
-        $filter->process();
+        $result = $filter->process();
 
+        $this->assertFalse($result);
         $this->assertEmpty($filter->getQuery()->clause('where'));
         $filter->getQuery()->sql();
         $this->assertEmpty($filter->getQuery()->getValueBinder()->bindings());