Allow 'ContainsOp' to operate on arrays. Allow value for filter defau…

…lt field to contain spaces.
consolidation · Oct 4, 2018 · 170ec2c · 170ec2c
1 parent dbb4b8a
commit 170ec2c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/OperatorFactory.php b/src/OperatorFactory.php
@@ -83,7 +83,7 @@ protected function splitOnOperator($expression, $defaultField = false)
     {
         // If there is a default field, then any expression that is missing
         // an operator will be interpreted as "default field contains value".
-        if (preg_match('#^[a-zA-Z0-9_.:-]+$#', $expression) && ($defaultField !== false)) {
+        if (preg_match('#^[a-zA-Z0-9 _.:-]+$#', $expression) && ($defaultField !== false)) {
             return [$defaultField, '*=', $expression];
         }
         if (!preg_match('#([^!~*=]*)(!?~?\*?=)(.*)#', $expression, $matches)) {

diff --git a/src/Operators/ContainsOp.php b/src/Operators/ContainsOp.php
@@ -27,6 +27,9 @@ public function __construct($key, $comparitor)
     public function test(Data $row)
     {
         $value = $row->get($this->key);
+        if (is_array($value)) {
+            return in_array($this->comparitor, $value);
+        }
         return strpos($value, $this->comparitor) !== false;
     }