another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)

4 files changed, 79 insertions, 95 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
index 23c248825..277de0664 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
@@ -1,20 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\CalDAV\Principal;
 
 use Sabre\DAVACL;
 
-class CollectionTest extends \PHPUnit_Framework_TestCase {
-
-    function testGetChildForPrincipal() {
-
+class CollectionTest extends \PHPUnit\Framework\TestCase
+{
+    public function testGetChildForPrincipal()
+    {
         $back = new DAVACL\PrincipalBackend\Mock();
         $col = new Collection($back);
         $r = $col->getChildForPrincipal([
             'uri' => 'principals/admin',
         ]);
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\User', $r);
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
index fe07f0131..8036635b2 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
@@ -1,102 +1,95 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\CalDAV\Principal;
 
 use Sabre\DAVACL;
 
-class ProxyReadTest extends \PHPUnit_Framework_TestCase {
-
+class ProxyReadTest extends \PHPUnit\Framework\TestCase
+{
     protected $backend;
 
-    function getInstance() {
-
+    public function getInstance()
+    {
         $backend = new DAVACL\PrincipalBackend\Mock();
         $principal = new ProxyRead($backend, [
             'uri' => 'principal/user',
         ]);
         $this->backend = $backend;
-        return $principal;
 
-   }
-
-    function testGetName() {
+        return $principal;
+    }
 
+    public function testGetName()
+    {
         $i = $this->getInstance();
         $this->assertEquals('calendar-proxy-read', $i->getName());
-
     }
-    function testGetDisplayName() {
 
+    public function testGetDisplayName()
+    {
         $i = $this->getInstance();
         $this->assertEquals('calendar-proxy-read', $i->getDisplayName());
-
     }
 
-    function testGetLastModified() {
-
+    public function testGetLastModified()
+    {
         $i = $this->getInstance();
         $this->assertNull($i->getLastModified());
-
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\Forbidden
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
-    function testDelete() {
-
+    public function testDelete()
+    {
         $i = $this->getInstance();
         $i->delete();
-
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\Forbidden
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
-    function testSetName() {
-
+    public function testSetName()
+    {
         $i = $this->getInstance();
         $i->setName('foo');
-
     }
 
-    function testGetAlternateUriSet() {
-
+    public function testGetAlternateUriSet()
+    {
         $i = $this->getInstance();
         $this->assertEquals([], $i->getAlternateUriSet());
-
     }
 
-    function testGetPrincipalUri() {
-
+    public function testGetPrincipalUri()
+    {
         $i = $this->getInstance();
         $this->assertEquals('principal/user/calendar-proxy-read', $i->getPrincipalUrl());
-
     }
 
-    function testGetGroupMemberSet() {
-
+    public function testGetGroupMemberSet()
+    {
         $i = $this->getInstance();
         $this->assertEquals([], $i->getGroupMemberSet());
-
     }
 
-    function testGetGroupMembership() {
-
+    public function testGetGroupMembership()
+    {
         $i = $this->getInstance();
         $this->assertEquals([], $i->getGroupMembership());
-
     }
 
-    function testSetGroupMemberSet() {
-
+    public function testSetGroupMemberSet()
+    {
         $i = $this->getInstance();
         $i->setGroupMemberSet(['principals/foo']);
 
         $expected = [
-            $i->getPrincipalUrl() => ['principals/foo']
+            $i->getPrincipalUrl() => ['principals/foo'],
         ];
 
         $this->assertEquals($expected, $this->backend->groupMembers);
-
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
index 6cdb9b30e..df1715ee5 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
@@ -1,40 +1,39 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\CalDAV\Principal;
 
 use Sabre\DAVACL;
 
-class ProxyWriteTest extends ProxyReadTest {
-
-    function getInstance() {
-
+class ProxyWriteTest extends ProxyReadTest
+{
+    public function getInstance()
+    {
         $backend = new DAVACL\PrincipalBackend\Mock();
         $principal = new ProxyWrite($backend, [
             'uri' => 'principal/user',
         ]);
         $this->backend = $backend;
-        return $principal;
 
+        return $principal;
     }
 
-    function testGetName() {
-
+    public function testGetName()
+    {
         $i = $this->getInstance();
         $this->assertEquals('calendar-proxy-write', $i->getName());
-
     }
-    function testGetDisplayName() {
 
+    public function testGetDisplayName()
+    {
         $i = $this->getInstance();
         $this->assertEquals('calendar-proxy-write', $i->getDisplayName());
-
     }
 
-    function testGetPrincipalUri() {
-
+    public function testGetPrincipalUri()
+    {
         $i = $this->getInstance();
         $this->assertEquals('principal/user/calendar-proxy-write', $i->getPrincipalUrl());
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
index 420bb3b1a..2c690c65d 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\CalDAV\Principal;
 
 use Sabre\DAVACL;
 
-class UserTest extends \PHPUnit_Framework_TestCase {
-
-    function getInstance() {
-
+class UserTest extends \PHPUnit\Framework\TestCase
+{
+    public function getInstance()
+    {
         $backend = new DAVACL\PrincipalBackend\Mock();
         $backend->addPrincipal([
             'uri' => 'principals/user/calendar-proxy-read',
@@ -18,89 +20,81 @@ class UserTest extends \PHPUnit_Framework_TestCase {
         $backend->addPrincipal([
             'uri' => 'principals/user/random',
         ]);
+
         return new User($backend, [
             'uri' => 'principals/user',
         ]);
-
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\Forbidden
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
-    function testCreateFile() {
-
+    public function testCreateFile()
+    {
         $u = $this->getInstance();
         $u->createFile('test');
-
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\Forbidden
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
-    function testCreateDirectory() {
-
+    public function testCreateDirectory()
+    {
         $u = $this->getInstance();
         $u->createDirectory('test');
-
     }
 
-    function testGetChildProxyRead() {
-
+    public function testGetChildProxyRead()
+    {
         $u = $this->getInstance();
         $child = $u->getChild('calendar-proxy-read');
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyRead', $child);
-
     }
 
-    function testGetChildProxyWrite() {
-
+    public function testGetChildProxyWrite()
+    {
         $u = $this->getInstance();
         $child = $u->getChild('calendar-proxy-write');
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyWrite', $child);
-
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\NotFound
+     * @expectedException \Sabre\DAV\Exception\NotFound
      */
-    function testGetChildNotFound() {
-
+    public function testGetChildNotFound()
+    {
         $u = $this->getInstance();
         $child = $u->getChild('foo');
-
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\NotFound
+     * @expectedException \Sabre\DAV\Exception\NotFound
      */
-    function testGetChildNotFound2() {
-
+    public function testGetChildNotFound2()
+    {
         $u = $this->getInstance();
         $child = $u->getChild('random');
-
     }
 
-    function testGetChildren() {
-
+    public function testGetChildren()
+    {
         $u = $this->getInstance();
         $children = $u->getChildren();
         $this->assertEquals(2, count($children));
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyRead', $children[0]);
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyWrite', $children[1]);
-
     }
 
-    function testChildExist() {
-
+    public function testChildExist()
+    {
         $u = $this->getInstance();
         $this->assertTrue($u->childExists('calendar-proxy-read'));
         $this->assertTrue($u->childExists('calendar-proxy-write'));
         $this->assertFalse($u->childExists('foo'));
-
     }
 
-    function testGetACL() {
-
+    public function testGetACL()
+    {
         $expected = [
             [
                 'privilege' => '{DAV:}all',
@@ -121,7 +115,5 @@ class UserTest extends \PHPUnit_Framework_TestCase {
 
         $u = $this->getInstance();
         $this->assertEquals($expected, $u->getACL());
-
     }
-
 }