aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/xml
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-04-25 11:24:09 +0200
committerMario <mario@mariovavti.com>2019-04-25 11:24:09 +0200
commitf1c07977809ce3221286d53e99f0d91145b1166f (patch)
tree4c067a3b701ea56f10070c386b26a30f93666eb0 /vendor/sabre/xml
parent701167bc125700efb3e6ce759b85bcb4d36ee42e (diff)
downloadvolse-hubzilla-f1c07977809ce3221286d53e99f0d91145b1166f.tar.gz
volse-hubzilla-f1c07977809ce3221286d53e99f0d91145b1166f.tar.bz2
volse-hubzilla-f1c07977809ce3221286d53e99f0d91145b1166f.zip
Revert "update composer libs"
This reverts commit e779335d060b3a51d6a144d23af4097ae6801473
Diffstat (limited to 'vendor/sabre/xml')
-rw-r--r--vendor/sabre/xml/CHANGELOG.md6
-rw-r--r--vendor/sabre/xml/composer.json2
-rw-r--r--vendor/sabre/xml/lib/Deserializer/functions.php33
-rw-r--r--vendor/sabre/xml/lib/Service.php3
4 files changed, 6 insertions, 38 deletions
diff --git a/vendor/sabre/xml/CHANGELOG.md b/vendor/sabre/xml/CHANGELOG.md
index faeba20e5..39a39bffe 100644
--- a/vendor/sabre/xml/CHANGELOG.md
+++ b/vendor/sabre/xml/CHANGELOG.md
@@ -1,12 +1,6 @@
ChangeLog
=========
-1.5.1 (2019-01-09)
-------------------
-
-* #161: Prevent infinite loop on empty xml elements
-
-
1.5.0 (2016-10-09)
------------------
diff --git a/vendor/sabre/xml/composer.json b/vendor/sabre/xml/composer.json
index 1b5760393..386f8213f 100644
--- a/vendor/sabre/xml/composer.json
+++ b/vendor/sabre/xml/composer.json
@@ -45,7 +45,7 @@
},
"require-dev": {
"sabre/cs": "~1.0.0",
- "phpunit/phpunit" : "~4.8|~5.7"
+ "phpunit/phpunit" : "*"
},
"config" : {
"bin-dir" : "bin/"
diff --git a/vendor/sabre/xml/lib/Deserializer/functions.php b/vendor/sabre/xml/lib/Deserializer/functions.php
index 07038d99a..2e5d877e9 100644
--- a/vendor/sabre/xml/lib/Deserializer/functions.php
+++ b/vendor/sabre/xml/lib/Deserializer/functions.php
@@ -66,20 +66,9 @@ 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) {
@@ -90,9 +79,7 @@ function keyValue(Reader $reader, $namespace = null) {
$values[$clark] = $reader->parseCurrentElement()['value'];
}
} else {
- if (!$reader->read()) {
- break;
- }
+ $reader->read();
}
} while ($reader->nodeType !== Reader::END_ELEMENT);
@@ -157,17 +144,7 @@ function enum(Reader $reader, $namespace = null) {
$reader->next();
return [];
}
- if (!$reader->read()) {
- $reader->next();
-
- return [];
- }
-
- if (Reader::END_ELEMENT === $reader->nodeType) {
- $reader->next();
-
- return [];
- }
+ $reader->read();
$currentDepth = $reader->depth;
$values = [];
@@ -227,9 +204,7 @@ function valueObject(Reader $reader, $className, $namespace) {
$reader->next();
}
} else {
- if (!$reader->read()) {
- break;
- }
+ $reader->read();
}
} while ($reader->nodeType !== Reader::END_ELEMENT);
diff --git a/vendor/sabre/xml/lib/Service.php b/vendor/sabre/xml/lib/Service.php
index acea94ea9..09ee341cf 100644
--- a/vendor/sabre/xml/lib/Service.php
+++ b/vendor/sabre/xml/lib/Service.php
@@ -138,8 +138,7 @@ class Service {
* @param string|string[] $rootElementName
* @param string|resource $input
* @param string|null $contextUri
- * @throws ParseException
- * @return array|object|string
+ * @return void
*/
function expect($rootElementName, $input, $contextUri = null) {