Merge pull request #2590 from alcaeus/fix-xml-mapping-empty-array

Fix missing storeEmptyArray attribute for embed relationships in XML driver
doctrine · Nov 24, 2023 · fc236da · fc236da
2 parents 66a6f3f + 4f7a684
commit fc236da
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php b/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'];

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractMappingDriverTestCase.php b/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);

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/Mapping/Driver/AbstractDriverTestCase.php b/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([