Merge pull request #2592 from doctrine/2.6.x-merge-up-into-2.7.x_XsdxUiZc

Merge release 2.6.1 into 2.7.x

Author: malarzm

lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php

@@ -393,6 +393,7 @@ private function addEmbedMapping(ClassMetadata $class, SimpleXMLElement $embed,
             'name'            => (string) $attributes['field'],
             'strategy'        => (string) ($attributes['strategy'] ?? $defaultStrategy),
             'nullable'        => isset($attributes['nullable']) ? ((string) $attributes['nullable'] === 'true') : false,
+            'storeEmptyArray'  => isset($attributes['store-empty-array']) ? ((string) $attributes['store-empty-array'] === 'true') : false,
         ];
         if (isset($attributes['field-name'])) {
             $mapping['fieldName'] = (string) $attributes['field-name'];

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTestCase.php

@@ -439,6 +439,17 @@ public function testShardKey(ClassMetadata $class): void
         self::assertEquals(4096, $shardKey['options']['numInitialChunks'], 'Shard key option has wrong value');
     }
 
+    /** @param ClassMetadata<AbstractMappingDriverUser> $class */
+    #[Depends('testLoadMapping')]
+    public function testStoreEmptyArray(ClassMetadata $class): void
+    {
+        $referenceMapping = $class->getFieldMapping('phonenumbers');
+        $embeddedMapping  = $class->getFieldMapping('otherPhonenumbers');
+
+        self::assertFalse($referenceMapping['storeEmptyArray']);
+        self::assertFalse($embeddedMapping['storeEmptyArray']);
+    }
+
     public function testGridFSMapping(): void
     {
         $class = $this->dm->getClassMetadata(AbstractMappingDriverFile::class);

tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTestCase.php

@@ -125,6 +125,7 @@ public function testDriver(): void
             'isOwningSide' => true,
             'nullable' => false,
             'strategy' => ClassMetadata::STORAGE_STRATEGY_SET,
+            'storeEmptyArray' => false,
         ], $classMetadata->fieldMappings['address']);
 
         self::assertEquals([
@@ -144,6 +145,7 @@ public function testDriver(): void
             'isOwningSide' => true,
             'nullable' => false,
             'strategy' => ClassMetadata::STORAGE_STRATEGY_PUSH_ALL,
+            'storeEmptyArray' => false,
         ], $classMetadata->fieldMappings['phonenumbers']);
 
         self::assertEquals([
@@ -439,6 +441,7 @@ public function testNullableFieldsMapping(): void
             'isOwningSide' => true,
             'nullable' => true,
             'strategy' => ClassMetadata::STORAGE_STRATEGY_SET,
+            'storeEmptyArray' => false,
         ], $classMetadata->fieldMappings['address']);
 
         self::assertEquals([
@@ -458,6 +461,7 @@ public function testNullableFieldsMapping(): void
             'isOwningSide' => true,
             'nullable' => true,
             'strategy' => ClassMetadata::STORAGE_STRATEGY_PUSH_ALL,
+            'storeEmptyArray' => false,
         ], $classMetadata->fieldMappings['phonenumbers']);
 
         self::assertEquals([