Fix null handling of EqFilter

proophsoftware · Jul 11, 2018 · 3a3f38e · 3a3f38e
1 parent bfb8f30
commit 3a3f38e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/src/Persistence/DocumentStore/Filter/EqFilter.php b/src/Persistence/DocumentStore/Filter/EqFilter.php
@@ -55,8 +55,8 @@ public function match(array $doc): bool
 
         $prop = $reader->mixedValue($this->prop, self::NOT_SET_PROPERTY);
 
-        if ($prop === self::NOT_SET_PROPERTY) {
-            return false;
+        if ($prop === self::NOT_SET_PROPERTY && $this->val === null) {
+            return $reader->pathExists($this->prop);
         }
 
         return $prop === $this->val;

diff --git a/src/Persistence/DocumentStore/Filter/ExistsFilter.php b/src/Persistence/DocumentStore/Filter/ExistsFilter.php
@@ -39,8 +39,6 @@ public function match(array $doc): bool
     {
         $reader = new ArrayReader($doc);
 
-        $prop = $reader->mixedValue($this->prop, self::NOT_SET_PROPERTY);
-
-        return $prop !== self::NOT_SET_PROPERTY;
+        return $reader->pathExists($this->prop);
     }
 }
diff --git a/tests/Persistence/DocumentStore/Filter/EqFilterTest.php b/tests/Persistence/DocumentStore/Filter/EqFilterTest.php
@@ -31,4 +31,18 @@ public function it_filters_docs_with_eq_filter()
 
         $this->assertEquals('Quak', implode(', ', $names));
     }
+
+    /**
+     * @test
+     */
+    public function it_filters_docs_with_eq_null_filter()
+    {
+        $this->loadFixtures();
+
+        $animals = $this->store->filterDocs($this->collection, new EqFilter('race', null));
+
+        $names = iterator_to_array($this->extractFieldIntoList('name', $animals));
+
+        $this->assertEquals('Quak', implode(', ', $names));
+    }
 }
diff --git a/tests/Persistence/DocumentStore/Filter/ExistsFilterTest.php b/tests/Persistence/DocumentStore/Filter/ExistsFilterTest.php
@@ -29,6 +29,6 @@ public function it_filters_docs_with_exists_filter()
 
         $names = iterator_to_array($this->extractFieldIntoList('name', $animals));
 
-        $this->assertEquals('Hasso', implode(', ', $names));
+        $this->assertEquals('Hasso, Quak', implode(', ', $names));
     }
 }
diff --git a/tests/Persistence/DocumentStore/Filter/FilterTestHelperTrait.php b/tests/Persistence/DocumentStore/Filter/FilterTestHelperTrait.php
@@ -78,6 +78,7 @@ private function loadFixtures()
             'name' => 'Quak',
             'animal' => 'duck',
             'age' => 1,
+            'race' => null,
         ]);
     }
 }