added ARRAY_MATCH filter

mauretto78 · Aug 16, 2017 · 99a9c94 · 99a9c94
1 parent e5bba5e
commit 99a9c94
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -96,8 +96,9 @@ foreach ($qb->getResults() as $element){
 * `<=`
 * `>=`
 * `!=`
-* `ARRAY`
-* `ARRAY_INVERSED`
+* `IN_ARRAY`
+* `IN_ARRAY_INVERSED`
+* `ARRAY_MATCH`
 * `CONTAINS` (case insensitive)
 
 ### Avaliable sorting operators

diff --git a/src/Filters/Criterion/ArrayMatchFilter.php b/src/Filters/Criterion/ArrayMatchFilter.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * This file is part of the ArrayQuery package.
+ *
+ * (c) Mauro Cassani<https://github.com/mauretto78>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace ArrayQuery\Filters\Criterion;
+
+class ArrayMatchFilter implements FilterInterface
+{
+    /**
+     * @param $value
+     * @param $valueToCompare
+     * @return bool
+     */
+    public function match($value, $valueToCompare)
+    {
+        return count(array_intersect($value, $valueToCompare)) ? true : false;
+    }
+}
diff --git a/src/Filters/Criterion/ArrayFilter.php → src/Filters/Criterion/InArrayFilter.php b/src/Filters/Criterion/ArrayFilter.php → src/Filters/Criterion/InArrayFilter.php
@@ -10,7 +10,7 @@
 
 namespace ArrayQuery\Filters\Criterion;
 
-class ArrayFilter implements FilterInterface
+class InArrayFilter implements FilterInterface
 {
     /**
      * @param $value

diff --git a/...Filters/Criterion/ArrayInversedFilter.php → ...lters/Criterion/InArrayInversedFilter.php b/...Filters/Criterion/ArrayInversedFilter.php → ...lters/Criterion/InArrayInversedFilter.php
@@ -10,7 +10,7 @@
 
 namespace ArrayQuery\Filters\Criterion;
 
-class ArrayInversedFilter implements FilterInterface
+class InArrayInversedFilter implements FilterInterface
 {
     /**
      * @param $value

diff --git a/src/Filters/CriterionFilter.php b/src/Filters/CriterionFilter.php
@@ -24,8 +24,9 @@ class CriterionFilter extends AbstractFilter
         '<' => 'LessThanFilter',
         '<=' => 'LessThanEqualsFilter',
         '!=' => 'NotEqualsFilter',
-        'ARRAY' => 'ArrayFilter',
-        'ARRAY_INVERSED' => 'ArrayInversedFilter',
+        'IN_ARRAY' => 'InArrayFilter',
+        'IN_ARRAY_INVERSED' => 'InArrayInversedFilter',
+        'ARRAY_MATCH' => 'ArrayMatchFilter',
         'CONTAINS' => 'ContainsFilter',
     ];
 

diff --git a/tests/QueryBuilderTest.php b/tests/QueryBuilderTest.php
@@ -251,7 +251,7 @@ public function it_should_get_results_from_a_array_query()
     {
         foreach ($this->usersArrays as $array) {
             $qb = QueryBuilder::create($array)
-                ->addCriterion('name', ['Leanne Graham', 'Ervin Howell', 'Clementine Bauch'], 'ARRAY');
+                ->addCriterion('name', ['Leanne Graham', 'Ervin Howell', 'Clementine Bauch'], 'IN_ARRAY');
 
             $this->assertCount(3, $qb->getResults());
         }
@@ -260,11 +260,11 @@ public function it_should_get_results_from_a_array_query()
     /**
      * @test
      */
-    public function it_should_get_results_from_a_array_inversed_query()
+    public function it_should_get_results_from_a_IN_ARRAY_INVERSED_query()
     {
         foreach ($this->usersArrays as $array) {
             $qb = QueryBuilder::create($array)
-                ->addCriterion('tags', 'pinapple', 'ARRAY_INVERSED')
+                ->addCriterion('tags', 'pinapple', 'IN_ARRAY_INVERSED')
                 ->sortedBy('name', 'ASC');
 
             $results = $qb->getResults();
@@ -274,6 +274,23 @@ public function it_should_get_results_from_a_array_inversed_query()
         }
     }
 
+    /**
+     * @test
+     */
+    public function it_should_get_results_from_a_array_match_query()
+    {
+        foreach ($this->usersArrays as $array) {
+            $qb = QueryBuilder::create($array)
+                ->addCriterion('tags', ['pear-pie', 'apple-pie'], 'ARRAY_MATCH')
+                ->sortedBy('name', 'ASC');
+
+            $results = $qb->getResults();
+
+            $this->assertCount(6, $results);
+            $this->assertEquals('Clementina DuBuque', $results[0]['name']);
+        }
+    }
+
     /**
      * @test
      */
@@ -296,11 +313,11 @@ public function it_should_get_results_from_a_concatenated_query()
     /**
      * @test
      */
-    public function it_should_get_results_from_a_array_inversed_query_with_sorting_and_limits()
+    public function it_should_get_results_from_a_IN_ARRAY_INVERSED_query_with_sorting_and_limits()
     {
         foreach ($this->usersArrays as $array) {
             $qb = QueryBuilder::create($array)
-                ->addCriterion('tags', 'pinapple', 'ARRAY_INVERSED')
+                ->addCriterion('tags', 'pinapple', 'IN_ARRAY_INVERSED')
                 ->sortedBy('id', 'DESC')
                 ->limit(0, 3);
 

diff --git a/tests/files/users.json b/tests/files/users.json
@@ -23,7 +23,8 @@
     },
     "tags": [
       "apple",
-      "pear"
+      "pear",
+      "apple-pie"
     ]
   },
   {
@@ -51,7 +52,9 @@
     "tags": [
       "apple",
       "pinapple",
-      "pear"
+      "pear",
+      "apple-pie",
+      "pear-pie"
     ]
   },
   {
@@ -79,7 +82,8 @@
     "tags": [
       "apple",
       "pinapple",
-      "pear"
+      "pear",
+      "apple-pie"
     ]
   },
   {
@@ -107,7 +111,8 @@
     "tags": [
       "apple",
       "pinapple",
-      "pear"
+      "pear",
+      "apple-pie"
     ]
   },
   {
@@ -247,7 +252,8 @@
     "tags": [
       "apple",
       "pinapple",
-      "pear"
+      "pear",
+      "pear-pie"
     ]
   },
   {
@@ -275,7 +281,8 @@
     "tags": [
       "apple",
       "pinapple",
-      "pear"
+      "pear",
+      "pear-pie"
     ]
   }
 ]