BUGFIX EXTREST-137 simpleXml fix for & in values.

viacheslav diomidov · sibprogrammer · commit f563d546d5d2 · 2021-10-11T20:46:39.000+07:00
diff --git a/src/Api/Client.php b/src/Api/Client.php
@@ -320,10 +320,15 @@ protected function _expandRequestShortSyntax($request, SimpleXMLElement $xml)
     {
         $parts = explode('.', $request);
         $node = $xml;
+        $lastParts = end($parts);
 
         foreach ($parts as $part) {
             @list($name, $value) = explode('=', $part);
-            $node = $node->addChild($name, $value);
+            if ($part !== $lastParts) {
+                $node = $node->addChild($name);
+            } else {
+                $node->{$name} = (string) $value;
+            }
         }
 
         return $xml->asXML();
@@ -345,7 +350,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->addChild($el, $value);
+                $xml->{$el} = (string) $value;
             }
         }
 
diff --git a/src/Api/Operator.php b/src/Api/Operator.php
@@ -81,7 +81,7 @@ protected function _getItems($structClass, $infoTag, $field = null, $value = nul
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
-            $filterTag->addChild($field, $value);
+            $filterTag->{$field} = $value;
         }
 
         $getTag->addChild('dataset')->addChild($infoTag);
diff --git a/src/Api/Operator/Certificate.php b/src/Api/Operator/Certificate.php
@@ -18,7 +18,7 @@ public function generate($properties)
         $info = $packet->addChild($this->_wrapperTag)->addChild('generate')->addChild('info');
 
         foreach ($properties as $name => $value) {
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         $response = $this->_client->request($packet);
diff --git a/src/Api/Operator/Customer.php b/src/Api/Operator/Customer.php
@@ -18,7 +18,7 @@ public function create($properties)
         $info = $packet->addChild($this->_wrapperTag)->addChild('add')->addChild('gen_info');
 
         foreach ($properties as $name => $value) {
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         $response = $this->_client->request($packet);
diff --git a/src/Api/Operator/Database.php b/src/Api/Operator/Database.php
@@ -43,7 +43,7 @@ private function _process($command, array $properties)
                 $info->$name = $value;
                 continue;
             }
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         return $this->_client->request($packet);
@@ -135,7 +135,7 @@ private function _get($command, $field, $value)
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
-            $filterTag->addChild($field, $value);
+            $filterTag->{$field} = $value;
         }
 
         $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
diff --git a/src/Api/Operator/DatabaseServer.php b/src/Api/Operator/DatabaseServer.php
@@ -53,7 +53,7 @@ private function _get($field = null, $value = null)
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
-            $filterTag->addChild($field, $value);
+            $filterTag->{$field} = $value;
         }
 
         $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
diff --git a/src/Api/Operator/Dns.php b/src/Api/Operator/Dns.php
@@ -18,7 +18,7 @@ public function create($properties)
         $info = $packet->addChild($this->_wrapperTag)->addChild('add_rec');
 
         foreach ($properties as $name => $value) {
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         return new Struct\Info($this->_client->request($packet));
@@ -39,7 +39,7 @@ public function bulkCreate(array $records)
             $info = $packet->addChild($this->_wrapperTag)->addChild('add_rec');
 
             foreach ($properties as $name => $value) {
-                $info->addChild($name, $value);
+                $info->{$name} = $value;
             }
         }
 
diff --git a/src/Api/Operator/DnsTemplate.php b/src/Api/Operator/DnsTemplate.php
@@ -21,7 +21,7 @@ public function create(array $properties)
 
         unset($properties['site-id'], $properties['site-alias-id']);
         foreach ($properties as $name => $value) {
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         return new Struct\Info($this->_client->request($packet));
@@ -53,7 +53,7 @@ public function getAll($field = null, $value = null)
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
-            $filterTag->addChild($field, $value);
+            $filterTag->{$field} = $value;
         }
         $getTag->addChild('template');
 
diff --git a/src/Api/Operator/Mail.php b/src/Api/Operator/Mail.php
@@ -28,7 +28,7 @@ public function create($name, $siteId, $mailbox = false, $password = '')
             $mailname->addChild('mailbox')->addChild('enabled', 'true');
         }
         if (!empty($password)) {
-            $mailname->addChild('password')->addChild('value', $password);
+            $mailname->addChild('password')->value = $password;
         }
 
         $response = $this->_client->request($packet);
@@ -48,7 +48,7 @@ public function delete($field, $value, $siteId)
         $packet = $this->_client->getPacket();
         $filter = $packet->addChild($this->_wrapperTag)->addChild('remove')->addChild('filter');
         $filter->addChild('site-id', $siteId);
-        $filter->addChild($field, $value);
+        $filter->{$field} = $value;
         $response = $this->_client->request($packet);
 
         return 'ok' === (string) $response->status;
diff --git a/src/Api/Operator/ProtectedDirectory.php b/src/Api/Operator/ProtectedDirectory.php
@@ -81,9 +81,9 @@ public function addUser($protectedDirectory, $login, $password)
         $packet = $this->_client->getPacket();
         $info = $packet->addChild($this->_wrapperTag)->addChild('add-user');
 
-        $info->addChild('pd-id', $protectedDirectory->id);
-        $info->addChild('login', $login);
-        $info->addChild('password', $password);
+        $info->{'pd-id'} = $protectedDirectory->id;
+        $info->login = $login;
+        $info->password = $password;
 
         return new Struct\UserInfo($this->_client->request($packet));
     }
@@ -113,7 +113,7 @@ private function _get($command, $field, $value)
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
-            $filterTag->addChild($field, $value);
+            $filterTag->{$field} = $value;
         }
 
         $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
diff --git a/src/Api/Operator/Reseller.php b/src/Api/Operator/Reseller.php
@@ -18,7 +18,7 @@ public function create($properties)
         $info = $packet->addChild($this->_wrapperTag)->addChild('add')->addChild('gen-info');
 
         foreach ($properties as $name => $value) {
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         $response = $this->_client->request($packet);
diff --git a/src/Api/Operator/Site.php b/src/Api/Operator/Site.php
@@ -24,16 +24,16 @@ public function create(array $properties)
             if (!is_scalar($value)) {
                 continue;
             }
-            $infoGeneral->addChild($name, $value);
+            $infoGeneral->{$name} = $value;
         }
 
         // set hosting properties
         if (isset($properties[static::PROPERTIES_HOSTING]) && is_array($properties[static::PROPERTIES_HOSTING])) {
             $hostingNode = $info->addChild('hosting')->addChild('vrt_hst');
             foreach ($properties[static::PROPERTIES_HOSTING] as $name => $value) {
                 $propertyNode = $hostingNode->addChild('property');
-                $propertyNode->addChild('name', $name);
-                $propertyNode->addChild('value', $value);
+                $propertyNode->name = $name;
+                $propertyNode->value = $value;
             }
         }
 
diff --git a/src/Api/Operator/SiteAlias.php b/src/Api/Operator/SiteAlias.php
@@ -71,7 +71,7 @@ public function getAll($field = null, $value = null)
 
         $filterTag = $getTag->addChild('filter');
         if (!is_null($field)) {
-            $filterTag->addChild($field, $value);
+            $filterTag->{$field} = $value;
         }
 
         $response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);
diff --git a/src/Api/Operator/Subdomain.php b/src/Api/Operator/Subdomain.php
@@ -21,12 +21,12 @@ public function create($properties)
             if (is_array($value)) {
                 foreach ($value as $propertyName => $propertyValue) {
                     $property = $info->addChild($name);
-                    $property->addChild('name', $propertyName);
-                    $property->addChild('value', $propertyValue);
+                    $property->name = $propertyName;
+                    $property->value = $propertyValue;
                 }
                 continue;
             }
-            $info->addChild($name, $value);
+            $info->{$name} = $value;
         }
 
         $response = $this->_client->request($packet);
diff --git a/src/Api/Operator/Ui.php b/src/Api/Operator/Ui.php
@@ -31,7 +31,7 @@ public function createCustomButton($owner, $properties)
         $propertiesNode = $buttonNode->addChild('properties');
 
         foreach ($properties as $name => $value) {
-            $propertiesNode->addChild($name, $value);
+            $propertiesNode->{$name} = $value;
         }
 
         $response = $this->_client->request($packet);
diff --git a/src/Api/Operator/Webspace.php b/src/Api/Operator/Webspace.php
@@ -81,8 +81,8 @@ public function create(array $properties, array $hostingProperties = null, $plan
             $infoHosting = $info->addChild('hosting')->addChild('vrt_hst');
             foreach ($hostingProperties as $name => $value) {
                 $property = $infoHosting->addChild('property');
-                $property->addChild('name', $name);
-                $property->addChild('value', $value);
+                $property->name = $name;
+                $property->value = $value;
             }
 
             if (isset($properties['ip_address'])) {
diff --git a/tests/Utility/PasswordProvider.php b/tests/Utility/PasswordProvider.php
@@ -5,5 +5,5 @@
 
 class PasswordProvider
 {
-    const STRONG_PASSWORD = 'test-PWD*1@42!13#';
+    const STRONG_PASSWORD = 'test-&PWD*1@42!13#';
 }

Original file line number	Diff line number	Diff line change
`@@ -320,10 +320,15 @@ protected function _expandRequestShortSyntax($request, SimpleXMLElement $xml)`
`320`	`320`	`{`
`321`	`321`	`$parts = explode('.', $request);`
`322`	`322`	`$node = $xml;`
	`323`	`+ $lastParts = end($parts);`
`323`	`324`
`324`	`325`	`foreach ($parts as $part) {`
`325`	`326`	`@list($name, $value) = explode('=', $part);`
`326`		`- $node = $node->addChild($name, $value);`
	`327`	`+ if ($part !== $lastParts) {`
	`328`	`+ $node = $node->addChild($name);`
	`329`	`+ } else {`
	`330`	`+ $node->{$name} = (string) $value;`
	`331`	`+ }`
`327`	`332`	`}`
`328`	`333`
`329`	`334`	`return $xml->asXML();`
`@@ -345,7 +350,7 @@ protected function _arrayToXml(array $array, SimpleXMLElement $xml, $parentEl =`
`345`	`350`	`if (is_array($value)) {`
`346`	`351`	`$this->_arrayToXml($value, $this->_isAssocArray($value) ? $xml->addChild($el) : $xml, $el);`
`347`	`352`	`} else {`
`348`		`- $xml->addChild($el, $value);`
	`353`	`+ $xml->{$el} = (string) $value;`
`349`	`354`	`}`
`350`	`355`	`}`
`351`	`356`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ protected function _getItems($structClass, $infoTag, $field = null, $value = nul`
`81`	`81`
`82`	`82`	`$filterTag = $getTag->addChild('filter');`
`83`	`83`	`if (!is_null($field)) {`
`84`		`- $filterTag->addChild($field, $value);`
	`84`	`+ $filterTag->{$field} = $value;`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`$getTag->addChild('dataset')->addChild($infoTag);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function generate($properties)`
`18`	`18`	`$info = $packet->addChild($this->_wrapperTag)->addChild('generate')->addChild('info');`
`19`	`19`
`20`	`20`	`foreach ($properties as $name => $value) {`
`21`		`- $info->addChild($name, $value);`
	`21`	`+ $info->{$name} = $value;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`$response = $this->_client->request($packet);`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public function create($properties)`
`18`	`18`	`$info = $packet->addChild($this->_wrapperTag)->addChild('add')->addChild('gen_info');`
`19`	`19`
`20`	`20`	`foreach ($properties as $name => $value) {`
`21`		`- $info->addChild($name, $value);`
	`21`	`+ $info->{$name} = $value;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`$response = $this->_client->request($packet);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ private function _process($command, array $properties)`
`43`	`43`	`$info->$name = $value;`
`44`	`44`	`continue;`
`45`	`45`	`}`
`46`		`- $info->addChild($name, $value);`
	`46`	`+ $info->{$name} = $value;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return $this->_client->request($packet);`
`@@ -135,7 +135,7 @@ private function _get($command, $field, $value)`
`135`	`135`
`136`	`136`	`$filterTag = $getTag->addChild('filter');`
`137`	`137`	`if (!is_null($field)) {`
`138`		`- $filterTag->addChild($field, $value);`
	`138`	`+ $filterTag->{$field} = $value;`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`$response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private function _get($field = null, $value = null)`
`53`	`53`
`54`	`54`	`$filterTag = $getTag->addChild('filter');`
`55`	`55`	`if (!is_null($field)) {`
`56`		`- $filterTag->addChild($field, $value);`
	`56`	`+ $filterTag->{$field} = $value;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`$response = $this->_client->request($packet, \PleskX\Api\Client::RESPONSE_FULL);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function create(array $properties)`
`21`	`21`
`22`	`22`	`unset($properties['site-id'], $properties['site-alias-id']);`
`23`	`23`	`foreach ($properties as $name => $value) {`
`24`		`- $info->addChild($name, $value);`
	`24`	`+ $info->{$name} = $value;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`return new Struct\Info($this->_client->request($packet));`
`@@ -53,7 +53,7 @@ public function getAll($field = null, $value = null)`
`53`	`53`
`54`	`54`	`$filterTag = $getTag->addChild('filter');`
`55`	`55`	`if (!is_null($field)) {`
`56`		`- $filterTag->addChild($field, $value);`
	`56`	`+ $filterTag->{$field} = $value;`
`57`	`57`	`}`
`58`	`58`	`$getTag->addChild('template');`
`59`	`59`