Skip to content

Commit b2c24a8

Browse files
committed
Merge branch '2.2'
* 2.2: (70 commits) change wrapped exception message to be more usefull updated VERSION for 2.0.23 update CONTRIBUTORS for 2.0.23 updated CHANGELOG for 2.0.23 [Form] fixed failing test [DomCrawler] added support for query string with slash Fixed invalid file path for hiddeninput.exe on Windows. fix xsd definition for strict-requirements [WebProfilerBundle] Fixed the toolbar styles to apply them in IE8 [ClassLoader] fixed heredocs handling fixed handling of heredocs Add a public modifier to an interface method removing xdebug extension [HttpRequest] fixes Request::getLanguages() bug [HttpCache] added a test (cached content should be kept after purging) [DoctrineBridge] Fixed non-utf-8 recognition [Security] fixed HttpUtils class tests replaced new occurences of 'Request::create()' with '::create()' changed sub-requests creation to '::create()' fixed merge issue ... Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig src/Symfony/Component/DomCrawler/Link.php src/Symfony/Component/Translation/Translator.php
2 parents aa1ee3b + 8dfb847 commit b2c24a8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Encoder/XmlEncoder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ private function parseXml($node)
287287
*
288288
* @throws UnexpectedValueException
289289
*/
290-
private function buildXml($parentNode, $data, $xmlRootNodeName)
290+
private function buildXml($parentNode, $data, $xmlRootNodeName = null)
291291
{
292292
$append = true;
293293

@@ -392,7 +392,7 @@ private function needsCdataWrapping($val)
392392
private function selectNodeType($node, $val)
393393
{
394394
if (is_array($val)) {
395-
return $this->buildXml($node, $val, null);
395+
return $this->buildXml($node, $val);
396396
} elseif ($val instanceof \SimpleXMLElement) {
397397
$child = $this->dom->importNode(dom_import_simplexml($val), true);
398398
$node->appendChild($child);

0 commit comments

Comments
 (0)