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) {