update composer libs

This commit is contained in:
Mario Vavti
2019-06-17 11:50:17 +02:00
parent f106b1db15
commit c0b9ab930d
9 changed files with 125 additions and 87 deletions

View File

@@ -1,6 +1,12 @@
ChangeLog
=========
1.5.1 (2019-01-09)
------------------
* #161: Prevent infinite loop on empty xml elements
1.5.0 (2016-10-09)
------------------

View File

@@ -45,7 +45,7 @@
},
"require-dev": {
"sabre/cs": "~1.0.0",
"phpunit/phpunit" : "*"
"phpunit/phpunit" : "~4.8|~5.7"
},
"config" : {
"bin-dir" : "bin/"

View File

@@ -66,9 +66,20 @@ function keyValue(Reader $reader, $namespace = null) {
return [];
}
if (!$reader->read()) {
$reader->next();
return [];
}
if (Reader::END_ELEMENT === $reader->nodeType) {
$reader->next();
return [];
}
$values = [];
$reader->read();
do {
if ($reader->nodeType === Reader::ELEMENT) {
@@ -79,7 +90,9 @@ function keyValue(Reader $reader, $namespace = null) {
$values[$clark] = $reader->parseCurrentElement()['value'];
}
} else {
$reader->read();
if (!$reader->read()) {
break;
}
}
} while ($reader->nodeType !== Reader::END_ELEMENT);
@@ -144,7 +157,17 @@ function enum(Reader $reader, $namespace = null) {
$reader->next();
return [];
}
$reader->read();
if (!$reader->read()) {
$reader->next();
return [];
}
if (Reader::END_ELEMENT === $reader->nodeType) {
$reader->next();
return [];
}
$currentDepth = $reader->depth;
$values = [];
@@ -204,7 +227,9 @@ function valueObject(Reader $reader, $className, $namespace) {
$reader->next();
}
} else {
$reader->read();
if (!$reader->read()) {
break;
}
}
} while ($reader->nodeType !== Reader::END_ELEMENT);

View File

@@ -138,7 +138,8 @@ class Service {
* @param string|string[] $rootElementName
* @param string|resource $input
* @param string|null $contextUri
* @return void
* @throws ParseException
* @return array|object|string
*/
function expect($rootElementName, $input, $contextUri = null) {