Merge branch 'master' into fix/delete-one

Author: martin-helmich

src/MockCollection.php

@@ -678,6 +678,20 @@ function ($acc, $op) use ($val) {
                                 $result = !$operand;
                             }
                             break;
+                        case '$regex':{
+                            if($operand instanceof \MongoDB\BSON\Regex){
+                                $regex = "/". $operand->getPattern() . "/". $operand->getFlags();
+                                $result = preg_match($regex,$val) === 1;
+                            }else if(is_string($operand)){
+                                if(@preg_match($operand, '') === false){
+                                    throw new Exception("Invalid constraint for operator '" . $type . "'");
+                                }
+                                $result = preg_match($operand,$val) === 1;
+                            }else{
+                                throw new Exception("Invalid constraint for operator '" . $type . "'");
+                            }
+                            break;
+                        }
                         // Custom operators
                         case '$instanceOf':
                             $result = is_a($val, $operand);

tests/MockCollectionTest.php

@@ -4,6 +4,7 @@
 
 use Helmich\MongoMock\MockCollection;
 use Helmich\MongoMock\MockCursor;
+use Helmich\MongoMock\Exception;
 use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\Regex;
 use MongoDB\Collection;
@@ -184,6 +185,9 @@ public function testFindWithInvertedFilter()
         $result = $find->toArray();
         self::assertThat(count($result), self::equalTo(1));
         self::assertThat($result[0]['foo'], self::equalTo('bar'));
+
+        $result = $this->col->count(['foo' => ['$not' => ['$regex' => "/bar/"]]]);
+        self::assertThat($result, self::equalTo(1));
     }
 
     /**
@@ -237,6 +241,32 @@ public function testInsertOneKeepsIdIfSet()
         self::assertThat($find['foo'], self::equalTo('bar'));
     }
 
+    public function testFindWithRegexFilter()
+    {
+        $this->col->insertMany([
+            ['foo' => 'barbazbad'],
+            ['foo' => 'bazbad'],
+            ['foo' => 'foobarbaroof']
+        ]);
+
+        $result = $this->col->count(['foo' => ['$regex' => "/barBar/"]]);
+        self::assertThat($result, self::equalTo(0));
+
+        $result = $this->col->count(['foo' => ['$regex' => "/bar/"]]);
+        self::assertThat($result, self::equalTo(2));
+
+        $result = $this->col->count(['foo' => ['$regex' => "/(bar|BAZ)/i"]]);
+        self::assertThat($result, self::equalTo(3));
+
+        $result = $this->col->count(['foo' => ['$regex' => new \MongoDB\BSON\Regex("FOOBAR","i")]]);
+        self::assertThat($result, self::equalTo(1));
+        
+        $this->expectException(Exception::class);
+
+        $result = $this->col->count(['foo' => ['$regex' => "[[[[foobar{"]]);
+
+    }
+
     public function testInsertManyInsertsDocuments()
     {
         $result = $this->col->insertMany([