[CHILD REMOVAL] Adding a parameter "removeChild" to delete the

Thomas Courthial · Thomas Courthial · commit e8735e6f3362 · 2014-02-04T15:41:52.000+01:00
child entity of a relation when unsetting this child entity in the parent
entity (#childRemoval)
diff --git a/Services/DataMapper/XmlMapper.php b/Services/DataMapper/XmlMapper.php
@@ -101,7 +101,7 @@ private function xmlElementToEntity(array $mapping, \SimpleXMLElement $xmlElemen
                     }
 
                     // If xmlKey not found in XMl Data, there's no object to create. So we return null
-                    if (!isset($description['key']['xmlKey'])) {
+                    if (!isset($keys[0])) {
                         return null;
                     } elseif(is_array($description['key']['xmlKey'])) {
                         $oldObject = $em->getRepository($description['repository'])->$findFunction($keys);
@@ -141,7 +141,10 @@ private function xmlElementToEntity(array $mapping, \SimpleXMLElement $xmlElemen
                                         if ($oldElements != null) {
                                             foreach ($oldElements as $oldElement) {
                                                 $$objectName->$typeDescription['clear']['removeFunction']($oldElement);
-                                                //$em->remove($oldElement);
+                                                if(isset($typeDescription['clear']['removeChild']) && $typeDescription['clear']['removeChild'])
+                                                {
+                                                    $em->remove($oldElement);
+                                                }
                                             }
                                         }
                                     }

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private function xmlElementToEntity(array $mapping, \SimpleXMLElement $xmlElemen`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// If xmlKey not found in XMl Data, there's no object to create. So we return null`
`104`		`- if (!isset($description['key']['xmlKey'])) {`
	`104`	`+ if (!isset($keys[0])) {`
`105`	`105`	`return null;`
`106`	`106`	`} elseif(is_array($description['key']['xmlKey'])) {`
`107`	`107`	`$oldObject = $em->getRepository($description['repository'])->$findFunction($keys);`
`@@ -141,7 +141,10 @@ private function xmlElementToEntity(array $mapping, \SimpleXMLElement $xmlElemen`
`141`	`141`	`if ($oldElements != null) {`
`142`	`142`	`foreach ($oldElements as $oldElement) {`
`143`	`143`	`$$objectName->$typeDescription['clear']['removeFunction']($oldElement);`
`144`		`- //$em->remove($oldElement);`
	`144`	`+ if(isset($typeDescription['clear']['removeChild']) && $typeDescription['clear']['removeChild'])`
	`145`	`+ {`
	`146`	`+ $em->remove($oldElement);`
	`147`	`+ }`
`145`	`148`	`}`
`146`	`149`	`}`
`147`	`150`	`}`