another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)

6 files changed, 74 insertions, 77 deletions

diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php b/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php
index c315a9a45..8d9348162 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/Lock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Xml\Request;
 
 use Sabre\DAV\Locks\LockInfo;
@@ -18,10 +20,10 @@ use Sabre\Xml\XmlDeserializable;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Lock implements XmlDeserializable {
-
+class Lock implements XmlDeserializable
+{
     /**
-     * Owner of the lock
+     * Owner of the lock.
      *
      * @var string
      */
@@ -31,6 +33,7 @@ class Lock implements XmlDeserializable {
      * Scope of the lock.
      *
      * Either LockInfo::SHARED or LockInfo::EXCLUSIVE
+     *
      * @var int
      */
     public $scope;
@@ -54,10 +57,11 @@ class Lock implements XmlDeserializable {
      * the next element.
      *
      * @param Reader $reader
+     *
      * @return mixed
      */
-    static function xmlDeserialize(Reader $reader) {
-
+    public static function xmlDeserialize(Reader $reader)
+    {
         $reader->pushContext();
         $reader->elementMap['{DAV:}owner'] = 'Sabre\\Xml\\Element\\XmlFragment';
 
@@ -71,11 +75,12 @@ class Lock implements XmlDeserializable {
 
         if (isset($values['{DAV:}lockscope'])) {
             foreach ($values['{DAV:}lockscope'] as $elem) {
-                if ($elem['name'] === '{DAV:}exclusive') $new->scope = LockInfo::EXCLUSIVE;
+                if ('{DAV:}exclusive' === $elem['name']) {
+                    $new->scope = LockInfo::EXCLUSIVE;
+                }
             }
         }
-        return $new;
 
+        return $new;
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php b/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php
index 9490bf58c..7713646ea 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/MkCol.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Xml\Request;
 
 use Sabre\Xml\Reader;
@@ -16,8 +18,8 @@ use Sabre\Xml\XmlDeserializable;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class MkCol implements XmlDeserializable {
-
+class MkCol implements XmlDeserializable
+{
     /**
      * The list of properties that will be set.
      *
@@ -31,10 +33,9 @@ class MkCol implements XmlDeserializable {
      *
      * @return array
      */
-    function getProperties() {
-
+    public function getProperties()
+    {
         return $this->properties;
-
     }
 
     /**
@@ -56,10 +57,11 @@ class MkCol implements XmlDeserializable {
      * the next element.
      *
      * @param Reader $reader
+     *
      * @return mixed
      */
-    static function xmlDeserialize(Reader $reader) {
-
+    public static function xmlDeserialize(Reader $reader)
+    {
         $self = new self();
 
         $elementMap = $reader->elementMap;
@@ -70,13 +72,11 @@ class MkCol implements XmlDeserializable {
         $elems = $reader->parseInnerTree($elementMap);
 
         foreach ($elems as $elem) {
-            if ($elem['name'] === '{DAV:}set') {
+            if ('{DAV:}set' === $elem['name']) {
                 $self->properties = array_merge($self->properties, $elem['value']['{DAV:}prop']);
             }
         }
 
         return $self;
-
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php b/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php
index f1b5b6fdc..b4cce423e 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/PropFind.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Xml\Request;
 
 use Sabre\Xml\Element\KeyValue;
@@ -17,8 +19,8 @@ use Sabre\Xml\XmlDeserializable;
  * @author Evert Pot (http://www.rooftopsolutions.nl/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class PropFind implements XmlDeserializable {
-
+class PropFind implements XmlDeserializable
+{
     /**
      * If this is set to true, this was an 'allprop' request.
      *
@@ -27,9 +29,9 @@ class PropFind implements XmlDeserializable {
     public $allProp = false;
 
     /**
-     * The property list
+     * The property list.
      *
-     * @var null|array
+     * @var array|null
      */
     public $properties;
 
@@ -52,32 +54,28 @@ class PropFind implements XmlDeserializable {
      * the next element.
      *
      * @param Reader $reader
+     *
      * @return mixed
      */
-    static function xmlDeserialize(Reader $reader) {
-
+    public static function xmlDeserialize(Reader $reader)
+    {
         $self = new self();
 
         $reader->pushContext();
         $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Element\Elements';
 
         foreach (KeyValue::xmlDeserialize($reader) as $k => $v) {
-
             switch ($k) {
-                case '{DAV:}prop' :
+                case '{DAV:}prop':
                     $self->properties = $v;
                     break;
-                case '{DAV:}allprop' :
+                case '{DAV:}allprop':
                     $self->allProp = true;
-
             }
-
         }
 
         $reader->popContext();
 
         return $self;
-
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php b/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php
index 821b9e047..55e154ec7 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/PropPatch.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Xml\Request;
 
 use Sabre\Xml\Element;
@@ -17,8 +19,8 @@ use Sabre\Xml\Writer;
  * @author Evert Pot (http://www.rooftopsolutions.nl/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class PropPatch implements Element {
-
+class PropPatch implements Element
+{
     /**
      * The list of properties that will be updated and removed.
      *
@@ -45,24 +47,20 @@ class PropPatch implements Element {
      * If you are opening new elements, you must also close them again.
      *
      * @param Writer $writer
-     * @return void
      */
-    function xmlSerialize(Writer $writer) {
-
+    public function xmlSerialize(Writer $writer)
+    {
         foreach ($this->properties as $propertyName => $propertyValue) {
-
             if (is_null($propertyValue)) {
-                $writer->startElement("{DAV:}remove");
+                $writer->startElement('{DAV:}remove');
                 $writer->write(['{DAV:}prop' => [$propertyName => $propertyValue]]);
                 $writer->endElement();
             } else {
-                $writer->startElement("{DAV:}set");
+                $writer->startElement('{DAV:}set');
                 $writer->write(['{DAV:}prop' => [$propertyName => $propertyValue]]);
                 $writer->endElement();
             }
-
         }
-
     }
 
     /**
@@ -84,10 +82,11 @@ class PropPatch implements Element {
      * the next element.
      *
      * @param Reader $reader
+     *
      * @return mixed
      */
-    static function xmlDeserialize(Reader $reader) {
-
+    public static function xmlDeserialize(Reader $reader)
+    {
         $self = new self();
 
         $elementMap = $reader->elementMap;
@@ -98,21 +97,17 @@ class PropPatch implements Element {
         $elems = $reader->parseInnerTree($elementMap);
 
         foreach ($elems as $elem) {
-            if ($elem['name'] === '{DAV:}set') {
+            if ('{DAV:}set' === $elem['name']) {
                 $self->properties = array_merge($self->properties, $elem['value']['{DAV:}prop']);
             }
-            if ($elem['name'] === '{DAV:}remove') {
-
+            if ('{DAV:}remove' === $elem['name']) {
                 // Ensuring there are no values.
                 foreach ($elem['value']['{DAV:}prop'] as $remove => $value) {
                     $self->properties[$remove] = null;
                 }
-
             }
         }
 
         return $self;
-
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php b/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
index 526a4eb6f..e1985b8c3 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Xml\Request;
 
 use Sabre\DAV\Xml\Element\Sharee;
@@ -17,8 +19,8 @@ use Sabre\Xml\XmlDeserializable;
  * @author Evert Pot (http://www.rooftopsolutions.nl/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class ShareResource implements XmlDeserializable {
-
+class ShareResource implements XmlDeserializable
+{
     /**
      * The list of new people added or updated or removed from the share.
      *
@@ -27,14 +29,13 @@ class ShareResource implements XmlDeserializable {
     public $sharees = [];
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param Sharee[] $sharees
      */
-    function __construct(array $sharees) {
-
+    public function __construct(array $sharees)
+    {
         $this->sharees = $sharees;
-
     }
 
     /**
@@ -56,26 +57,26 @@ class ShareResource implements XmlDeserializable {
      * the next element.
      *
      * @param Reader $reader
+     *
      * @return mixed
      */
-    static function xmlDeserialize(Reader $reader) {
-
+    public static function xmlDeserialize(Reader $reader)
+    {
         $elems = $reader->parseInnerTree([
-            '{DAV:}sharee'       => 'Sabre\DAV\Xml\Element\Sharee',
+            '{DAV:}sharee' => 'Sabre\DAV\Xml\Element\Sharee',
             '{DAV:}share-access' => 'Sabre\DAV\Xml\Property\ShareAccess',
-            '{DAV:}prop'         => 'Sabre\Xml\Deserializer\keyValue',
+            '{DAV:}prop' => 'Sabre\Xml\Deserializer\keyValue',
         ]);
 
         $sharees = [];
 
         foreach ($elems as $elem) {
-            if ($elem['name'] !== '{DAV:}sharee') continue;
+            if ('{DAV:}sharee' !== $elem['name']) {
+                continue;
+            }
             $sharees[] = $elem['value'];
-
         }
 
         return new self($sharees);
-
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php b/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php
index 830293a01..acf0039ce 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Xml\Request;
 
 use Sabre\DAV\Exception\BadRequest;
@@ -18,8 +20,8 @@ use Sabre\Xml\XmlDeserializable;
  * @author Evert Pot (http://www.rooftopsolutions.nl/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class SyncCollectionReport implements XmlDeserializable {
-
+class SyncCollectionReport implements XmlDeserializable
+{
     /**
      * The sync-token the client supplied for the report.
      *
@@ -44,7 +46,7 @@ class SyncCollectionReport implements XmlDeserializable {
     /**
      * The list of properties that are being requested for every change.
      *
-     * @var null|array
+     * @var array|null
      */
     public $properties;
 
@@ -67,10 +69,11 @@ class SyncCollectionReport implements XmlDeserializable {
      * the next element.
      *
      * @param Reader $reader
+     *
      * @return mixed
      */
-    static function xmlDeserialize(Reader $reader) {
-
+    public static function xmlDeserialize(Reader $reader)
+    {
         $self = new self();
 
         $reader->pushContext();
@@ -87,36 +90,31 @@ class SyncCollectionReport implements XmlDeserializable {
 
         foreach ($required as $elem) {
             if (!array_key_exists($elem, $elems)) {
-                throw new BadRequest('The ' . $elem . ' element in the {DAV:}sync-collection report is required');
+                throw new BadRequest('The '.$elem.' element in the {DAV:}sync-collection report is required');
             }
         }
 
-
         $self->properties = $elems['{DAV:}prop'];
         $self->syncToken = $elems['{DAV:}sync-token'];
 
         if (isset($elems['{DAV:}limit'])) {
             $nresults = null;
             foreach ($elems['{DAV:}limit'] as $child) {
-                if ($child['name'] === '{DAV:}nresults') {
-                    $nresults = (int)$child['value'];
+                if ('{DAV:}nresults' === $child['name']) {
+                    $nresults = (int) $child['value'];
                 }
             }
             $self->limit = $nresults;
         }
 
         if (isset($elems['{DAV:}sync-level'])) {
-
             $value = $elems['{DAV:}sync-level'];
-            if ($value === 'infinity') {
+            if ('infinity' === $value) {
                 $value = \Sabre\DAV\Server::DEPTH_INFINITY;
             }
             $self->syncLevel = $value;
-
         }
 
         return $self;
-
     }
-
 }