diff options
author | Mario Vavti <mario@mariovavti.com> | 2019-06-17 11:50:17 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2019-06-17 11:50:17 +0200 |
commit | c0b9ab930d716178df5f27dc92d91ef32f1e0f0a (patch) | |
tree | 833f99390ba2291b33907e41e6f31e4683f01253 /vendor/sabre/xml/lib | |
parent | f106b1db158ed2e8f620e046c3ca06b8584149e9 (diff) | |
download | volse-hubzilla-c0b9ab930d716178df5f27dc92d91ef32f1e0f0a.tar.gz volse-hubzilla-c0b9ab930d716178df5f27dc92d91ef32f1e0f0a.tar.bz2 volse-hubzilla-c0b9ab930d716178df5f27dc92d91ef32f1e0f0a.zip |
update composer libs
Diffstat (limited to 'vendor/sabre/xml/lib')
-rw-r--r-- | vendor/sabre/xml/lib/Deserializer/functions.php | 33 | ||||
-rw-r--r-- | vendor/sabre/xml/lib/Service.php | 3 |
2 files changed, 31 insertions, 5 deletions
diff --git a/vendor/sabre/xml/lib/Deserializer/functions.php b/vendor/sabre/xml/lib/Deserializer/functions.php index 2e5d877e9..07038d99a 100644 --- a/vendor/sabre/xml/lib/Deserializer/functions.php +++ b/vendor/sabre/xml/lib/Deserializer/functions.php @@ -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); diff --git a/vendor/sabre/xml/lib/Service.php b/vendor/sabre/xml/lib/Service.php index 09ee341cf..acea94ea9 100644 --- a/vendor/sabre/xml/lib/Service.php +++ b/vendor/sabre/xml/lib/Service.php @@ -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) { |