mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

PHP 7.2 consistency hack in xmlClass::xml2array()

Browse Source 
This is a workaround to make the output of xmlClass::xml2array() in PHP
7.2 equal to that of prior PHP versions.

Consider this fix to be a part 2 of #3026.

PHP 7.2 changed the behavior of how we extract tags from
SimpleXMLElement resources.  This hack adds a toleration for either the
PHP 7.2 behavior and the past behavior, which allows consistent parsing
of XML files.

One side effect of this change is the fixing of an innocuous bug that
provided blank values in some "@value" keys that should not have existed
in the first place.  This should hopefully have no practical effect on
current uses of the modified method.

Fixes: #3027
This commit is contained in:
Deltik
2018-02-05 09:28:57 -06:00
parent 499712f351
commit ee19eac05d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/xml_class.php
View File

@@ -561,16 +561,17 @@ class xmlClass
//loop through tags //loop through tags
foreach ($tags as $tag) foreach ($tags as $tag)
{ {
if(is_int($tag)) continue;
switch($tag) switch($tag)
{ {
case '@attributes': case '@attributes':
$tmp = (array) $xml->attributes(); $tmp = (array) $xml->attributes();
$ret['@attributes'] = $tmp['@attributes']; $ret['@attributes'] = $tmp['@attributes'];
if($count_tags == 1) //only attributes & possible value if($count_tags == 1 || ['@attributes', 0] === $tags) //only attributes & possible value
{ {
$ret[$this->_optValueKey] = trim((string) $xml); $ret[$this->_optValueKey] = trim((string) $xml);
return $ret; //return $ret;
} }
break; break;