Data\Filter: add or/andFilter implementations

Those shortcuts make it easy to correctly add or/and conditions
regardless of the original filter type

library/Icinga/Data/Filter/Filter.php

@@ -30,6 +30,10 @@ abstract class Filter
 
     abstract public function toQueryString();
 
+    abstract public function andFilter(Filter $filter);
+
+    abstract public function orFilter(Filter $filter);
+
     public function getUrlParams()
     {
         return UrlParams::fromQueryString($this->toQueryString());

library/Icinga/Data/Filter/FilterAnd.php

@@ -30,4 +30,14 @@ class FilterAnd extends FilterChain
         }
         return true;
     }
+
+    public function andFilter(Filter $filter)
+    {
+        return $this->addFilter($filter);
+    }
+
+    public function orFilter(Filter $filter)
+    {
+        return Filter::matchAny($this, $filter);
+    }
 }

library/Icinga/Data/Filter/FilterExpression.php

@@ -107,4 +107,14 @@ class FilterExpression extends Filter
             return (bool) preg_match($pattern, $row->{$this->column});
         }
     }
+
+    public function andFilter(Filter $filter)
+    {
+        return Filter::matchAll($this, $filter);
+    }
+
+    public function orFilter(Filter $filter)
+    {
+        return Filter::matchAny($this, $filter);
+    }
 }

library/Icinga/Data/Filter/FilterNot.php

@@ -22,6 +22,16 @@ class FilterNot extends FilterChain
         return true;
     }
 
+    public function andFilter(Filter $filter)
+    {
+        return Filter::matchAll($this, $filter);
+    }
+
+    public function orFilter(Filter $filter)
+    {
+        return Filter::matchAny($filter);
+    }
+
     public function toQueryString()
     {
         $parts = array();

library/Icinga/Data/Filter/FilterOr.php

@@ -19,4 +19,14 @@ class FilterOr extends FilterChain
         }
         return false;
     }
+
+    public function andFilter(Filter $filter)
+    {
+        return Filter::matchAll($this, $filter);
+    }
+
+    public function orFilter(Filter $filter)
+    {
+        return $this->addFilter($filter);
+    }
 }