From f1c07977809ce3221286d53e99f0d91145b1166f Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 25 Apr 2019 11:24:09 +0200 Subject: Revert "update composer libs" This reverts commit e779335d060b3a51d6a144d23af4097ae6801473 --- vendor/sabre/xml/lib/Deserializer/functions.php | 33 +++---------------------- vendor/sabre/xml/lib/Service.php | 3 +-- 2 files changed, 5 insertions(+), 31 deletions(-) (limited to 'vendor/sabre/xml/lib') 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) { -- cgit v1.2.3