merged branch fabpot/moved_serializer_4 (PR #7292)

fabpot · fabpot · commit 95444058fe1d · 2013-03-06T22:43:24.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7292). Commits ------- 4ffe234 Fix warning for buildXml method Discussion ---------- Fix missing argument This PR was submitted on the symfony/Serializer read-only repository and moved automatically to the main Symfony repository (closes symfony/serializer#4). Fix "Warning: Missing argument 3" for XmlEncoder::buildXml() called several times in XmlEncoder::selectNodeType()
diff --git a/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php b/src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
@@ -287,7 +287,7 @@ private function parseXml($node)
      *
      * @throws UnexpectedValueException
      */
-    private function buildXml($parentNode, $data, $xmlRootNodeName)
+    private function buildXml($parentNode, $data, $xmlRootNodeName = null)
     {
         $append = true;
 
@@ -392,7 +392,7 @@ private function needsCdataWrapping($val)
     private function selectNodeType($node, $val)
     {
         if (is_array($val)) {
-            return $this->buildXml($node, $val, null);
+            return $this->buildXml($node, $val);
         } elseif ($val instanceof \SimpleXMLElement) {
             $child = $this->dom->importNode(dom_import_simplexml($val), true);
             $node->appendChild($child);

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ private function parseXml($node)`
`287`	`287`	`*`
`288`	`288`	`* @throws UnexpectedValueException`
`289`	`289`	`*/`
`290`		`- private function buildXml($parentNode, $data, $xmlRootNodeName)`
	`290`	`+ private function buildXml($parentNode, $data, $xmlRootNodeName = null)`
`291`	`291`	`{`
`292`	`292`	`$append = true;`
`293`	`293`
`@@ -392,7 +392,7 @@ private function needsCdataWrapping($val)`
`392`	`392`	`private function selectNodeType($node, $val)`
`393`	`393`	`{`
`394`	`394`	`if (is_array($val)) {`
`395`		`- return $this->buildXml($node, $val, null);`
	`395`	`+ return $this->buildXml($node, $val);`
`396`	`396`	`} elseif ($val instanceof \SimpleXMLElement) {`
`397`	`397`	`$child = $this->dom->importNode(dom_import_simplexml($val), true);`
`398`	`398`	`$node->appendChild($child);`