Merge pull request #2452 from franmomu/fix_tests

Fix failing tests
doctrine · Sep 19, 2022 · 89a5bfd · 89a5bfd
2 parents 8f968ba + 6c7d3b7
commit 89a5bfd
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 33 deletions.
diff --git a/docs/en/cookbook/validation-of-documents.rst b/docs/en/cookbook/validation-of-documents.rst
@@ -197,7 +197,7 @@ the ``odm:schema:create`` or ``odm:schema:update`` command.
             },
             "$or": [
                 { "phone": { "$type": "string" } },
-                { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+                { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
                 { "status": { "$in": [ "Unknown", "Incomplete" ] } }
             ]
         }
@@ -241,7 +241,7 @@ the ``odm:schema:create`` or ``odm:schema:update`` command.
                         },
                         "$or": [
                             { "phone": { "$type": "string" } },
-                            { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+                            { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
                             { "status": { "$in": [ "Unknown", "Incomplete" ] } }
                         ]
                     }

diff --git a/docs/en/reference/annotations-reference.rst b/docs/en/reference/annotations-reference.rst
@@ -1186,7 +1186,7 @@ for the related collection.
         },
         "$or": [
             { "phone": { "$type": "string" } },
-            { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+            { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
             { "status": { "$in": [ "Unknown", "Incomplete" ] } }
         ]
     }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Functional/ValidationTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Functional/ValidationTest.php
@@ -36,7 +36,7 @@ public function testCreateUpdateValidatedDocument(): void
     },
     "$or": [
         { "phone": { "$type": "string" } },
-        { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+        { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
         { "status": { "$in": [ "Unknown", "Incomplete" ] } }
     ]
 }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Annotations/ValidationTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Annotations/ValidationTest.php
diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/ClassMetadataTest.php
@@ -77,7 +77,7 @@ public function testClassMetadataInstanceSerialization(): void
         $cm->setLockField('lock');
         $cm->setVersioned(true);
         $cm->setVersionField('version');
-        $validatorJson = '{ "$and": [ { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\\\.com$", "options": "" } } } } ] }';
+        $validatorJson = '{ "$and": [ { "email": { "$regularExpression" : { "pattern": "@mongodb\\\\.com$", "options": "" } } } ] }';
         $cm->setValidator(toPHP(fromJSON($validatorJson)));
         $cm->setValidationAction(ClassMetadata::SCHEMA_VALIDATION_ACTION_WARN);
         $cm->setValidationLevel(ClassMetadata::SCHEMA_VALIDATION_LEVEL_OFF);

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/XmlDriverTest.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/XmlDriverTest.php
@@ -132,7 +132,7 @@ public function testValidationMapping(): void
     },
     "$or": [
         { "phone": { "$type": "string" } },
-        { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+        { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
         { "status": { "$in": [ "Unknown", "Incomplete" ] } }
     ]
 }

diff --git a/...M/MongoDB/Tests/Mapping/Driver/fixtures/xml/TestDocuments.SchemaValidatedDocument.dcm.xml b/...M/MongoDB/Tests/Mapping/Driver/fixtures/xml/TestDocuments.SchemaValidatedDocument.dcm.xml
@@ -18,7 +18,7 @@
                 },
                 "$or": [
                     { "phone": { "$type": "string" } },
-                    { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+                    { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
                     { "status": { "$in": [ "Unknown", "Incomplete" ] } }
                 ]
             }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php b/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
@@ -430,7 +430,7 @@ public function testUpdateDocumentValidator(array $expectedWriteOptions, ?int $m
     },
     "$or": [
         { "phone": { "$type": "string" } },
-        { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+        { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
         { "status": { "$in": [ "Unknown", "Incomplete" ] } }
     ]
 }
@@ -543,7 +543,7 @@ public function testCreateDocumentCollectionWithValidator(array $expectedWriteOp
     },
     "$or": [
         { "phone": { "$type": "string" } },
-        { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+        { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
         { "status": { "$in": [ "Unknown", "Incomplete" ] } }
     ]
 }

diff --git a/tests/Documents/SchemaValidated.php b/tests/Documents/SchemaValidated.php
@@ -30,7 +30,7 @@ class SchemaValidated
     },
     "$or": [
         { "phone": { "$type": "string" } },
-        { "email": { "$regex": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } } },
+        { "email": { "$regularExpression" : { "pattern": "@mongodb\\.com$", "options": "" } } },
         { "status": { "$in": [ "Unknown", "Incomplete" ] } }
     ]
 }