Ensure collMod.validator is an object

doctrine · Dec 27, 2021 · 3ae453b · 3ae453b
1 parent d2b74fc
commit 3ae453b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/SchemaManager.php b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
@@ -21,7 +21,9 @@
 use function array_unique;
 use function array_values;
 use function assert;
+use function count;
 use function in_array;
+use function is_array;
 use function is_string;
 use function iterator_count;
 use function iterator_to_array;
@@ -352,9 +354,9 @@ public function updateDocumentValidator(string $documentName, ?int $maxTimeMs =
             throw new InvalidArgumentException('Cannot update validators for files, views, mapped super classes, embedded documents or aggregation result documents.');
         }
 
-        $validator = [];
-        if ($class->getValidator() !== null) {
-            $validator = $class->getValidator();
+        $validator = $class->getValidator();
+        if ($validator === null || (is_array($validator) && count($validator) === 0)) {
+            $validator = (object) [];
         }
 
         $collection       = $this->dm->getDocumentCollection($class->name);

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php b/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
@@ -472,7 +472,7 @@ public function testUpdateDocumentValidatorReset(array $expectedWriteOptions, ?i
             ->with(
                 [
                     'collMod' => $class->collection,
-                    'validator' => [],
+                    'validator' => (object) [],
                     'validationAction' => ClassMetadata::SCHEMA_VALIDATION_ACTION_ERROR,
                     'validationLevel' => ClassMetadata::SCHEMA_VALIDATION_LEVEL_STRICT,
                 ],