another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)

2 files changed, 103 insertions, 104 deletions

diff --git a/vendor/sabre/dav/lib/DAV/FSExt/Directory.php b/vendor/sabre/dav/lib/DAV/FSExt/Directory.php
index dd5f992db..d6aea0094 100644
--- a/vendor/sabre/dav/lib/DAV/FSExt/Directory.php
+++ b/vendor/sabre/dav/lib/DAV/FSExt/Directory.php
@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\FSExt;
 
 use Sabre\DAV;
 use Sabre\DAV\FS\Node;
 
 /**
- * Directory class
+ * Directory class.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTarget {
-
+class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTarget
+{
     /**
-     * Creates a new file in the directory
+     * Creates a new file in the directory.
      *
      * Data will either be supplied as a stream resource, or in certain cases
      * as a string. Keep in mind that you may have to support either.
@@ -34,94 +36,97 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTa
      * return the same contents of what was submitted here, you are strongly
      * recommended to omit the ETag.
      *
-     * @param string $name Name of the file
+     * @param string          $name Name of the file
      * @param resource|string $data Initial payload
-     * @return null|string
+     *
+     * @return string|null
      */
-    function createFile($name, $data = null) {
-
+    public function createFile($name, $data = null)
+    {
         // We're not allowing dots
-        if ($name == '.' || $name == '..') throw new DAV\Exception\Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
+        if ('.' == $name || '..' == $name) {
+            throw new DAV\Exception\Forbidden('Permission denied to . and ..');
+        }
+        $newPath = $this->path.'/'.$name;
         file_put_contents($newPath, $data);
         clearstatcache(true, $newPath);
 
-        return '"' . sha1(
-            fileinode($newPath) .
-            filesize($newPath) .
+        return '"'.sha1(
+            fileinode($newPath).
+            filesize($newPath).
             filemtime($newPath)
-        ) . '"';
-
+        ).'"';
     }
 
     /**
-     * Creates a new subdirectory
+     * Creates a new subdirectory.
      *
      * @param string $name
-     * @return void
      */
-    function createDirectory($name) {
-
+    public function createDirectory($name)
+    {
         // We're not allowing dots
-        if ($name == '.' || $name == '..') throw new DAV\Exception\Forbidden('Permission denied to . and ..');
-        $newPath = $this->path . '/' . $name;
+        if ('.' == $name || '..' == $name) {
+            throw new DAV\Exception\Forbidden('Permission denied to . and ..');
+        }
+        $newPath = $this->path.'/'.$name;
         mkdir($newPath);
         clearstatcache(true, $newPath);
-
     }
 
     /**
-     * Returns a specific child node, referenced by its name
+     * Returns a specific child node, referenced by its name.
      *
      * This method must throw Sabre\DAV\Exception\NotFound if the node does not
      * exist.
      *
      * @param string $name
+     *
      * @throws DAV\Exception\NotFound
+     *
      * @return DAV\INode
      */
-    function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new DAV\Exception\NotFound('File could not be located');
-        if ($name == '.' || $name == '..') throw new DAV\Exception\Forbidden('Permission denied to . and ..');
+    public function getChild($name)
+    {
+        $path = $this->path.'/'.$name;
 
+        if (!file_exists($path)) {
+            throw new DAV\Exception\NotFound('File could not be located');
+        }
+        if ('.' == $name || '..' == $name) {
+            throw new DAV\Exception\Forbidden('Permission denied to . and ..');
+        }
         if (is_dir($path)) {
-
             return new self($path);
-
         } else {
-
             return new File($path);
-
         }
-
     }
 
     /**
      * Checks if a child exists.
      *
      * @param string $name
+     *
      * @return bool
      */
-    function childExists($name) {
-
-        if ($name == '.' || $name == '..')
+    public function childExists($name)
+    {
+        if ('.' == $name || '..' == $name) {
             throw new DAV\Exception\Forbidden('Permission denied to . and ..');
+        }
+        $path = $this->path.'/'.$name;
 
-        $path = $this->path . '/' . $name;
         return file_exists($path);
-
     }
 
     /**
-     * Returns an array with all the child nodes
+     * Returns an array with all the child nodes.
      *
      * @return DAV\INode[]
      */
-    function getChildren() {
-
+    public function getChildren()
+    {
         $nodes = [];
         $iterator = new \FilesystemIterator(
             $this->path,
@@ -130,44 +135,43 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTa
         );
 
         foreach ($iterator as $entry) {
-
             $nodes[] = $this->getChild($entry->getFilename());
-
         }
-        return $nodes;
 
+        return $nodes;
     }
 
     /**
-     * Deletes all files in this directory, and then itself
+     * Deletes all files in this directory, and then itself.
      *
      * @return bool
      */
-    function delete() {
-
+    public function delete()
+    {
         // Deleting all children
-        foreach ($this->getChildren() as $child) $child->delete();
+        foreach ($this->getChildren() as $child) {
+            $child->delete();
+        }
 
         // Removing the directory itself
         rmdir($this->path);
 
         return true;
-
     }
 
     /**
-     * Returns available diskspace information
+     * Returns available diskspace information.
      *
      * @return array
      */
-    function getQuotaInfo() {
-
+    public function getQuotaInfo()
+    {
         $total = disk_total_space(realpath($this->path));
         $free = disk_free_space(realpath($this->path));
 
         return [
             $total - $free,
-            $free
+            $free,
         ];
     }
 
@@ -186,13 +190,14 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTa
      * the move itself. If you return true from this function, the assumption
      * is that the move was successful.
      *
-     * @param string $targetName New local file/collection name.
-     * @param string $sourcePath Full path to source node
+     * @param string    $targetName new local file/collection name
+     * @param string    $sourcePath Full path to source node
      * @param DAV\INode $sourceNode Source node itself
+     *
      * @return bool
      */
-    function moveInto($targetName, $sourcePath, DAV\INode $sourceNode) {
-
+    public function moveInto($targetName, $sourcePath, DAV\INode $sourceNode)
+    {
         // We only support FSExt\Directory or FSExt\File objects, so
         // anything else we want to quickly reject.
         if (!$sourceNode instanceof self && !$sourceNode instanceof File) {
@@ -200,12 +205,8 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTa
         }
 
         // PHP allows us to access protected properties from other objects, as
-        // long as they are defined in a class that has a shared inheritence
+        // long as they are defined in a class that has a shared inheritance
         // with the current class.
-        rename($sourceNode->path, $this->path . '/' . $targetName);
-
-        return true;
-
+        return rename($sourceNode->path, $this->path.'/'.$targetName);
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAV/FSExt/File.php b/vendor/sabre/dav/lib/DAV/FSExt/File.php
index eb5ae19fe..060ef5a48 100644
--- a/vendor/sabre/dav/lib/DAV/FSExt/File.php
+++ b/vendor/sabre/dav/lib/DAV/FSExt/File.php
@@ -1,33 +1,36 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\FSExt;
 
 use Sabre\DAV;
 use Sabre\DAV\FS\Node;
 
 /**
- * File class
+ * File class.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class File extends Node implements DAV\PartialUpdate\IPatchSupport {
-
+class File extends Node implements DAV\PartialUpdate\IPatchSupport
+{
     /**
-     * Updates the data
+     * Updates the data.
      *
      * Data is a readable stream resource.
      *
      * @param resource|string $data
+     *
      * @return string
      */
-    function put($data) {
-
+    public function put($data)
+    {
         file_put_contents($this->path, $data);
         clearstatcache(true, $this->path);
-        return $this->getETag();
 
+        return $this->getETag();
     }
 
     /**
@@ -53,21 +56,22 @@ class File extends Node implements DAV\PartialUpdate\IPatchSupport {
      * time.
      *
      * @param resource|string $data
-     * @param int $rangeType
-     * @param int $offset
+     * @param int             $rangeType
+     * @param int             $offset
+     *
      * @return string|null
      */
-    function patch($data, $rangeType, $offset = null) {
-
+    public function patch($data, $rangeType, $offset = null)
+    {
         switch ($rangeType) {
-            case 1 :
+            case 1:
                 $f = fopen($this->path, 'a');
                 break;
-            case 2 :
+            case 2:
                 $f = fopen($this->path, 'c');
                 fseek($f, $offset);
                 break;
-            case 3 :
+            case 3:
                 $f = fopen($this->path, 'c');
                 fseek($f, $offset, SEEK_END);
                 break;
@@ -79,34 +83,32 @@ class File extends Node implements DAV\PartialUpdate\IPatchSupport {
         }
         fclose($f);
         clearstatcache(true, $this->path);
-        return $this->getETag();
 
+        return $this->getETag();
     }
 
     /**
-     * Returns the data
+     * Returns the data.
      *
      * @return resource
      */
-    function get() {
-
+    public function get()
+    {
         return fopen($this->path, 'r');
-
     }
 
     /**
-     * Delete the current file
+     * Delete the current file.
      *
      * @return bool
      */
-    function delete() {
-
+    public function delete()
+    {
         return unlink($this->path);
-
     }
 
     /**
-     * Returns the ETag for a file
+     * Returns the ETag for a file.
      *
      * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
      * The ETag is an arbitrary string, but MUST be surrounded by double-quotes.
@@ -115,38 +117,34 @@ class File extends Node implements DAV\PartialUpdate\IPatchSupport {
      *
      * @return string|null
      */
-    function getETag() {
-
-        return '"' . sha1(
-            fileinode($this->path) .
-            filesize($this->path) .
+    public function getETag()
+    {
+        return '"'.sha1(
+            fileinode($this->path).
+            filesize($this->path).
             filemtime($this->path)
-        ) . '"';
-
+        ).'"';
     }
 
     /**
-     * Returns the mime-type for a file
+     * Returns the mime-type for a file.
      *
      * If null is returned, we'll assume application/octet-stream
      *
      * @return string|null
      */
-    function getContentType() {
-
+    public function getContentType()
+    {
         return null;
-
     }
 
     /**
-     * Returns the size of the file, in bytes
+     * Returns the size of the file, in bytes.
      *
      * @return int
      */
-    function getSize() {
-
+    public function getSize()
+    {
         return filesize($this->path);
-
     }
-
 }