Support multiple calls to where() in finder

Author: ilijastuden

src/Finder.php

@@ -33,9 +33,9 @@ class Finder
     private $type;
 
     /**
-     * @var string|null
+     * @var string[]
      */
-    private $conditions;
+    private $where = [];
 
     /**
      * @var string
@@ -103,11 +103,28 @@ public function &where($pattern, ...$arguments)
             $conditions_to_prepare = array_merge($conditions_to_prepare, $arguments);
         }
 
-        $this->conditions = $this->connection->prepareConditions($conditions_to_prepare);
+        $this->where[] = $this->connection->prepareConditions($conditions_to_prepare);
 
         return $this;
     }
 
+    /**
+     * Return where part of the query
+     */
+    public function getWhere()
+    {
+        switch (count($this->where)) {
+            case 0:
+                return '';
+            case 1:
+                return $this->where[0];
+            default:
+                return implode(' AND ', array_map(function($condition) {
+                    return "($condition)";
+                }, $this->where));
+        }
+    }
+
     /**
      * @param  string $order_by
      * @return $this
@@ -190,8 +207,8 @@ public function count()
             $sql .= " $this->join";
         }
 
-        if ($this->conditions) {
-            $sql .= " WHERE $this->conditions";
+        if ($where = $this->getWhere()) {
+            $sql .= " WHERE $where";
         }
 
         return $this->connection->executeFirstCell($sql);
@@ -234,7 +251,9 @@ public function first()
      */
     public function ids()
     {
-        return $this->connection->executeFirstColumn($this->getSelectIdsSql());
+        $ids = $this->connection->executeFirstColumn($this->getSelectIdsSql());
+
+        return empty($ids) ? [] : $ids;
     }
 
     /**
@@ -314,8 +333,8 @@ private function getSelectFieldsSql($escaped_field_names)
             $result .= " $this->join";
         }
 
-        if ($this->conditions) {
-            $result .= " WHERE $this->conditions";
+        if ($where = $this->getWhere()) {
+            $result .= " WHERE $where";
         }
 
         if ($this->order_by) {

test/src/FindTest.php

@@ -88,6 +88,17 @@ public function testFindAllIds()
         $this->assertCount(3, $ids);
     }
 
+    /**
+     * Test if ids() returns an empty array on empty result set
+     */
+    public function testFindIdsAlwaysReturnsArray()
+    {
+        $ids = $this->pool->find(Writer::class)->where('id = ?', -1)->ids();
+
+        $this->assertInternalType('array', $ids);
+        $this->assertCount(0, $ids);
+    }
+
     /**
      * Test count using finder object
      */
@@ -109,6 +120,32 @@ public function testFindByConditions()
         $this->assertEquals('Leo Tolstoy', $should_be_leo->getName());
     }
 
+    /**
+     * Test find using multiple calls to where() method
+     */
+    public function testFindByMultipleConditions()
+    {
+        $finder_1 = $this->pool->find(Writer::class)->where('`birthday` > ?', '1800-01-01');
+        $this->assertEquals("`birthday` > '1800-01-01'", $finder_1->getWhere());
+
+        /** @var Writer[] $should_be_fyodor */
+        $should_be_fyodor_and_leo = $finder_1->all();
+
+        $this->assertCount(2, $should_be_fyodor_and_leo);
+
+        $finder_2 = $this->pool->find(Writer::class)->where('`birthday` > ?', '1800-01-01')->where('birthday < ?', '1825-01-01');
+        $this->assertEquals("(`birthday` > '1800-01-01') AND (birthday < '1825-01-01')", $finder_2->getWhere());
+
+        /** @var Writer[] $should_be_fyodor */
+        $should_be_fyodor = $finder_2->all();
+
+        $this->assertCount(1, $should_be_fyodor);
+
+        $this->assertInstanceOf(Writer::class, $should_be_fyodor[0]);
+        $this->assertTrue($should_be_fyodor[0]->isLoaded());
+        $this->assertEquals('Fyodor Dostoyevsky', $should_be_fyodor[0]->getName());
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      */