Debug refile

src/Filter/OrFilter.php

@@ -10,14 +10,22 @@ class OrFilter extends Filter
      */
     public $filters = [];
 
+    /**
+     * @var string
+     */
+    public $chainType;
+
     /**
      * @param Filter[] $filters
      */
-    public function __construct(array $filters = [])
+    public function __construct(array $filters = [], $chainType = 'OR')
     {
         if ($filters) {
             $this->setFilters($filters);
         }
+        if ($chainType) {
+            $this->setChainType($chainType);
+        }
     }
 
     /**
@@ -43,4 +51,20 @@ public function addFilter(Filter $filter)
     {
         $this->filters[] = $filter;
     }
+
+    /**
+     * @return string
+     */
+    public function getChainType()
+    {
+        return $this->chainType;
+    }
+
+    /**
+     * @param string $chainType
+     */
+    public function setChainType($chainType)
+    {
+        $this->chainType = $chainType;
+    }
 }

src/Model/ModelTrait/DBReadTrait.php

@@ -74,10 +74,11 @@ protected function getOperator(Filter $filter)
      * @param int $count
      * @param Filter $filter
      * @param ExtendedSelectStatement $selectStatement
+     * @param string $chainType
      *
      * @return bool
      */
-    protected function applyOrWhere($count, Filter $filter, ExtendedSelectStatement $selectStatement)
+    protected function applyOrWhere($count, Filter $filter, ExtendedSelectStatement $selectStatement, $chainType = 'OR')
     {
         if (!$count) {
             $selectStatement->where(
@@ -89,11 +90,19 @@ protected function applyOrWhere($count, Filter $filter, ExtendedSelectStatement
             return true;
         }
 
-        $selectStatement->orWhere(
-            $this->translateDbName($filter->getFilterColumn()),
-            $this->getOperator($filter),
-            $filter->getFilterValue()
-        );
+        if ($chainType === 'OR') {
+            $selectStatement->orWhere(
+                $this->translateDbName($filter->getFilterColumn()),
+                $this->getOperator($filter),
+                $filter->getFilterValue()
+            );
+        } else if ($chainType === 'AND') {
+            $selectStatement->where(
+                $this->translateDbName($filter->getFilterColumn()),
+                $this->getOperator($filter),
+                $filter->getFilterValue()
+            );
+        }
 
         return true;
     }
@@ -106,8 +115,10 @@ protected function addOrWhere(OrFilter $filter, ExtendedSelectStatement $selectS
     {
         $selectStatement->addParenthesis();
 
+        $chainType = $filter->getChainType();
+
         foreach ($filter->getFilters() as $count => $filter) {
-            $this->applyOrWhere($count, $filter, $selectStatement);
+            $this->applyOrWhere($count, $filter, $selectStatement, $chainType);
         }
 
         $selectStatement->closeParenthesis();