BUGFIX PPP-54497 simpleXml fix for & in values

viacheslav diomidov · viacheslav diomidov · commit 70b5a9ff5aa3 · 2021-10-05T15:46:19.000+03:00
diff --git a/src/Api/Client.php b/src/Api/Client.php
@@ -324,7 +324,7 @@ protected function _expandRequestShortSyntax($request, SimpleXMLElement $xml)
 
         foreach ($parts as $part) {
             @list($name, $value) = explode('=', $part);
-            $node = $node->{$name} = $value;
+            $node->{$name} = $value;
         }
 
         return $xml->asXML();
@@ -346,7 +346,7 @@ protected function _arrayToXml(array $array, SimpleXMLElement $xml, $parentEl =
             if (is_array($value)) {
                 $this->_arrayToXml($value, $this->_isAssocArray($value) ? $xml->addChild($el) : $xml, $el);
             } else {
-                $xml->{$el} = $value;
+                $node = $node->addChild($el, htmlspecialchars($value));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ protected function _expandRequestShortSyntax($request, SimpleXMLElement $xml)`
`324`	`324`
`325`	`325`	`foreach ($parts as $part) {`
`326`	`326`	`@list($name, $value) = explode('=', $part);`
`327`		`- $node = $node->{$name} = $value;`
	`327`	`+ $node->{$name} = $value;`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`return $xml->asXML();`
`@@ -346,7 +346,7 @@ protected function _arrayToXml(array $array, SimpleXMLElement $xml, $parentEl =`
`346`	`346`	`if (is_array($value)) {`
`347`	`347`	`$this->_arrayToXml($value, $this->_isAssocArray($value) ? $xml->addChild($el) : $xml, $el);`
`348`	`348`	`} else {`
`349`		`- $xml->{$el} = $value;`
	`349`	`+ $node = $node->addChild($el, htmlspecialchars($value));`
`350`	`350`	`}`
`351`	`351`	`}`
`352`	`352`