Set default mapping in metadata class

doctrine · Oct 14, 2024 · 66b0d20 · 66b0d20
1 parent 851762f
commit 66b0d20
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/MongoDB/Mapping/ClassMetadata.php
@@ -28,6 +28,7 @@
 use ReflectionEnum;
 use ReflectionNamedType;
 use ReflectionProperty;
+use stdClass;
 
 use function array_filter;
 use function array_key_exists;
@@ -1228,6 +1229,11 @@ public function hasIndexes(): bool
      */
     public function addSearchIndex(array $definition, ?string $name = null): void
     {
+        // "mappings" is required and must be an object
+        if (! isset($definition['mappings']) || $definition['mappings'] === []) {
+            $definition['mappings'] = new stdClass();
+        }
+
         $this->searchIndexes[] = [
             'definition' => $definition,
             'name' => $name ?? self::DEFAULT_SEARCH_INDEX_NAME,

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/AttributeDriver.php
@@ -19,7 +19,6 @@
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionProperty;
-use stdClass;
 
 use function array_merge;
 use function array_replace;
@@ -358,12 +357,11 @@ private function addIndex(ClassMetadata $class, AbstractIndex $index, array $key
     /** @param ClassMetadata<object> $class */
     private function addSearchIndex(ClassMetadata $class, SearchIndex $index): void
     {
-        // "mappings" is required and must be an object
-        $definition = ['mappings' => new stdClass()];
+        $definition = [];
 
         foreach (['dynamic', 'fields'] as $key) {
             if (isset($index->$key)) {
-                $definition['mappings']->$key = $index->$key;
+                $definition['mappings'][$key] = $index->$key;
             }
         }
 

diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php
@@ -13,7 +13,6 @@
 use LibXMLError;
 use MongoDB\Driver\Exception\UnexpectedValueException;
 use SimpleXMLElement;
-use stdClass;
 
 use function array_is_list;
 use function array_keys;
@@ -584,10 +583,10 @@ private function addIndex(ClassMetadata $class, SimpleXMLElement $xmlIndex): voi
     private function addSearchIndex(ClassMetadata $class, SimpleXMLElement $searchIndex): void
     {
         // "mappings" is required and must be an object
-        $definition = ['mappings' => new stdClass()];
+        $definition = [];
 
         if (isset($searchIndex['dynamic'])) {
-            $definition['mappings']->dynamic = $this->convertXMLElementValue((string) $searchIndex['dynamic']);
+            $definition['mappings']['dynamic'] = $this->convertXMLElementValue((string) $searchIndex['dynamic']);
         }
 
         foreach ($searchIndex->field as $field) {
@@ -596,14 +595,14 @@ private function addSearchIndex(ClassMetadata $class, SimpleXMLElement $searchIn
 
             // If the field is indexed with multiple data types, collect the definitions in a list.
             // See: https://www.mongodb.com/docs/atlas/atlas-search/define-field-mappings/#index-field-as-multiple-data-types
-            if (isset($definition['mappings']->fields[$name])) {
-                if (! array_is_list($definition['mappings']->fields[$name])) {
-                    $definition['mappings']->fields[$name] = [$definition['mappings']->fields[$name]];
+            if (isset($definition['mappings']['fields'][$name])) {
+                if (! array_is_list($definition['mappings']['fields'][$name])) {
+                    $definition['mappings']['fields'][$name] = [$definition['mappings']['fields'][$name]];
                 }
 
-                $definition['mappings']->fields[$name][] = $fieldDefinition;
+                $definition['mappings']['fields'][$name][] = $fieldDefinition;
             } else {
-                $definition['mappings']->fields[$name] = $fieldDefinition;
+                $definition['mappings']['fields'][$name] = $fieldDefinition;
             }
         }
 

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTestCase.php b/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTestCase.php
@@ -433,7 +433,7 @@ public function testSearchIndexes(ClassMetadata $class): void
             [
                 'name' => 'default',
                 'definition' => [
-                    'mappings' => (object) ['dynamic' => true],
+                    'mappings' => ['dynamic' => true],
                     'analyzer' => 'lucene.standard',
                     'searchAnalyzer' => 'lucene.standard',
                     'storedSource' => true,
@@ -446,7 +446,7 @@ public function testSearchIndexes(ClassMetadata $class): void
             [
                 'name' => 'usernameAndPhoneNumbers',
                 'definition' => [
-                    'mappings' => (object) [
+                    'mappings' => [
                         'fields' => [
                             'username' => [
                                 [