another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)

3 files changed, 60 insertions, 66 deletions

diff --git a/vendor/sabre/dav/lib/DAVACL/FS/Collection.php b/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
index b4fe7a1b0..85b04e2bd 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\FS;
 
 use Sabre\DAV\Exception\Forbidden;
@@ -15,8 +17,8 @@ use Sabre\DAVACL\IACL;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Collection extends BaseCollection implements IACL {
-
+class Collection extends BaseCollection implements IACL
+{
     use ACLTrait;
 
     /**
@@ -34,60 +36,58 @@ class Collection extends BaseCollection implements IACL {
     protected $owner;
 
     /**
-     * Constructor
+     * Constructor.
      *
-     * @param string $path on-disk path.
-     * @param array $acl ACL rules.
-     * @param string|null $owner principal owner string.
+     * @param string      $path  on-disk path
+     * @param array       $acl   ACL rules
+     * @param string|null $owner principal owner string
      */
-    function __construct($path, array $acl, $owner = null) {
-
+    public function __construct($path, array $acl, $owner = null)
+    {
         parent::__construct($path);
         $this->acl = $acl;
         $this->owner = $owner;
-
     }
 
     /**
-     * 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 NotFound
+     *
      * @return \Sabre\DAV\INode
      */
-    function getChild($name) {
-
-        $path = $this->path . '/' . $name;
-
-        if (!file_exists($path)) throw new NotFound('File could not be located');
-        if ($name == '.' || $name == '..') throw new Forbidden('Permission denied to . and ..');
+    public function getChild($name)
+    {
+        $path = $this->path.'/'.$name;
 
+        if (!file_exists($path)) {
+            throw new NotFound('File could not be located');
+        }
+        if ('.' == $name || '..' == $name) {
+            throw new Forbidden('Permission denied to . and ..');
+        }
         if (is_dir($path)) {
-
             return new self($path, $this->acl, $this->owner);
-
         } else {
-
             return new File($path, $this->acl, $this->owner);
-
         }
-
     }
 
     /**
-     * Returns the owner principal
+     * Returns the owner principal.
      *
      * This must be a url to a principal, or null if there's no owner
      *
      * @return string|null
      */
-    function getOwner() {
-
+    public function getOwner()
+    {
         return $this->owner;
-
     }
 
     /**
@@ -102,10 +102,8 @@ class Collection extends BaseCollection implements IACL {
      *
      * @return array
      */
-    function getACL() {
-
+    public function getACL()
+    {
         return $this->acl;
-
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/File.php b/vendor/sabre/dav/lib/DAVACL/FS/File.php
index aaf2ae148..5506aa2c1 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/File.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/File.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\FS;
 
 use Sabre\DAV\FSExt\File as BaseFile;
@@ -13,8 +15,8 @@ use Sabre\DAVACL\IACL;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class File extends BaseFile implements IACL {
-
+class File extends BaseFile implements IACL
+{
     use ACLTrait;
 
     /**
@@ -32,31 +34,29 @@ class File extends BaseFile implements IACL {
     protected $owner;
 
     /**
-     * Constructor
+     * Constructor.
      *
-     * @param string $path on-disk path.
-     * @param array $acl ACL rules.
-     * @param string|null $owner principal owner string.
+     * @param string      $path  on-disk path
+     * @param array       $acl   ACL rules
+     * @param string|null $owner principal owner string
      */
-    function __construct($path, array $acl, $owner = null) {
-
+    public function __construct($path, array $acl, $owner = null)
+    {
         parent::__construct($path);
         $this->acl = $acl;
         $this->owner = $owner;
-
     }
 
     /**
-     * Returns the owner principal
+     * Returns the owner principal.
      *
      * This must be a url to a principal, or null if there's no owner
      *
      * @return string|null
      */
-    function getOwner() {
-
+    public function getOwner()
+    {
         return $this->owner;
-
     }
 
     /**
@@ -71,10 +71,8 @@ class File extends BaseFile implements IACL {
      *
      * @return array
      */
-    function getACL() {
-
+    public function getACL()
+    {
         return $this->acl;
-
     }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php b/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
index 201235e5a..c896d8e25 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\FS;
 
 use Sabre\DAVACL\AbstractPrincipalCollection;
@@ -19,8 +21,8 @@ use Sabre\Uri;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class HomeCollection extends AbstractPrincipalCollection implements IACL {
-
+class HomeCollection extends AbstractPrincipalCollection implements IACL
+{
     use ACLTrait;
 
     /**
@@ -41,14 +43,13 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
      * Creates the home collection.
      *
      * @param BackendInterface $principalBackend
-     * @param string $storagePath Where the actual files are stored.
-     * @param string $principalPrefix list of principals to iterate.
+     * @param string           $storagePath      where the actual files are stored
+     * @param string           $principalPrefix  list of principals to iterate
      */
-    function __construct(BackendInterface $principalBackend, $storagePath, $principalPrefix = 'principals') {
-
+    public function __construct(BackendInterface $principalBackend, $storagePath, $principalPrefix = 'principals')
+    {
         parent::__construct($principalBackend, $principalPrefix);
         $this->storagePath = $storagePath;
-
     }
 
     /**
@@ -58,10 +59,9 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
      *
      * @return string
      */
-    function getName() {
-
+    public function getName()
+    {
         return $this->collectionName;
-
     }
 
     /**
@@ -72,10 +72,11 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
      * supplied by the authentication backend.
      *
      * @param array $principalInfo
+     *
      * @return \Sabre\DAV\INode
      */
-    function getChildForPrincipal(array $principalInfo) {
-
+    public function getChildForPrincipal(array $principalInfo)
+    {
         $owner = $principalInfo['uri'];
         $acl = [
             [
@@ -87,20 +88,19 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
 
         list(, $principalBaseName) = Uri\split($owner);
 
-        $path = $this->storagePath . '/' . $principalBaseName;
+        $path = $this->storagePath.'/'.$principalBaseName;
 
         if (!is_dir($path)) {
             mkdir($path, 0777, true);
         }
+
         return new Collection(
             $path,
             $acl,
             $owner
         );
-
     }
 
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -113,16 +113,14 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
      *
      * @return array
      */
-    function getACL() {
-
+    public function getACL()
+    {
         return [
             [
                 'principal' => '{DAV:}authenticated',
                 'privilege' => '{DAV:}read',
                 'protected' => true,
-            ]
+            ],
         ];
-
     }
-
 }