BUGFIX EXTREST-137 simpleXml fix for & in values #109
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #109 +/- ##
============================================
+ Coverage 91.59% 91.81% +0.21%
- Complexity 353 354 +1
============================================
Files 81 81
Lines 1035 1038 +3
============================================
+ Hits 948 953 +5
+ Misses 87 85 -2
Continue to review full report at Codecov.
|
vdiomidov
force-pushed
the
bugfix-vdiomidov-simplexml-amprsant-fix-ppp-54497
branch
3 times, most recently
from
70b5a9f to
9df581f
Compare
xgin
reviewed
Oct 5, 2021
src/Api/Client.php
Outdated
| @@ -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->addChild($el, $value); | |||
| $xml->addChild($el, htmlspecialchars($value)); | |||
There was a problem hiding this comment.
then we get the problem
It is not yet possible to assign complex types to properties
There was a problem hiding this comment.
hmm, does it work with htmlspecialchars? It seems to cast string type for any complex type.
There was a problem hiding this comment.
maybe $xml->{$el} = (string)$value?
There was a problem hiding this comment.
what is the type of $value in case of the problem?
xgin
reviewed
Oct 5, 2021
xgin
reviewed
Oct 5, 2021
xgin
reviewed
Oct 5, 2021
| @@ -114,6 +114,7 @@ private function _get($command, $field, $value) | |||
| $filterTag = $getTag->addChild('filter'); | |||
| if (!is_null($field)) { | |||
| $filterTag->addChild($field, $value); | |||
xgin
reviewed
Oct 5, 2021
src/Api/Operator/Database.php
Outdated
| @@ -136,6 +136,7 @@ private function _get($command, $field, $value) | |||
| $filterTag = $getTag->addChild('filter'); | |||
| if (!is_null($field)) { | |||
| $filterTag->addChild($field, $value); | |||
xgin
reviewed
Oct 5, 2021
src/Api/Operator/Site.php
Outdated
| @@ -33,7 +33,7 @@ public function create(array $properties) | |||
| foreach ($properties[static::PROPERTIES_HOSTING] as $name => $value) { | |||
| $propertyNode = $hostingNode->addChild('property'); | |||
| $propertyNode->addChild('name', $name); | |||
| $propertyNode->addChild('value', $value); | |||
| $propertyNode->addChild('value', htmlspecialchars($value)); | |||
There was a problem hiding this comment.
$propertyNode->name = $name;
$propertyNode->value = $value;
xgin
reviewed
Oct 5, 2021
xgin
reviewed
Oct 5, 2021
src/Api/Operator/Webspace.php
Outdated
| @@ -83,7 +83,7 @@ public function create(array $properties, array $hostingProperties = null, strin | |||
| foreach ($hostingProperties as $name => $value) { | |||
| $property = $infoHosting->addChild('property'); | |||
| $property->addChild('name', $name); | |||
| $property->addChild('value', $value); | |||
| $property->addChild('value', htmlspecialchars($value)); | |||
There was a problem hiding this comment.
$property->name = $name;
$property->value = $value;
xgin
reviewed
Oct 5, 2021
vdiomidov
force-pushed
the
bugfix-vdiomidov-simplexml-amprsant-fix-ppp-54497
branch
2 times, most recently
from
3631e26 to
443f9fa
Compare
xgin
reviewed
Oct 6, 2021
src/Api/Client.php
Outdated
| @@ -324,7 +324,7 @@ protected function _expandRequestShortSyntax($request, SimpleXMLElement $xml) | |||
|
|
|||
| foreach ($parts as $part) { | |||
| @list($name, $value) = explode('=', $part); | |||
| $node = $node->addChild($name, $value); | |||
| $node = $node->addChild($name, htmlspecialchars($value)); | |||
There was a problem hiding this comment.
the value here is always string (as the result of explode). you can use $node->{$name} = $value
vdiomidov
force-pushed
the
bugfix-vdiomidov-simplexml-amprsant-fix-ppp-54497
branch
from
657e96a to
a4e30a1
Compare
vdiomidov
changed the title
vdiomidov
force-pushed
the
bugfix-vdiomidov-simplexml-amprsant-fix-ppp-54497
branch
from
a4e30a1 to
c3328f4
Compare
vdiomidov
force-pushed
the
bugfix-vdiomidov-simplexml-amprsant-fix-ppp-54497
branch
from
813dbaa to
21ecea0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.