Add support for multiple where calls in collections

Author: ilijastuden

src/Collection/Type.php

@@ -139,7 +139,7 @@ public function getTimestampHash($timestamp_field)
         }
 
         $table_name = $this->getTableName();
-        $conditions = $this->conditions ? " WHERE $this->conditions" : '';
+        $conditions = $this->getConditions() ? " WHERE {$this->getConditions()}" : '';
 
         if ($this->count() > 0) {
             if ($join_expression = $this->getJoinExpression()) {
@@ -238,7 +238,7 @@ private function getSelectSql($all_fields = true)
 
         $fields = $all_fields ? '*' : '`id`';
         $table_name = $this->connection->escapeTableName($this->getTableName());
-        $conditions = $this->conditions ? "WHERE $this->conditions" : '';
+        $conditions = $this->getConditions() ? "WHERE {$this->getConditions()}" : '';
 
         if ($order_by = $this->getOrderBy()) {
             $order_by = "ORDER BY $this->order_by";
@@ -267,7 +267,7 @@ public function count()
         }
 
         $table_name = $this->connection->escapeTableName($this->getTableName());
-        $conditions = $this->conditions ? " WHERE $this->conditions" : '';
+        $conditions = $this->getConditions() ? " WHERE {$this->getConditions()}" : '';
 
         if ($join_expression = $this->getJoinExpression()) {
             return (integer) $this->connection->executeFirstCell("SELECT COUNT($table_name.`id`) FROM $table_name $join_expression $conditions");
@@ -340,7 +340,16 @@ public function &orderBy($value)
      *
      * @var string
      */
-    private $conditions;
+    private $conditions = [];
+
+    /**
+     * Cached conditions as string.
+     *
+     * Call to where() resets this value to false, and getConditions() rebuilds it if it FALSE on request.
+     *
+     * @var string|bool
+     */
+    private $conditions_as_string = false;
 
     /**
      * Return conditions.
@@ -349,27 +358,52 @@ public function &orderBy($value)
      */
     public function getConditions()
     {
-        return $this->conditions;
+        if ($this->conditions_as_string === false) {
+            switch (count($this->conditions)) {
+                case 0:
+                    $this->conditions_as_string = '';
+                    break;
+                case 1:
+                    $this->conditions_as_string = $this->conditions[0];
+                    break;
+                default:
+                    $this->conditions_as_string = implode(' AND ', array_map(function($condition) {
+                        return "($condition)";
+                    }, $this->conditions));
+            }
+        }
+
+        return $this->conditions_as_string;
     }
 
     /**
      * Set collection conditions.
      *
-     * @param  mixed ...$arguments
+     * @param  string $pattern
+     * @param  array  $arguments
      * @return $this
      */
-    public function &where()
+    public function &where($pattern, ...$arguments)
     {
-        $number_of_arguments = func_num_args();
+        if (empty($pattern)) {
+            throw new InvalidArgumentException('Pattern argument is required');
+        }
 
-        if ($number_of_arguments === 1) {
-            $this->conditions = $this->connection->prepareConditions(func_get_arg(0));
-        } elseif ($number_of_arguments > 1) {
-            $this->conditions = $this->connection->prepareConditions(func_get_args());
+        if (is_string($pattern)) {
+            $this->conditions[] = $this->connection->prepareConditions(array_merge([$pattern], $arguments));
+        } elseif (is_array($pattern)) {
+            if (!empty($arguments)) {
+                throw new LogicException('When pattern is an array, no extra arguments are allowed');
+            }
+
+            $this->conditions[] = $this->connection->prepareConditions($pattern);
         } else {
-            throw new InvalidArgumentException('At least one argument expected');
+            throw new InvalidArgumentException('Pattern can be string or an array');
         }
 
+        // Force rebuild of conditions as string on next getConditions() call
+        $this->conditions_as_string = false;
+
         return $this;
     }
 

test/src/TypeCollectionTest.php

@@ -66,6 +66,17 @@ public function testSetConditionsFromArray()
         $this->assertEquals($collection->getConditions(), "type = 'File'");
     }
 
+    /**
+     * @expectedException \LogicException
+     * @expectedExceptionMessage When pattern is an array, no extra arguments are allowed
+     */
+    public function testSetConditionsFromArrayAcceptsOnlyPatternArgument()
+    {
+        $collection = new WritersCollection($this->connection, $this->pool);
+
+        $collection->where(['type = ?', 'File'], 1, 2, 3);
+    }
+
     /**
      * Test set conditions from array of arguments.
      */
@@ -79,20 +90,42 @@ public function testSetConditionsFromArrayOfArguments()
 
     /**
      * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Pattern argument is required
      */
-    public function testEmptyListOfArgumentsThrowsAnException()
+    public function testEmptyPatternStringThrowsAnException()
     {
-        (new WritersCollection($this->connection, $this->pool))->where();
+        (new WritersCollection($this->connection, $this->pool))->where('');
     }
 
     /**
      * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Pattern argument is required
+     */
+    public function testEmptyPatternArrayThrowsAnException()
+    {
+        (new WritersCollection($this->connection, $this->pool))->where([]);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Pattern can be string or an array
      */
     public function testInvalidConditionsTypeThrowsAnException()
     {
         (new WritersCollection($this->connection, $this->pool))->where(123);
     }
 
+    public function testSetMultipleConditions()
+    {
+        $collection = new WritersCollection($this->connection, $this->pool);
+
+        $collection->where('type = ?', 'File');
+        $collection->where('type = ?', 'YouTubeVideo');
+        $collection->where('type = ?', 'GoogleDocument');
+
+        $this->assertEquals($collection->getConditions(), "(type = 'File') AND (type = 'YouTubeVideo') AND (type = 'GoogleDocument')");
+    }
+
     /**
      * Test set order by.
      */