Merge branch '7.2RC'7.2

20 files changed, 95 insertions, 395 deletions

diff --git a/vendor/sabre/xml/.github/workflows/ci.yml b/vendor/sabre/xml/.github/workflows/ci.yml
new file mode 100644
index 000000000..3473cd2de
--- /dev/null
+++ b/vendor/sabre/xml/.github/workflows/ci.yml
@@ -0,0 +1,63 @@
+name: continuous-integration
+on:
+  push:
+    branches:
+      - master
+      - release/*
+  pull_request:
+jobs:
+  unit-testing:
+    name: PHPUnit (PHP ${{ matrix.php-versions }})
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        coverage: ['pcov']
+        code-analysis: ['no']
+        include:
+          - php-versions: '7.1'
+            coverage: 'none'
+            code-analysis: 'yes'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, dom, fileinfo, mysql, redis, opcache
+          coverage: ${{ matrix.coverage }}
+          tools: composer
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          # Use composer.json for key, if composer.lock is not committed.
+          # key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install composer dependencies
+        run: composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Code Analysis (PHP CS-Fixer)
+        if: matrix.code-analysis == 'yes'
+        run: php vendor/bin/php-cs-fixer fix --dry-run --diff
+
+      - name: Code Analysis (PHPStan)
+        if: matrix.code-analysis == 'yes'
+        run: composer phpstan
+
+      - name: Test with phpunit
+        run: vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml
+
+      - name: Code Coverage
+        uses: codecov/codecov-action@v2
+        if: matrix.coverage != 'none'
diff --git a/vendor/sabre/xml/.gitignore b/vendor/sabre/xml/.gitignore
deleted file mode 100644
index 9715e9028..000000000
--- a/vendor/sabre/xml/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Composer
-vendor
-composer.lock
-
-# Tests
-tests/cov
-tests/.phpunit.result.cache
-.php_cs.cache
diff --git a/vendor/sabre/xml/.php_cs.dist b/vendor/sabre/xml/.php_cs.dist
deleted file mode 100644
index c5c78a971..000000000
--- a/vendor/sabre/xml/.php_cs.dist
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-$config = PhpCsFixer\Config::create();
-$config->getFinder()
-    ->exclude('vendor')
-    ->in(__DIR__);
-$config->setRules([
-    '@PSR1' => true,
-    '@Symfony' => true
-]);
-
-return $config;
\ No newline at end of file
diff --git a/vendor/sabre/xml/.travis.yml b/vendor/sabre/xml/.travis.yml
deleted file mode 100644
index fc4a98d8e..000000000
--- a/vendor/sabre/xml/.travis.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-language: php
-sudo: required
-php:
-  - 7.1
-  - 7.2
-  - 7.3
-  - 7.4
-
-env:
-  global:
-    - RUN_PHPCSFIXER="TRUE"
-    - RUN_PHPUNIT="TRUE"
-    - RUN_PHPSTAN="FALSE"
-  matrix:
-    - PREFER_LOWEST="" REPORT_COVERAGE="TRUE" WITH_COVERAGE="--coverage-clover=coverage.xml"
-    - PREFER_LOWEST="--prefer-lowest" REPORT_COVERAGE="FALSE" WITH_COVERAGE=""
-
-matrix:
-  include:
-    - name: 'PHP8'
-      dist: focal
-      php: nightly
-      env:
-        - RUN_PHPCSFIXER="FALSE"
-        - REPORT_COVERAGE="FALSE"
-    - name: 'PHPStan'
-      php: 7.4
-      env:
-        - RUN_PHPCSFIXER="FALSE"
-        - RUN_PHPUNIT="FALSE"
-        - RUN_PHPSTAN="TRUE"
-        - REPORT_COVERAGE="FALSE"
-  fast_finish: true
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-before_script:
-  - if [ $RUN_PHPCSFIXER == "FALSE" ]; then composer remove --dev friendsofphp/php-cs-fixer; fi
-  - composer update $PREFER_LOWEST
-
-script:
-  - if [ $RUN_PHPCSFIXER == "TRUE" ]; then php vendor/bin/php-cs-fixer fix --dry-run --diff; fi
-  - if [ $RUN_PHPUNIT == "TRUE" ]; then php vendor/bin/phpunit --configuration tests/phpunit.xml $WITH_COVERAGE; fi
-  - if [ $RUN_PHPSTAN == "TRUE" ]; then composer phpstan; fi
-
-after_success:
-  - if [ $REPORT_COVERAGE == "TRUE" ]; then bash <(curl -s https://codecov.io/bash); fi
diff --git a/vendor/sabre/xml/CHANGELOG.md b/vendor/sabre/xml/CHANGELOG.md
deleted file mode 100644
index cdd21fe51..000000000
--- a/vendor/sabre/xml/CHANGELOG.md
+++ /dev/null
@@ -1,287 +0,0 @@
-ChangeLog
-=========
-
-2.2.3 (2020-10-03)
-------------------
-* #191: add changelog and version bump that was missed in 2.2.2
-
-2.2.2 (2020-10-03)
-------------------
-* #190: adjust libxml_disable_entity_loader calls ready for PHP 8.0 (@phil-davis)
-
-2.2.1 (2020-05-11)
-------------------
-
-* #183: fixed warning 'xml cannot be empty while reading', which might lead to a infinite-loop (@mrow4a)
-* #179, #178, #177 #176: several build/continous integration related improvements (@phil-davis)
-
-2.2.0 (2020-01-31)
-------------------
-
-* #171: Added Support for PHP 7.4, dropped Support for PHP 7.0 (@staabm, @phil-davis)
-* #174: Update testsuite to phpunit8 (@phil-davis)
-* Added phpstan coverage (@phil-davis)
-* #144: Added a new `functionCaller` deserializer function for executing a callable when reading a XML
-element (@vsouz4)
-
-
-2.1.3 (2019-08-14)
-------------------
-
-* #166: Throw exception when empty inputs found
-
-
-2.1.2 (2019-01-09)
-------------------
-
-* #161: Prevent infinite loop on empty xml elements
-
-
-2.1.1 (2018-10-09)
-------------------
-
-* #149: Properly detect xml parse errors in `parseCurrentElement()` edge-cases
-
-
-2.1.0 (2018-02-08)
-------------------
-
-* #112: Added a `mixedContent` deserializer function, which might be useful
-  if you're parsing HTML-like documents with elements that contain both text
-  and other elements as siblings. (@staabm).
-
-
-2.0.0 (2016-11-15)
-------------------
-
-* Now requires PHP 7.
-* Uses typehints everywhere.
-* Fixed some minor strict typing-related issues.
-* Removed workaround for PHP bug [64230](https://bugs.php.net/bug.php?id=64230).
-
-
-1.5.0 (2016-10-09)
-------------------
-
-* Now requires PHP 5.5.
-* Using `finally` to always roll back the context stack when serializing.
-* #94: Fixed an infinite loop condition when reading some invalid XML
-  documents.
-
-
-1.4.2 (2016-05-19)
-------------------
-
-* The `contextStack` in the Reader object is now correctly rolled back in
-  error conditions (@staabm).
-* repeatingElements deserializer now still parses if a bare element name
-  without clark notation was given.
-* `$elementMap` in the Reader now also supports bare element names.
-* `Service::expect()` can now also work with bare element names.
-
-
-1.4.1 (2016-03-12)
------------------
-
-* Parsing clark-notation is now cached. This can speed up parsing large
-  documents with lots of repeating elements a fair bit. (@icewind1991).
-
-
-1.4.0 (2016-02-14)
-------------------
-
-* Any array thrown into the serializer with numeric keys is now simply
-  traversed and each individual item is serialized. This fixes an issue
-  related to serializing value objects with array children.
-* When serializing value objects, properties that have a null value or an
-  empty array are now skipped. We believe this to be the saner default, but
-  does constitute a BC break for those depending on this.
-* Serializing array properties in value objects was broken.
-
-
-1.3.0 (2015-12-29)
-------------------
-
-* The `Service` class adds a new `mapValueObject` method which provides basic
-  capabilities to map between ValueObjects and XML.
-* #61: You can now specify serializers for specific classes, allowing you
-  separate the object you want to serialize from the serializer. This uses the
-  `$classMap` property which is defined on both the `Service` and `Writer`.
-* It's now possible to pass an array of possible root elements to
-  `Sabre\Xml\Service::expect()`.
-* Moved some parsing logic to `Reader::getDeserializerForElementName()`,
-  so people with more advanced use-cases can implement their own logic there.
-* #63: When serializing elements using arrays, the `value` key in the array is
-  now optional.
-* #62: Added a `keyValue` deserializer function. This can be used instead of
-  the `Element\KeyValue` class and is a lot more flexible. (@staabm)
-* Also added an `enum` deserializer function to replace
-  `Element\Elements`.
-* Using an empty string for a namespace prefix now has the same effect as
-  `null`.
-
-
-1.2.0 (2015-08-30)
-------------------
-
-* #53: Added `parseGetElements`, a function like `parseInnerTree`, except
-  that it always returns an array of elements, or an empty array.
-
-
-1.1.0 (2015-06-29)
-------------------
-
-* #44, #45: Catching broken and invalid XML better and throwing
-  `Sabre\Xml\LibXMLException` whenever we encounter errors. (@stefanmajoor,
-   @DaanBiesterbos)
-
-
-1.0.0 (2015-05-25)
-------------------
-
-* No functional changes since 0.4.3. Marking it as 1.0.0 as a promise for
-  API stability.
-* Using php-cs-fixer for automated CS enforcement.
-
-
-0.4.3 (2015-04-01)
------------------
-
-* Minor tweaks for the public release.
-
-
-0.4.2 (2015-03-20)
-------------------
-
-* Removed `constants.php` again. They messed with PHPUnit and don't really
-  provide a great benefit.
-* #41: Correctly handle self-closing xml elements.
-
-
-0.4.1 (2015-03-19)
-------------------
-
-* #40: An element with an empty namespace (xmlns="") is not allowed to have a
-  prefix. This is now fixed.
-
-
-0.4.0 (2015-03-18)
-------------------
-
-* Added `Sabre\Xml\Service`. This is intended as a simple way to centrally
-  configure xml applications and easily parse/write things from there. #35, #38.
-* Renamed 'baseUri' to 'contextUri' everywhere.
-* #36: Added a few convenience constants to `lib/constants.php`.
-* `Sabre\Xml\Util::parseClarkNotation` is now in the `Sabre\Xml\Service` class.
-
-
-0.3.1 (2015-02-08)
-------------------
-
-* Added `XmlDeserializable` to match `XmlSerializable`.
-
-
-0.3.0 (2015-02-06)
-------------------
-
-* Added `$elementMap` argument to parseInnerTree, for quickly overriding
-  parsing rules within an element.
-
-
-0.2.2 (2015-02-05)
-------------------
-
-* Now depends on sabre/uri 1.0.
-
-
-0.2.1 (2014-12-17)
-------------------
-
-* LibXMLException now inherits from ParseException, so it's easy for users to
-  catch any exception thrown by the parser.
-
-
-0.2.0 (2014-12-05)
-------------------
-
-* Major BC Break: method names for the Element interface have been renamed
-  from `serializeXml` and `deserializeXml` to `xmlSerialize` and
-  `xmlDeserialize`. This is so that it matches PHP's `JsonSerializable`
-  interface.
-* #25: Added `XmlSerializable` to allow people to write serializers without
-  having to implement a deserializer in the same class.
-* #26: Renamed the `Sabre\XML` namespace to `Sabre\Xml`. Due to composer magic
-  and the fact that PHP namespace are case-insensitive, this should not affect
-  anyone, unless you are doing exact string matches on class names.
-* #23: It's not possible to automatically extract or serialize Xml fragments
-  from documents using `Sabre\Xml\Element\XmlFragment`.
-
-
-0.1.0 (2014-11-24)
-------------------
-
-* #16: Added ability to override `elementMap`, `namespaceMap` and `baseUri` for
-  a fragment of a document during reading an writing using `pushContext` and
-  `popContext`.
-* Removed: `Writer::$context` and `Reader::$context`.
-* #15: Added `Reader::$baseUri` to match `Writer::$baseUri`.
-* #20: Allow callbacks to be used instead of `Element` classes in the `Reader`.
-* #25: Added `readText` to quickly grab all text from a node and advance the
-  reader to the next node.
-* #15: Added `Sabre\XML\Element\Uri`.
-
-
-0.0.6 (2014-09-26)
-------------------
-
-* Added: `CData` element.
-* #13: Better support for xml with no namespaces. (@kalmas)
-* Switched to PSR-4 directory structure.
-
-
-0.0.5 (2013-03-27)
-------------------
-
-* Added: baseUri property to the Writer class.
-* Added: The writeElement method can now write complex elements.
-* Added: Throwing exception when invalid objects are written.
-
-
-0.0.4 (2013-03-14)
-------------------
-
-* Fixed: The KeyValue parser was skipping over elements when there was no
-  whitespace between them.
-* Fixed: Clearing libxml errors after parsing.
-* Added: Support for CDATA.
-* Added: Context properties.
-
-
-0.0.3 (2013-02-22)
-------------------
-
-* Changed: Reader::parse returns an array with 1 level less depth.
-* Added: A LibXMLException is now thrown if the XMLReader comes across an error.
-* Fixed: Both the Elements and KeyValue parsers had severe issues with
-  nesting.
-* Fixed: The reader now detects when the end of the document is hit before it
-  should (because we're still parsing an element).
-
-
-0.0.2 (2013-02-17)
-------------------
-
-* Added: Elements parser.
-* Added: KeyValue parser.
-* Change: Reader::parseSubTree is now named parseInnerTree, and returns either
-  a string (in case of a text-node), or an array (in case there were child
-  elements).
-* Added: Reader::parseCurrentElement is now public.
-
-
-0.0.1 (2013-02-07)
-------------------
-
-* First alpha release
-
-Project started: 2012-11-13. First experiments in June 2009.
diff --git a/vendor/sabre/xml/composer.json b/vendor/sabre/xml/composer.json
index b54cf195b..4524cf59b 100644
--- a/vendor/sabre/xml/composer.json
+++ b/vendor/sabre/xml/composer.json
@@ -44,7 +44,7 @@
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.16.1",
+        "friendsofphp/php-cs-fixer": "~2.17.1",
         "phpstan/phpstan": "^0.12",
         "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0"
     },
diff --git a/vendor/sabre/xml/lib/ContextStackTrait.php b/vendor/sabre/xml/lib/ContextStackTrait.php
index 757088847..4e15bd414 100644
--- a/vendor/sabre/xml/lib/ContextStackTrait.php
+++ b/vendor/sabre/xml/lib/ContextStackTrait.php
@@ -10,7 +10,7 @@ namespace Sabre\Xml;
  * The Context maintains information about a document during either reading or
  * writing.
  *
- * During this process, it may be neccesary to override this context
+ * During this process, it may be necessary to override this context
  * information.
  *
  * This trait allows easy access to the context, and allows the end-user to
diff --git a/vendor/sabre/xml/lib/Element/Base.php b/vendor/sabre/xml/lib/Element/Base.php
index a1ce7ea5a..8a93191b1 100644
--- a/vendor/sabre/xml/lib/Element/Base.php
+++ b/vendor/sabre/xml/lib/Element/Base.php
@@ -35,7 +35,7 @@ class Base implements Xml\Element
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
@@ -58,7 +58,7 @@ class Base implements Xml\Element
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/xml/lib/Element/Cdata.php b/vendor/sabre/xml/lib/Element/Cdata.php
index 61d3213ff..1367343ff 100644
--- a/vendor/sabre/xml/lib/Element/Cdata.php
+++ b/vendor/sabre/xml/lib/Element/Cdata.php
@@ -12,7 +12,7 @@ use Sabre\Xml;
  * This element allows you to easily inject CDATA.
  *
  * Note that we strongly recommend avoiding CDATA nodes, unless you definitely
- * know what you're doing, or you're working with unchangable systems that
+ * know what you're doing, or you're working with unchangeable systems that
  * require CDATA.
  *
  * @copyright Copyright (C) 2009-2015 fruux GmbH (https://fruux.com/).
@@ -37,12 +37,12 @@ class Cdata implements Xml\XmlSerializable
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/xml/lib/Element/Elements.php b/vendor/sabre/xml/lib/Element/Elements.php
index e51179833..fecce4c75 100644
--- a/vendor/sabre/xml/lib/Element/Elements.php
+++ b/vendor/sabre/xml/lib/Element/Elements.php
@@ -53,12 +53,12 @@ class Elements implements Xml\Element
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -76,7 +76,7 @@ class Elements implements Xml\Element
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/xml/lib/Element/KeyValue.php b/vendor/sabre/xml/lib/Element/KeyValue.php
index dacee000a..17448880d 100644
--- a/vendor/sabre/xml/lib/Element/KeyValue.php
+++ b/vendor/sabre/xml/lib/Element/KeyValue.php
@@ -53,12 +53,12 @@ class KeyValue implements Xml\Element
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -76,7 +76,7 @@ class KeyValue implements Xml\Element
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called staticly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/xml/lib/Element/Uri.php b/vendor/sabre/xml/lib/Element/Uri.php
index 2644fbcd7..336212a53 100644
--- a/vendor/sabre/xml/lib/Element/Uri.php
+++ b/vendor/sabre/xml/lib/Element/Uri.php
@@ -42,12 +42,12 @@ class Uri implements Xml\Element
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/xml/lib/Element/XmlFragment.php b/vendor/sabre/xml/lib/Element/XmlFragment.php
index 12109e5c9..bf110eaee 100644
--- a/vendor/sabre/xml/lib/Element/XmlFragment.php
+++ b/vendor/sabre/xml/lib/Element/XmlFragment.php
@@ -48,12 +48,12 @@ class XmlFragment implements Element
     }
 
     /**
-     * The xmlSerialize metod is called during xml writing.
+     * The xmlSerialize method is called during xml writing.
      *
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
@@ -121,7 +121,7 @@ XML;
     /**
      * The deserialize method is called during xml parsing.
      *
-     * This method is called statictly, this is because in theory this method
+     * This method is called statically, this is because in theory this method
      * may be used as a type of constructor, or factory method.
      *
      * Often you want to return an instance of the current class, but you are
diff --git a/vendor/sabre/xml/lib/LibXMLException.php b/vendor/sabre/xml/lib/LibXMLException.php
index ae136f57b..fb074f97d 100644
--- a/vendor/sabre/xml/lib/LibXMLException.php
+++ b/vendor/sabre/xml/lib/LibXMLException.php
@@ -8,7 +8,7 @@ use LibXMLError;
 use Throwable;
 
 /**
- * This exception is thrown when the Readers runs into a parsing error.
+ * This exception is thrown when the Reader runs into a parsing error.
  *
  * This exception effectively wraps 1 or more LibXMLError objects.
  *
diff --git a/vendor/sabre/xml/lib/ParseException.php b/vendor/sabre/xml/lib/ParseException.php
index 5980b5fc4..e237b8732 100644
--- a/vendor/sabre/xml/lib/ParseException.php
+++ b/vendor/sabre/xml/lib/ParseException.php
@@ -4,8 +4,7 @@ declare(strict_types=1);
 
 namespace Sabre\Xml;
 
-use
-    Exception;
+use Exception;
 
 /**
  * This is a base exception for any exception related to parsing xml files.
diff --git a/vendor/sabre/xml/lib/Reader.php b/vendor/sabre/xml/lib/Reader.php
index 368e8ffd2..7871a74f5 100644
--- a/vendor/sabre/xml/lib/Reader.php
+++ b/vendor/sabre/xml/lib/Reader.php
@@ -56,7 +56,7 @@ class Reader extends XMLReader
     public function parse(): array
     {
         $previousEntityState = null;
-        $shouldCallLibxmlDisableEntityLoader = (\PHP_VERSION_ID < 80000);
+        $shouldCallLibxmlDisableEntityLoader = (\LIBXML_VERSION < 20900);
         if ($shouldCallLibxmlDisableEntityLoader) {
             $previousEntityState = libxml_disable_entity_loader(true);
         }
@@ -92,11 +92,11 @@ class Reader extends XMLReader
 
     /**
      * parseGetElements parses everything in the current sub-tree,
-     * and returns a an array of elements.
+     * and returns an array of elements.
      *
      * Each element has a 'name', 'value' and 'attributes' key.
      *
-     * If the the element didn't contain sub-elements, an empty array is always
+     * If the element didn't contain sub-elements, an empty array is always
      * returned. If there was any text inside the element, it will be
      * discarded.
      *
@@ -249,7 +249,7 @@ class Reader extends XMLReader
      *
      * If the attributes are part of the same namespace, they will simply be
      * short keys. If they are defined on a different namespace, the attribute
-     * name will be retured in clark-notation.
+     * name will be returned in clark-notation.
      */
     public function parseAttributes(): array
     {
@@ -275,7 +275,7 @@ class Reader extends XMLReader
 
     /**
      * Returns the function that should be used to parse the element identified
-     * by it's clark-notation name.
+     * by its clark-notation name.
      */
     public function getDeserializerForElementName(string $name): callable
     {
diff --git a/vendor/sabre/xml/lib/Service.php b/vendor/sabre/xml/lib/Service.php
index 596c93cc4..a8e34d254 100644
--- a/vendor/sabre/xml/lib/Service.php
+++ b/vendor/sabre/xml/lib/Service.php
@@ -7,7 +7,7 @@ namespace Sabre\Xml;
 /**
  * XML parsing and writing service.
  *
- * You are encouraged to make a instance of this for your application and
+ * You are encouraged to make an instance of this for your application and
  * potentially extend it, as a central API point for dealing with xml and
  * configuring the reader and writer.
  *
@@ -117,7 +117,7 @@ class Service
             $input = (string) stream_get_contents($input);
         }
 
-        // If input is empty, then its safe to throw exception
+        // If input is empty, then it's safe to throw an exception
         if (empty($input)) {
             throw new ParseException('The input element to parse is empty. Do not attempt to parse');
         }
@@ -161,7 +161,7 @@ class Service
             $input = (string) stream_get_contents($input);
         }
 
-        // If input is empty, then its safe to throw exception
+        // If input is empty, then it's safe to throw an exception
         if (empty($input)) {
             throw new ParseException('The input element to parse is empty. Do not attempt to parse');
         }
@@ -217,9 +217,9 @@ class Service
     }
 
     /**
-     * Map an xml element to a PHP class.
+     * Map an XML element to a PHP class.
      *
-     * Calling this function will automatically setup the Reader and Writer
+     * Calling this function will automatically set up the Reader and Writer
      * classes to turn a specific XML element to a PHP class.
      *
      * For example, given a class such as :
diff --git a/vendor/sabre/xml/lib/Version.php b/vendor/sabre/xml/lib/Version.php
index d4e465de9..1144bf085 100644
--- a/vendor/sabre/xml/lib/Version.php
+++ b/vendor/sabre/xml/lib/Version.php
@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '2.2.3';
+    const VERSION = '2.2.5';
 }
diff --git a/vendor/sabre/xml/lib/XmlSerializable.php b/vendor/sabre/xml/lib/XmlSerializable.php
index b22f8d5e8..2affc33f1 100644
--- a/vendor/sabre/xml/lib/XmlSerializable.php
+++ b/vendor/sabre/xml/lib/XmlSerializable.php
@@ -20,7 +20,7 @@ interface XmlSerializable
      * Use the $writer argument to write its own xml serialization.
      *
      * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializble should only ever write what's considered
+     * implementing XmlSerializable should only ever write what's considered
      * its 'inner xml'.
      *
      * The parent of the current element is responsible for writing a
diff --git a/vendor/sabre/xml/phpstan.neon b/vendor/sabre/xml/phpstan.neon
deleted file mode 100644
index d6dd4e577..000000000
--- a/vendor/sabre/xml/phpstan.neon
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-  level: 5
-  ignoreErrors:
-    -
-      message: '!Parameter #3 \$uri of method XMLWriter::startElementNs\(\) expects string, null given.!'
-      path: lib/Writer.php