From fae70bf0a7f1b566d25e30064f60d58ab150951a Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 7 May 2020 23:35:02 +0200
Subject: Revert "composer updates"

This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00
---
 vendor/sabre/xml/lib/Service.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'vendor/sabre/xml/lib/Service.php')

diff --git a/vendor/sabre/xml/lib/Service.php b/vendor/sabre/xml/lib/Service.php
index 9a2c47794..882b2dc2c 100644
--- a/vendor/sabre/xml/lib/Service.php
+++ b/vendor/sabre/xml/lib/Service.php
@@ -60,13 +60,6 @@ class Service
      */
     public $classMap = [];
 
-    /**
-     * A bitmask of the LIBXML_* constants.
-     *
-     * @var int
-     */
-    public $options = 0;
-
     /**
      * Returns a fresh XML Reader.
      */
@@ -114,7 +107,7 @@ class Service
         if (is_resource($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
+            $input = stream_get_contents($input);
 
             // If input is an empty string, then its safe to throw exception
             if ('' === $input) {
@@ -123,7 +116,7 @@ class Service
         }
         $r = $this->getReader();
         $r->contextUri = $contextUri;
-        $r->XML($input, null, $this->options);
+        $r->xml($input);
 
         $result = $r->parse();
         $rootElementName = $result['name'];
@@ -147,6 +140,7 @@ class Service
      *
      * @param string|string[] $rootElementName
      * @param string|resource $input
+     * @param string|null     $contextUri
      *
      * @throws ParseException
      *
@@ -157,7 +151,7 @@ class Service
         if (is_resource($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
+            $input = stream_get_contents($input);
 
             // If input is empty string, then its safe to throw exception
             if ('' === $input) {
@@ -166,7 +160,7 @@ class Service
         }
         $r = $this->getReader();
         $r->contextUri = $contextUri;
-        $r->XML($input, null, $this->options);
+        $r->xml($input);
 
         $rootElementName = (array) $rootElementName;
 
@@ -178,7 +172,7 @@ class Service
 
         $result = $r->parse();
         if (!in_array($result['name'], $rootElementName, true)) {
-            throw new ParseException('Expected '.implode(' or ', $rootElementName).' but received '.$result['name'].' as the root element');
+            throw new ParseException('Expected '.implode(' or ', (array) $rootElementName).' but received '.$result['name'].' as the root element');
         }
 
         return $result['value'];
@@ -198,7 +192,7 @@ class Service
      * This allows an implementor to easily create URI's relative to the root
      * of the domain.
      *
-     * @param string|array|object|XmlSerializable $value
+     * @param string|array|XmlSerializable $value
      *
      * @return string
      */
-- 
cgit v1.2.3