Revert "composer updates"

This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00

72 files changed, 800 insertions, 177 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
index 9460b8922..d2df483cd 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
@@ -15,7 +15,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     protected $pdo;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->dropTables([
             'calendarobjects',
@@ -67,7 +67,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
             'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
         ];
 
-        $this->assertIsArray($calendars);
+        $this->assertInternalType('array', $calendars);
         $this->assertEquals(1, count($calendars));
 
         foreach ($elementCheck as $name => $value) {
@@ -112,7 +112,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
             '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
         ];
 
-        $this->assertIsArray($calendars);
+        $this->assertInternalType('array', $calendars);
         $this->assertEquals(1, count($calendars));
 
         foreach ($elementCheck as $name => $value) {
@@ -123,10 +123,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testConstruct
+     * @expectedException \InvalidArgumentException
      */
     public function testUpdateCalendarBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
 
         //Creating a new calendar
@@ -186,10 +186,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testCreateCalendarAndFetch
+     * @expectedException \InvalidArgumentException
      */
     public function testDeleteCalendarBadID()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', [
             '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VEVENT']),
@@ -201,10 +201,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testCreateCalendarAndFetch
+     * @expectedException \Sabre\DAV\Exception
      */
     public function testCreateCalendarIncorrectComponentSet()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $backend = new PDO($this->pdo);
 
         //Creating a new calendar
@@ -276,7 +276,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
                 switch ($key) {
                     case 'lastmodified':
-                        $this->assertIsInt($actual);
+                        $this->assertInternalType('int', $actual);
                         break;
                     case 'calendardata':
                         if (is_resource($actual)) {
@@ -292,20 +292,20 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testGetMultipleObjects
+     * @expectedException \InvalidArgumentException
      */
     public function testGetMultipleObjectsBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $backend->getMultipleCalendarObjects('bad-id', ['foo-bar']);
     }
 
     /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
      * @depends testCreateCalendarObject
      */
     public function testCreateCalendarObjectNoComponent()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         $backend = new PDO($this->pdo);
         $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
 
@@ -345,10 +345,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testCreateCalendarObject
+     * @expectedException \InvalidArgumentException
      */
     public function testCreateCalendarObjectBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
 
@@ -519,20 +519,20 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testGetCalendarObjects
+     * @expectedException \InvalidArgumentException
      */
     public function testGetCalendarObjectsBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $backend->getCalendarObjects('bad-id');
     }
 
     /**
      * @depends testGetCalendarObjects
+     * @expectedException \InvalidArgumentException
      */
     public function testGetCalendarObjectBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $backend->getCalendarObject('bad-id', 'foo-bar');
     }
@@ -582,10 +582,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testUpdateCalendarObject
+     * @expectedException \InvalidArgumentException
      */
     public function testUpdateCalendarObjectBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $backend->updateCalendarObject('bad-id', 'object-id', 'objectdata');
     }
@@ -608,10 +608,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testDeleteCalendarObject
+     * @expectedException \InvalidArgumentException
      */
     public function testDeleteCalendarObjectBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
 
@@ -644,11 +644,11 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
     }
 
     /**
+     * @expectedException \InvalidArgumentException
      * @depends testCalendarQueryNoResult
      */
     public function testCalendarQueryBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $abstract = new PDO($this->pdo);
         $filters = [
             'name' => 'VCALENDAR',
@@ -859,10 +859,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testGetChanges
+     * @expectedException \InvalidArgumentException
      */
     public function testGetChangesBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         $id = $backend->createCalendar(
             'principals/user1',
@@ -903,9 +903,11 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
         }
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testCreateSubscriptionFail()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $props = [
         ];
 
@@ -1107,10 +1109,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testGetInvites
+     * @expectedException \InvalidArgumentException
      */
     public function testGetInvitesBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
 
         // creating a new calendar
@@ -1257,10 +1259,10 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testUpdateInvites
+     * @expectedException \InvalidArgumentException
      */
     public function testUpdateInvitesBadId()
     {
-        $this->expectException('InvalidArgumentException');
         $backend = new PDO($this->pdo);
         // Add a new invite
         $backend->updateInvites(
@@ -1314,7 +1316,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
                 ],
             ]),
         ];
-        $this->assertEqualsCanonicalizing($expected, $result);
+        $this->assertEquals($expected, $result, null, 0.0, 10, true); // Last argument is $canonicalize = true, which allows us to compare, ignoring the order, because it's different between MySQL and Sqlite.
     }
 
     /**
@@ -1388,9 +1390,11 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($expected, $result);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotImplemented
+     */
     public function testSetPublishStatus()
     {
-        $this->expectException('Sabre\DAV\Exception\NotImplemented');
         $backend = new PDO($this->pdo);
         $backend->setPublishStatus([1, 1], true);
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
index 01ac1b39e..9f18eeb72 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
@@ -65,6 +65,7 @@ class Mock extends AbstractBackend
      *
      * @param string $principalUri
      * @param string $calendarUri
+     * @param array  $properties
      *
      * @return string|int
      */
@@ -93,7 +94,8 @@ class Mock extends AbstractBackend
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param mixed $calendarId
+     * @param mixed                $calendarId
+     * @param \Sabre\DAV\PropPatch $propPatch
      */
     public function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch)
     {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
index b7eb4539e..d6073514f 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Sabre\CalDAV;
 
+require_once 'Sabre/CalDAV/TestUtil.php';
+
 class CalendarObjectTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -16,7 +18,7 @@ class CalendarObjectTest extends \PHPUnit\Framework\TestCase
     protected $calendar;
     protected $principalBackend;
 
-    public function setup(): void
+    public function setup()
     {
         $this->backend = TestUtil::getBackend();
 
@@ -25,7 +27,7 @@ class CalendarObjectTest extends \PHPUnit\Framework\TestCase
         $this->calendar = new Calendar($this->backend, $calendars[0]);
     }
 
-    public function teardown(): void
+    public function teardown()
     {
         unset($this->calendar);
         unset($this->backend);
@@ -36,15 +38,17 @@ class CalendarObjectTest extends \PHPUnit\Framework\TestCase
         $children = $this->calendar->getChildren();
         $this->assertTrue($children[0] instanceof CalendarObject);
 
-        $this->assertIsString($children[0]->getName());
-        $this->assertIsString($children[0]->get());
-        $this->assertIsString($children[0]->getETag());
+        $this->assertInternalType('string', $children[0]->getName());
+        $this->assertInternalType('string', $children[0]->get());
+        $this->assertInternalType('string', $children[0]->getETag());
         $this->assertEquals('text/calendar; charset=utf-8', $children[0]->getContentType());
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testInvalidArg1()
     {
-        $this->expectException('InvalidArgumentException');
         $obj = new CalendarObject(
             new Backend\Mock([], []),
             [],
@@ -52,9 +56,11 @@ class CalendarObjectTest extends \PHPUnit\Framework\TestCase
         );
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testInvalidArg2()
     {
-        $this->expectException('InvalidArgumentException');
         $obj = new CalendarObject(
             new Backend\Mock([], []),
             [],
@@ -131,7 +137,7 @@ class CalendarObjectTest extends \PHPUnit\Framework\TestCase
         $obj = $children[0];
 
         $size = $obj->getSize();
-        $this->assertIsInt($size);
+        $this->assertInternalType('int', $size);
     }
 
     public function testGetOwner()
@@ -213,9 +219,11 @@ class CalendarObjectTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($expected, $calendarObject->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACL()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $children = $this->calendar->getChildren();
         $this->assertTrue($children[0] instanceof CalendarObject);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
index 18c3ec126..7d6414a80 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
@@ -6,6 +6,8 @@ namespace Sabre\CalDAV;
 
 use Sabre\DAV\PropPatch;
 
+require_once 'Sabre/CalDAV/TestUtil.php';
+
 class CalendarTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -22,7 +24,7 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
      */
     protected $calendars;
 
-    public function setup(): void
+    public function setup()
     {
         $this->backend = TestUtil::getBackend();
 
@@ -31,7 +33,7 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
         $this->calendar = new Calendar($this->backend, $this->calendars[0]);
     }
 
-    public function teardown(): void
+    public function teardown()
     {
         unset($this->backend);
     }
@@ -78,11 +80,11 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
     }
 
     /**
+     * @expectedException \Sabre\DAV\Exception\NotFound
      * @depends testSimple
      */
     public function testGetChildNotFound()
     {
-        $this->expectException('Sabre\DAV\Exception\NotFound');
         $this->calendar->getChild('randomname');
     }
 
@@ -108,15 +110,19 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($this->calendar->childExists($children[0]->getName()));
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
+     */
     public function testCreateDirectory()
     {
-        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $this->calendar->createDirectory('hello');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
+     */
     public function testSetName()
     {
-        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $this->calendar->setName('hello');
     }
 
@@ -205,9 +211,11 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($expected, $this->calendar->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACL()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $this->calendar->setACL([]);
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
index 93fc56dae..d6e7b491c 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
@@ -10,6 +10,7 @@ use Sabre\VObject;
 /**
  * This unittests is created to find out why recurring events have wrong DTSTART value.
  *
+ *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
index 44823edab..3d4b36313 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
@@ -18,7 +18,7 @@ class FreeBusyReportTest extends \PHPUnit\Framework\TestCase
      */
     protected $server;
 
-    public function setup(): void
+    public function setUp()
     {
         $obj1 = <<<ics
 BEGIN:VCALENDAR
@@ -108,9 +108,11 @@ XML;
         $this->assertTrue(false !== strpos($this->server->httpResponse->body, '20111006T100000Z/20111006T110000Z'));
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
+     */
     public function testFreeBusyReportNoTimeRange()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         $reportXML = <<<XML
 <?xml version="1.0"?>
 <c:free-busy-query xmlns:c="urn:ietf:params:xml:ns:caldav">
@@ -120,9 +122,11 @@ XML;
         $report = $this->server->xml->parse($reportXML, null, $rootElem);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotImplemented
+     */
     public function testFreeBusyReportWrongNode()
     {
-        $this->expectException('Sabre\DAV\Exception\NotImplemented');
         $request = new HTTP\Request('REPORT', '/');
         $this->server->httpRequest = $request;
 
@@ -137,9 +141,11 @@ XML;
         $this->plugin->report($rootElem, $report, null);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception
+     */
     public function testFreeBusyReportNoACLPlugin()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $this->server = new DAV\Server();
         $this->server->httpRequest = new HTTP\Request('REPORT', '/');
         $this->plugin = new Plugin();
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
index 8771f538b..8c99e6c46 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
@@ -15,7 +15,7 @@ class ICSExportPluginTest extends \Sabre\DAVServerTest
 
     protected $icsExportPlugin;
 
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
         $this->icsExportPlugin = new ICSExportPlugin();
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
index 594241e0d..eceb0b87f 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
@@ -63,9 +63,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($expected, $col->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACL()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $col = $this->getInstance();
         $col->setACL([]);
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
index 623525e69..cb19ef962 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
@@ -73,9 +73,11 @@ class NodeTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals($expected, $node->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACL()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $node = $this->getInstance();
         $node->setACL([]);
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
index a4f08f7e5..f065e1ac8 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
@@ -26,7 +26,7 @@ class PluginTest extends \PHPUnit\Framework\TestCase
      */
     protected $caldavBackend;
 
-    public function setup(): void
+    public function setup()
     {
         $caldavNS = '{urn:ietf:params:xml:ns:caldav}';
 
@@ -349,7 +349,7 @@ END:VCALENDAR';
             }
         }
 
-        $this->assertIsArray($newCalendar);
+        $this->assertInternalType('array', $newCalendar);
 
         $keys = [
             'uri' => 'NEWCALENDAR',
@@ -394,7 +394,7 @@ END:VCALENDAR';
             }
         }
 
-        $this->assertIsArray($newCalendar);
+        $this->assertInternalType('array', $newCalendar);
 
         $keys = [
             'uri' => 'NEWCALENDAR',
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
index 95ff86fa1..8036635b2 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
@@ -39,16 +39,20 @@ class ProxyReadTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($i->getLastModified());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testDelete()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $i = $this->getInstance();
         $i->delete();
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetName()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $i = $this->getInstance();
         $i->setName('foo');
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
index fd079acb2..2c690c65d 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
@@ -26,16 +26,20 @@ class UserTest extends \PHPUnit\Framework\TestCase
         ]);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testCreateFile()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $u = $this->getInstance();
         $u->createFile('test');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testCreateDirectory()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $u = $this->getInstance();
         $u->createDirectory('test');
     }
@@ -54,16 +58,20 @@ class UserTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyWrite', $child);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotFound
+     */
     public function testGetChildNotFound()
     {
-        $this->expectException('Sabre\DAV\Exception\NotFound');
         $u = $this->getInstance();
         $child = $u->getChild('foo');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotFound
+     */
     public function testGetChildNotFound2()
     {
-        $this->expectException('Sabre\DAV\Exception\NotFound');
         $u = $this->getInstance();
         $child = $u->getChild('random');
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
index f11af8b95..45c389cc2 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
@@ -6,17 +6,16 @@ namespace Sabre\CalDAV;
 
 use Sabre\DAV;
 use Sabre\DAV\Xml\Element\Sharee;
-use Sabre\DAVServerTest;
 use Sabre\HTTP;
 
-class SharingPluginTest extends DAVServerTest
+class SharingPluginTest extends \Sabre\DAVServerTest
 {
     protected $setupCalDAV = true;
     protected $setupCalDAVSharing = true;
     protected $setupACL = true;
     protected $autoLogin = 'user1';
 
-    public function setup(): void
+    public function setUp()
     {
         $this->caldavCalendars = [
             [
@@ -52,9 +51,11 @@ class SharingPluginTest extends DAVServerTest
         );
     }
 
+    /**
+     * @expectedException \LogicException
+     */
     public function testSetupWithoutCoreSharingPlugin()
     {
-        $this->expectException('LogicException');
         $server = new DAV\Server();
         $server->addPlugin(
             new SharingPlugin()
@@ -179,7 +180,7 @@ RRR;
 
         $request->setBody($xml);
 
-        $this->request($request, 200);
+        $response = $this->request($request, 200);
 
         $this->assertEquals(
             [
@@ -229,7 +230,7 @@ RRR;
 
         $request->setBody($xml);
 
-        $this->request($request, 403);
+        $response = $this->request($request, 403);
     }
 
     public function testInviteReply()
@@ -288,7 +289,7 @@ RRR;
 
         // If the plugin did not handle this request, it must ensure that the
         // body is still accessible by other plugins.
-        $this->assertEquals($xml, $request->getBody());
+        $this->assertEquals($xml, $request->getBody(true));
     }
 
     public function testPostWithoutContentType()
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php b/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
index 5de11a31a..72b5080af 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
@@ -99,4 +99,87 @@ END:VCALENDAR';
 
         return $calendarData;
     }
+
+    public static function getTestTODO($type = 'due')
+    {
+        switch ($type) {
+            case 'due':
+                $extra = 'DUE:20100104T000000Z';
+                break;
+            case 'due2':
+                $extra = 'DUE:20060104T000000Z';
+                break;
+            case 'due_date':
+                $extra = 'DUE;VALUE=DATE:20060104';
+                break;
+            case 'due_tz':
+                $extra = 'DUE;TZID=Asia/Seoul:20060104T000000Z';
+                break;
+            case 'due_dtstart':
+                $extra = "DTSTART:20050223T060000Z\nDUE:20060104T000000Z";
+                break;
+            case 'due_dtstart2':
+                $extra = "DTSTART:20090223T060000Z\nDUE:20100104T000000Z";
+                break;
+            case 'dtstart':
+                $extra = 'DTSTART:20100223T060000Z';
+                break;
+            case 'dtstart2':
+                $extra = 'DTSTART:20060223T060000Z';
+                break;
+            case 'dtstart_date':
+                $extra = 'DTSTART;VALUE=DATE:20100223';
+                break;
+            case 'dtstart_tz':
+                $extra = 'DTSTART;TZID=Asia/Seoul:20100223T060000Z';
+                break;
+            case 'dtstart_duration':
+                $extra = "DTSTART:20061023T060000Z\nDURATION:PT1H";
+                break;
+            case 'dtstart_duration2':
+                $extra = "DTSTART:20101023T060000Z\nDURATION:PT1H";
+                break;
+            case 'completed':
+                $extra = 'COMPLETED:20060601T000000Z';
+                break;
+            case 'completed2':
+                $extra = 'COMPLETED:20090601T000000Z';
+                break;
+            case 'created':
+                $extra = 'CREATED:20060601T000000Z';
+                break;
+            case 'created2':
+                $extra = 'CREATED:20090601T000000Z';
+                break;
+            case 'completedcreated':
+                $extra = "CREATED:20060601T000000Z\nCOMPLETED:20070101T000000Z";
+                break;
+            case 'completedcreated2':
+                $extra = "CREATED:20090601T000000Z\nCOMPLETED:20100101T000000Z";
+                break;
+            case 'notime':
+                $extra = 'X-FILLER:oh hello';
+                break;
+            default:
+                throw new Exception('Unknown type: '.$type);
+        }
+
+        $todo = 'BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Corp.//CalDAV Client//EN
+BEGIN:VTODO
+DTSTAMP:20060205T235335Z
+'.$extra.'
+STATUS:NEEDS-ACTION
+SUMMARY:Task #1
+UID:DDDEEB7915FA61233B861457@example.com
+BEGIN:VALARM
+ACTION:AUDIO
+TRIGGER;RELATED=START:-PT10M
+END:VALARM
+END:VTODO
+END:VCALENDAR';
+
+        return $todo;
+    }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
index 4e2411391..fc87184d9 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
@@ -8,10 +8,12 @@ use Sabre\DAV;
 use Sabre\DAVACL;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class ValidateICalTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var DAV\Server
+     * @var Sabre\DAV\Server
      */
     protected $server;
     /**
@@ -19,7 +21,7 @@ class ValidateICalTest extends \PHPUnit\Framework\TestCase
      */
     protected $calBackend;
 
-    public function setup(): void
+    public function setUp()
     {
         $calendars = [
             [
@@ -54,9 +56,6 @@ class ValidateICalTest extends \PHPUnit\Framework\TestCase
         $this->server->httpResponse = $response;
     }
 
-    /**
-     * @return Sabre\HTTP\ResponseMock
-     */
     public function request(HTTP\Request $request)
     {
         $this->server->httpRequest = $request;
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
index 6565fc459..c945e2c58 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
@@ -23,7 +23,7 @@ abstract class AbstractPluginTest extends \PHPUnit\Framework\TestCase
      */
     protected $backend;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->backend = new Backend\Mock();
         $principalBackend = new DAVACL\PrincipalBackend\Mock();
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
index a86d85144..fe047fb84 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
@@ -7,6 +7,9 @@ namespace Sabre\CardDAV;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/CardDAV/AbstractPluginTest.php';
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class AddressBookQueryTest extends AbstractPluginTest
 {
     public function testQuery()
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
index e985c54ff..879816803 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
@@ -16,7 +16,7 @@ class AddressBookTest extends \PHPUnit\Framework\TestCase
     protected $ab;
     protected $backend;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->backend = new Backend\Mock();
         $this->ab = new AddressBook(
@@ -42,9 +42,11 @@ class AddressBookTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('card1', $card->getName());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotFound
+     */
     public function testGetChildNotFound()
     {
-        $this->expectException('Sabre\DAV\Exception\NotFound');
         $card = $this->ab->getChild('card3');
     }
 
@@ -57,9 +59,11 @@ class AddressBookTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals('card2', $cards[1]->getName());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
+     */
     public function testCreateDirectory()
     {
-        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $this->ab->createDirectory('name');
     }
 
@@ -79,9 +83,11 @@ class AddressBookTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(1, count($this->backend->addressBooks));
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
+     */
     public function testSetName()
     {
-        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $this->ab->setName('foo');
     }
 
@@ -122,9 +128,11 @@ class AddressBookTest extends \PHPUnit\Framework\TestCase
         ], $this->ab->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACL()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $this->ab->setACL([]);
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
index bac3b2b22..e5bd088fc 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
@@ -16,7 +16,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
      */
     protected $backend;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->dropTables([
             'addressbooks',
@@ -142,9 +142,11 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals([], $this->backend->getAddressBooksForUser('principals/user1'));
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
+     */
     public function testCreateAddressBookUnsupportedProp()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         $this->backend->createAddressBook('principals/user1', 'book2', [
             '{DAV:}foo' => 'bar',
         ]);
@@ -271,7 +273,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 
                 switch ($k) {
                     case 'lastmodified':
-                        $this->assertIsInt($actual);
+                        $this->assertInternalType('int', $actual);
                         break;
                     case 'carddata':
                         if (is_resource($actual)) {
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
index 630465cc8..f7e20fbfb 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
@@ -69,7 +69,8 @@ class Mock extends AbstractBackend
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param string $addressBookId
+     * @param string               $addressBookId
+     * @param \Sabre\DAV\PropPatch $propPatch
      */
     public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch)
     {
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php
index 1de10b719..41853aa63 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php
@@ -15,7 +15,7 @@ class CardTest extends \PHPUnit\Framework\TestCase
      */
     protected $backend;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->backend = new Backend\Mock();
         $this->card = new Card(
@@ -179,9 +179,11 @@ class CardTest extends \PHPUnit\Framework\TestCase
         ], $card->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACL()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $this->card->setACL([]);
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
index ac0cd5e91..6fdfcd07a 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
@@ -7,6 +7,8 @@ namespace Sabre\CardDAV;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class MultiGetTest extends AbstractPluginTest
 {
     public function testMultiGet()
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php b/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
new file mode 100644
index 000000000..0bdf07df5
--- /dev/null
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sabre\CardDAV;
+
+class TestUtil
+{
+    public static function getBackend()
+    {
+        $backend = new Backend\PDO(self::getSQLiteDB());
+
+        return $backend;
+    }
+
+    public static function getSQLiteDB()
+    {
+        $pdo = Backend\PDOSqliteTest::getSQLite();
+
+        // Inserting events through a backend class.
+        $backend = new Backend\PDO($pdo);
+        $addressbookId = $backend->createAddressBook(
+            'principals/user1',
+            'UUID-123467',
+            [
+                '{DAV:}displayname' => 'user1 addressbook',
+                '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'AddressBook description',
+            ]
+        );
+        $backend->createAddressBook(
+            'principals/user1',
+            'UUID-123468',
+            [
+                '{DAV:}displayname' => 'user1 addressbook2',
+                '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'AddressBook description',
+            ]
+        );
+        $backend->createCard($addressbookId, 'UUID-2345', self::getTestCardData());
+
+        return $pdo;
+    }
+
+    public static function deleteSQLiteDB()
+    {
+        $sqliteTest = new Backend\PDOSqliteTest();
+        $pdo = $sqliteTest->tearDown();
+    }
+
+    public static function getTestCardData()
+    {
+        $addressbookData = 'BEGIN:VCARD
+VERSION:3.0
+PRODID:-//Acme Inc.//RoadRunner 1.0//EN
+FN:Wile E. Coyote
+N:Coyote;Wile;Erroll;;
+ORG:Acme Inc.
+UID:39A6B5ED-DD51-4AFE-A683-C35EE3749627
+REV:2012-06-20T07:00:39+00:00
+END:VCARD';
+
+        return $addressbookData;
+    }
+}
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
index 546a4ccfb..48477d7f2 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
@@ -28,7 +28,7 @@ class VCFExportTest extends \Sabre\DAVServerTest
         ],
     ];
 
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
         $plugin = new VCFExportPlugin();
@@ -84,7 +84,7 @@ END:VCARD
         $actions = '';
         $addressbook = new AddressBook($this->carddavBackend, []);
         $this->server->emit('browserButtonActions', ['/foo', $addressbook, &$actions]);
-        $this->assertStringContainsString('/foo?export', $actions);
+        $this->assertContains('/foo?export', $actions);
     }
 
     public function testContentDisposition()
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
index de7de19cd..753efc73d 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Sabre\CardDAV;
 
+require_once 'Sabre/CardDAV/AbstractPluginTest.php';
+
 class ValidateFilterTest extends AbstractPluginTest
 {
     /**
@@ -14,7 +16,7 @@ class ValidateFilterTest extends AbstractPluginTest
      * @param string|null $message
      * @dataProvider data
      */
-    public function testFilter($input, $filters, $test, $result, $message = '')
+    public function testFilter($input, $filters, $test, $result, $message = null)
     {
         if ($result) {
             $this->assertTrue($this->plugin->validateFilters($input, $filters, $test), $message);
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
index 571cce3f0..a9be169c0 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
@@ -8,12 +8,14 @@ use Sabre\DAV;
 use Sabre\DAVACL;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class ValidateVCardTest extends \PHPUnit\Framework\TestCase
 {
     protected $server;
     protected $cardBackend;
 
-    public function setup(): void
+    public function setUp()
     {
         $addressbooks = [
             [
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php b/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php
index 807b66382..bf1e22aea 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php
@@ -19,7 +19,7 @@ abstract class AbstractServer extends \PHPUnit\Framework\TestCase
     protected $server;
     protected $tempDir = SABRE_TEMPDIR;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->response = new HTTP\ResponseMock();
         $this->server = new Server($this->getRootNode());
@@ -32,7 +32,7 @@ abstract class AbstractServer extends \PHPUnit\Framework\TestCase
         file_put_contents(SABRE_TEMPDIR.'/dir/child.txt', 'Child contents');
     }
 
-    public function teardown(): void
+    public function tearDown()
     {
         $this->deleteTree(SABRE_TEMPDIR, false);
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
index a751efdc2..d9af326fe 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
@@ -35,9 +35,11 @@ class AbstractDigestTest extends \PHPUnit\Framework\TestCase
         );
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception
+     */
     public function testCheckBadGetUserInfoResponse2()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $header = 'username=array, realm=myRealm, nonce=12345, uri=/, response=HASH, opaque=1, qop=auth, nc=1, cnonce=1';
         $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'GET',
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
index 8b874f884..5e34f9c49 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
@@ -8,7 +8,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 {
     use \Sabre\DAV\DbTestHelperTrait;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->dropTables('users');
         $this->createSchema('users');
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
index 31a86f9ed..0297b17f9 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
@@ -6,7 +6,7 @@ namespace Sabre\DAV\Auth\Backend;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
-    public function teardown(): void
+    public function tearDown()
     {
         if (file_exists(SABRE_TEMPDIR.'/filebackend')) {
             unlink(SABRE_TEMPDIR.'/filebackend');
@@ -19,9 +19,11 @@ class FileTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($file instanceof File);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception
+     */
     public function testLoadFileBroken()
     {
-        $this->expectException('Sabre\DAV\Exception');
         file_put_contents(SABRE_TEMPDIR.'/backend', 'user:realm:hash');
         $file = new File(SABRE_TEMPDIR.'/backend');
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
index fca7f722f..730f2a975 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
@@ -44,6 +44,9 @@ class Mock implements BackendInterface
      *
      * principals/users/[username]
      *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     *
      * @return array
      */
     public function check(RequestInterface $request, ResponseInterface $response)
@@ -74,6 +77,9 @@ class Mock implements BackendInterface
      * WWW-Authenticate headers may already have been set, and you'll want to
      * append your own WWW-Authenticate header instead of overwriting the
      * existing one.
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
      */
     public function challenge(RequestInterface $request, ResponseInterface $response)
     {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
index f4810d524..03c8a4624 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
@@ -16,7 +16,7 @@ class PluginTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($plugin instanceof Plugin);
         $fakeServer->addPlugin($plugin);
         $this->assertEquals($plugin, $fakeServer->getPlugin('auth'));
-        $this->assertIsArray($plugin->getPluginInfo());
+        $this->assertInternalType('array', $plugin->getPluginInfo());
     }
 
     /**
@@ -34,10 +34,10 @@ class PluginTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testInit
+     * @expectedException \Sabre\DAV\Exception\NotAuthenticated
      */
     public function testAuthenticateFail()
     {
-        $this->expectException('Sabre\DAV\Exception\NotAuthenticated');
         $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend = new Backend\Mock();
         $backend->fail = true;
@@ -87,10 +87,10 @@ class PluginTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testInit
+     * @expectedException \Sabre\DAV\Exception
      */
     public function testNoAuthBackend()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
 
         $plugin = new Plugin();
@@ -100,10 +100,10 @@ class PluginTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testInit
+     * @expectedException \Sabre\DAV\Exception
      */
     public function testInvalidCheckResponse()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend = new Backend\Mock();
         $backend->invalidCheckResponse = true;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
index e9a8eddad..60fcc73fc 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
@@ -6,16 +6,20 @@ namespace Sabre\DAV;
 
 class BasicNodeTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testPut()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $file = new FileMock();
         $file->put('hi');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testGet()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $file = new FileMock();
         $file->get();
     }
@@ -38,16 +42,20 @@ class BasicNodeTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($file->getContentType());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testDelete()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $file = new FileMock();
         $file->delete();
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetName()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $file = new FileMock();
         $file->setName('hi');
     }
@@ -80,23 +88,29 @@ class BasicNodeTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($dir->childExists('mockfile2'));
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotFound
+     */
     public function testGetChild404()
     {
-        $this->expectException('Sabre\DAV\Exception\NotFound');
         $dir = new DirectoryMock();
         $file = $dir->getChild('blabla');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testCreateFile()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $dir = new DirectoryMock();
         $dir->createFile('hello', 'data');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testCreateDirectory()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $dir = new DirectoryMock();
         $dir->createDirectory('hello');
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
index cb4d3ce03..1f48256e0 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
@@ -6,9 +6,10 @@ namespace Sabre\DAV\Browser;
 
 use Sabre\DAV;
 
+require_once 'Sabre/DAV/AbstractServer.php';
 class GuessContentTypeTest extends DAV\AbstractServer
 {
-    public function setUp(): void
+    public function setUp()
     {
         parent::setUp();
         \Sabre\TestUtil::clearTempDir();
@@ -16,7 +17,7 @@ class GuessContentTypeTest extends DAV\AbstractServer
         file_put_contents(SABRE_TEMPDIR.'/somefile.hoi', 'blabla');
     }
 
-    public function tearDown(): void
+    public function tearDown()
     {
         \Sabre\TestUtil::clearTempDir();
         parent::tearDown();
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
index 00b2661ac..f51f5546c 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
@@ -7,9 +7,11 @@ namespace Sabre\DAV\Browser;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class MapGetToPropFindTest extends DAV\AbstractServer
 {
-    public function setUp(): void
+    public function setUp()
     {
         parent::setUp();
         $this->server->addPlugin(new MapGetToPropFind());
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
index a987525c0..f28661ca7 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
@@ -7,11 +7,13 @@ namespace Sabre\DAV\Browser;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class PluginTest extends DAV\AbstractServer
 {
     protected $plugin;
 
-    public function setUp(): void
+    public function setUp()
     {
         parent::setUp();
         $this->server->addPlugin($this->plugin = new Plugin());
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
index 85a95c90e..e9362c8e4 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
@@ -6,9 +6,11 @@ namespace Sabre\DAV;
 
 use Sabre\HTTP\Response;
 
+require_once 'Sabre/DAV/ClientMock.php';
+
 class ClientTest extends \PHPUnit\Framework\TestCase
 {
-    public function setup(): void
+    public function setUp()
     {
         if (!function_exists('curl_init')) {
             $this->markTestSkipped('CURL must be installed to test the client');
@@ -23,9 +25,11 @@ class ClientTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('Sabre\DAV\ClientMock', $client);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     */
     public function testConstructNoBaseUri()
     {
-        $this->expectException('InvalidArgumentException');
         $client = new ClientMock([]);
     }
 
@@ -135,9 +139,11 @@ XML;
         ], $request->getHeaders());
     }
 
+    /**
+     * @expectedException \Sabre\HTTP\ClientHttpException
+     */
     public function testPropFindError()
     {
-        $this->expectException('Sabre\HTTP\ClientHttpException');
         $client = new ClientMock([
             'baseUri' => '/',
         ]);
@@ -219,10 +225,10 @@ XML;
 
     /**
      * @depends testPropPatch
+     * @expectedException \Sabre\HTTP\ClientHttpException
      */
     public function testPropPatchHTTPError()
     {
-        $this->expectException('Sabre\HTTP\ClientHttpException');
         $client = new ClientMock([
             'baseUri' => '/',
         ]);
@@ -233,10 +239,10 @@ XML;
 
     /**
      * @depends testPropPatch
+     * @expectedException \Sabre\HTTP\ClientException
      */
     public function testPropPatchMultiStatusError()
     {
-        $this->expectException('Sabre\HTTP\ClientException');
         $client = new ClientMock([
             'baseUri' => '/',
         ]);
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
index 2b759e5d0..4bc79b597 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
@@ -4,14 +4,16 @@ declare(strict_types=1);
 
 namespace Sabre\DAV\FSExt;
 
+require_once 'Sabre/TestUtil.php';
+
 class FileTest extends \PHPUnit\Framework\TestCase
 {
-    public function setup(): void
+    public function setUp()
     {
         file_put_contents(SABRE_TEMPDIR.'/file.txt', 'Contents');
     }
 
-    public function teardown(): void
+    public function tearDown()
     {
         \Sabre\TestUtil::clearTempDir();
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
index 79ffb0186..f53807e6c 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
@@ -7,6 +7,8 @@ namespace Sabre\DAV\FSExt;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class ServerTest extends DAV\AbstractServer
 {
     protected function getRootNode()
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php b/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
index 36b182c44..500ad6147 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
@@ -6,9 +6,11 @@ namespace Sabre\DAV;
 
 use Sabre\HTTP;
 
+require_once 'Sabre/TestUtil.php';
+
 class Issue33Test extends \PHPUnit\Framework\TestCase
 {
-    public function setup(): void
+    public function setUp()
     {
         \Sabre\TestUtil::clearTempDir();
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
index 57a3255c7..50f17a7dd 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace Sabre\DAV\Locks\Backend;
 
+require_once 'Sabre/TestUtil.php';
+
 class FileTest extends AbstractTest
 {
     public function getBackend()
@@ -14,7 +16,7 @@ class FileTest extends AbstractTest
         return $backend;
     }
 
-    public function teardown(): void
+    public function tearDown()
     {
         \Sabre\TestUtil::clearTempDir();
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
index 02c3d39ba..a2a31e87f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
@@ -7,9 +7,12 @@ namespace Sabre\DAV\Locks;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+require_once 'Sabre/TestUtil.php';
+
 class MSWordTest extends \PHPUnit\Framework\TestCase
 {
-    public function teardown(): void
+    public function tearDown()
     {
         \Sabre\TestUtil::clearTempDir();
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
index 96e3939d0..a9c6cc1bc 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
@@ -7,6 +7,8 @@ namespace Sabre\DAV\Locks;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class PluginTest extends DAV\AbstractServer
 {
     /**
@@ -14,7 +16,7 @@ class PluginTest extends DAV\AbstractServer
      */
     protected $locksPlugin;
 
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
         $locksBackend = new Backend\File(SABRE_TEMPDIR.'/locksdb');
@@ -849,9 +851,11 @@ class PluginTest extends DAV\AbstractServer
         $this->assertEquals(LockInfo::TIMEOUT_INFINITE, $this->locksPlugin->getTimeoutHeader());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
+     */
     public function testGetTimeoutHeaderInvalid()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         $request = new HTTP\Request('GET', '/', ['Timeout' => 'yourmom']);
 
         $this->server->httpRequest = $request;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php b/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
index 041274706..e0bdecc09 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
@@ -31,6 +31,7 @@ class Collection extends DAV\Collection
      * Creates the object.
      *
      * @param string     $name
+     * @param array      $children
      * @param Collection $parent
      */
     public function __construct($name, array $children = [], Collection $parent = null)
@@ -87,11 +88,8 @@ class Collection extends DAV\Collection
      *
      * @return string|null
      */
-    public function createFile($name, $data = null)
+    public function createFile($name, $data = '')
     {
-        if (null === $data) {
-            $data = '';
-        }
         if (is_resource($data)) {
             $data = stream_get_contents($data);
         }
@@ -122,6 +120,8 @@ class Collection extends DAV\Collection
 
     /**
      * Adds an already existing node to this collection.
+     *
+     * @param \Sabre\DAV\INode $node
      */
     public function addNode(\Sabre\DAV\INode $node)
     {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
index 54f7e4cb4..0e3123b35 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
@@ -7,9 +7,11 @@ namespace Sabre\DAV\Mount;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class PluginTest extends DAV\AbstractServer
 {
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
         $this->server->addPlugin(new Plugin());
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
index 7066c49fc..6b6652967 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
@@ -4,11 +4,13 @@ declare(strict_types=1);
 
 namespace Sabre\DAV;
 
+require_once 'Sabre/TestUtil.php';
+
 class ObjectTreeTest extends \PHPUnit\Framework\TestCase
 {
     protected $tree;
 
-    public function setup(): void
+    public function setup()
     {
         \Sabre\TestUtil::clearTempDir();
         mkdir(SABRE_TEMPDIR.'/root');
@@ -19,7 +21,7 @@ class ObjectTreeTest extends \PHPUnit\Framework\TestCase
         $this->tree = new Tree($rootNode);
     }
 
-    public function teardown(): void
+    public function teardown()
     {
         \Sabre\TestUtil::clearTempDir();
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
index 4d99aee7d..0cf6dc4e4 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
@@ -6,12 +6,14 @@ namespace Sabre\DAV\PartialUpdate;
 
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/PartialUpdate/FileMock.php';
+
 class PluginTest extends \Sabre\DAVServerTest
 {
     protected $node;
     protected $plugin;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->node = new FileMock();
         $this->tree[] = $this->node;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
index a727a13e2..56b2d576f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
@@ -18,7 +18,7 @@ class SpecificationTest extends \PHPUnit\Framework\TestCase
 {
     protected $server;
 
-    public function setup(): void
+    public function setUp()
     {
         $tree = [
             new File(SABRE_TEMPDIR.'/foobar.txt'),
@@ -32,7 +32,7 @@ class SpecificationTest extends \PHPUnit\Framework\TestCase
         $this->server = $server;
     }
 
-    public function teardown(): void
+    public function tearDown()
     {
         \Sabre\TestUtil::clearTempDir();
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
index b1f6754ea..7d55ea02e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
@@ -6,6 +6,8 @@ namespace Sabre\DAV;
 
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class ServerEventsTest extends AbstractServer
 {
     private $tempPath;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
index 47e1e6b4c..bbf820eb5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
@@ -6,6 +6,9 @@ namespace Sabre\DAV;
 
 use Sabre\HTTP;
 
+require_once 'Sabre/DAV/AbstractServer.php';
+require_once 'Sabre/DAV/TestPlugin.php';
+
 class ServerPluginTest extends AbstractServer
 {
     /**
@@ -13,7 +16,7 @@ class ServerPluginTest extends AbstractServer
      */
     protected $testPlugin;
 
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
new file mode 100644
index 000000000..fa88e9095
--- /dev/null
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
@@ -0,0 +1,283 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sabre\DAV;
+
+use Sabre\HTTP;
+
+require_once 'Sabre/HTTP/ResponseMock.php';
+
+class ServerPreconditionsTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @expectedException \Sabre\DAV\Exception\PreconditionFailed
+     */
+    public function testIfMatchNoNode()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/bar', ['If-Match' => '*']);
+        $httpResponse = new HTTP\Response();
+        $server->checkPreconditions($httpRequest, $httpResponse);
+    }
+
+    public function testIfMatchHasNode()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '*']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    /**
+     * @expectedException \Sabre\DAV\Exception\PreconditionFailed
+     */
+    public function testIfMatchWrongEtag()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '1234']);
+        $httpResponse = new HTTP\Response();
+        $server->checkPreconditions($httpRequest, $httpResponse);
+    }
+
+    public function testIfMatchCorrectEtag()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '"abc123"']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    /**
+     * Evolution sometimes uses \" instead of " for If-Match headers.
+     *
+     * @depends testIfMatchCorrectEtag
+     */
+    public function testIfMatchEvolutionEtag()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '\\"abc123\\"']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    public function testIfMatchMultiple()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '"hellothere", "abc123"']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    public function testIfNoneMatchNoNode()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/bar', ['If-None-Match' => '*']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    /**
+     * @expectedException \Sabre\DAV\Exception\PreconditionFailed
+     */
+    public function testIfNoneMatchHasNode()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '*']);
+        $httpResponse = new HTTP\Response();
+        $server->checkPreconditions($httpRequest, $httpResponse);
+    }
+
+    public function testIfNoneMatchWrongEtag()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234"']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    public function testIfNoneMatchWrongEtagMultiple()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234", "5678"']);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    /**
+     * @expectedException \Sabre\DAV\Exception\PreconditionFailed
+     */
+    public function testIfNoneMatchCorrectEtag()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"abc123"']);
+        $httpResponse = new HTTP\Response();
+        $server->checkPreconditions($httpRequest, $httpResponse);
+    }
+
+    /**
+     * @expectedException \Sabre\DAV\Exception\PreconditionFailed
+     */
+    public function testIfNoneMatchCorrectEtagMultiple()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234, "abc123"']);
+        $httpResponse = new HTTP\Response();
+        $server->checkPreconditions($httpRequest, $httpResponse);
+    }
+
+    public function testIfNoneMatchCorrectEtagAsGet()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-None-Match' => '"abc123"']);
+        $server->httpResponse = new HTTP\ResponseMock();
+
+        $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
+        $this->assertEquals(304, $server->httpResponse->getStatus());
+        $this->assertEquals(['ETag' => ['"abc123"']], $server->httpResponse->getHeaders());
+    }
+
+    /**
+     * This was a test written for issue #515.
+     */
+    public function testNoneMatchCorrectEtagEnsureSapiSent()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $server->sapi = new HTTP\SapiMock();
+        HTTP\SapiMock::$sent = 0;
+        $httpRequest = new HTTP\Request('GET', '/foo', ['If-None-Match' => '"abc123"']);
+        $server->httpRequest = $httpRequest;
+        $server->httpResponse = new HTTP\ResponseMock();
+
+        $server->exec();
+
+        $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
+        $this->assertEquals(304, $server->httpResponse->getStatus());
+        $this->assertEquals([
+            'ETag' => ['"abc123"'],
+            'X-Sabre-Version' => [Version::VERSION],
+        ], $server->httpResponse->getHeaders());
+        $this->assertEquals(1, HTTP\SapiMock::$sent);
+    }
+
+    public function testIfModifiedSinceUnModified()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Modified-Since' => 'Sun, 06 Nov 1994 08:49:37 GMT',
+        ]);
+        $server->httpResponse = new HTTP\ResponseMock();
+        $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
+
+        $this->assertEquals(304, $server->httpResponse->status);
+        $this->assertEquals([
+            'Last-Modified' => ['Sat, 06 Apr 1985 23:30:00 GMT'],
+        ], $server->httpResponse->getHeaders());
+    }
+
+    public function testIfModifiedSinceModified()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Modified-Since' => 'Tue, 06 Nov 1984 08:49:37 GMT',
+        ]);
+
+        $httpResponse = new HTTP\ResponseMock();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    public function testIfModifiedSinceInvalidDate()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Modified-Since' => 'Your mother',
+        ]);
+        $httpResponse = new HTTP\ResponseMock();
+
+        // Invalid dates must be ignored, so this should return true
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    public function testIfModifiedSinceInvalidDate2()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Unmodified-Since' => 'Sun, 06 Nov 1994 08:49:37 EST',
+        ]);
+        $httpResponse = new HTTP\ResponseMock();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    public function testIfUnmodifiedSinceUnModified()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Unmodified-Since' => 'Sun, 06 Nov 1994 08:49:37 GMT',
+        ]);
+        $httpResponse = new HTTP\Response();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+
+    /**
+     * @expectedException \Sabre\DAV\Exception\PreconditionFailed
+     */
+    public function testIfUnmodifiedSinceModified()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Unmodified-Since' => 'Tue, 06 Nov 1984 08:49:37 GMT',
+        ]);
+        $httpResponse = new HTTP\ResponseMock();
+        $server->checkPreconditions($httpRequest, $httpResponse);
+    }
+
+    public function testIfUnmodifiedSinceInvalidDate()
+    {
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
+        $server = new Server($root);
+        $httpRequest = new HTTP\Request('GET', '/foo', [
+            'If-Unmodified-Since' => 'Sun, 06 Nov 1984 08:49:37 CET',
+        ]);
+        $httpResponse = new HTTP\ResponseMock();
+        $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
+    }
+}
+
+class ServerPreconditionsNode extends File
+{
+    public function getETag()
+    {
+        return '"abc123"';
+    }
+
+    public function getLastModified()
+    {
+        /* my birthday & time, I believe */
+        return strtotime('1985-04-07 01:30 +02:00');
+    }
+
+    public function getName()
+    {
+        return 'foo';
+    }
+}
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php
index cd1ccfa53..def9a9cfb 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php
@@ -6,6 +6,9 @@ namespace Sabre\DAV;
 
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+require_once 'Sabre/DAV/AbstractServer.php';
+
 class ServerPropsTest extends AbstractServer
 {
     protected function getRootNode()
@@ -13,7 +16,7 @@ class ServerPropsTest extends AbstractServer
         return new FSExt\Directory(SABRE_TEMPDIR);
     }
 
-    public function setup(): void
+    public function setUp()
     {
         if (file_exists(SABRE_TEMPDIR.'../.sabredav')) {
             unlink(SABRE_TEMPDIR.'../.sabredav');
@@ -25,7 +28,7 @@ class ServerPropsTest extends AbstractServer
         $this->server->addPlugin(new Locks\Plugin(new Locks\Backend\File(SABRE_TEMPDIR.'/.locksdb')));
     }
 
-    public function teardown(): void
+    public function tearDown()
     {
         parent::tearDown();
         if (file_exists(SABRE_TEMPDIR.'../.locksdb')) {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
index 6d5be4608..93ea083d8 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
@@ -23,7 +23,7 @@ class ServerRangeTest extends \Sabre\DAVServerTest
      */
     protected $lastModified;
 
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
         $this->server->createFile('files/test.txt', 'Test contents');
@@ -133,7 +133,7 @@ class ServerRangeTest extends \Sabre\DAVServerTest
         $request = new HTTP\Request('GET', '/files/no-seeking.txt', ['Range' => 'bytes=2-5']);
         $response = $this->request($request);
 
-        $this->assertEquals(206, $response->getStatus());
+        $this->assertEquals(206, $response->getStatus(), $response);
         $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
             'Content-Type' => ['application/octet-stream'],
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
index e4dd3cdb6..563f558eb 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
@@ -18,9 +18,11 @@ class ServerSimpleTest extends AbstractServer
         $this->assertEquals($nodes[0], $server->tree->getNodeForPath('hello'));
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception
+     */
     public function testConstructInvalidArg()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $server = new Server(1);
     }
 
@@ -187,9 +189,11 @@ class ServerSimpleTest extends AbstractServer
         }
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testCalculateUriBreakout()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $uri = '/path1/';
 
         $this->server->setBaseUri('/path2/');
@@ -307,10 +311,10 @@ class ServerSimpleTest extends AbstractServer
 
     /**
      * @depends testGuessBaseUri
+     * @expectedException \Sabre\DAV\Exception
      */
     public function testGuessBaseUriBadConfig()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $serverVars = [
             'REQUEST_METHOD' => 'GET',
             'REQUEST_URI' => '/index.php/root/heyyy',
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
index bc36c6b78..1e4b92197 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
@@ -72,15 +72,19 @@ class StringUtilTest extends \PHPUnit\Framework\TestCase
         ];
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
+     */
     public function testBadCollation()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         StringUtil::textMatch('foobar', 'foo', 'blabla', 'contains');
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
+     */
     public function testBadMatchType()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         StringUtil::textMatch('foobar', 'foo', 'i;octet', 'booh');
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
index 951078bf0..bae5b58bf 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
@@ -8,7 +8,7 @@ use Sabre\HTTP;
 
 class TemporaryFileFilterTest extends AbstractServer
 {
-    public function setup(): void
+    public function setUp()
     {
         parent::setUp();
         $plugin = new TemporaryFileFilterPlugin(SABRE_TEMPDIR.'/tff');
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
index e3f04ea3a..51ff5ccde 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
@@ -203,6 +203,8 @@ class TreeFileTester extends File implements IProperties
      *
      * To update specific properties, call the 'handle' method on this object.
      * Read the PropPatch documentation for more information.
+     *
+     * @param PropPatch $propPatch
      */
     public function propPatch(PropPatch $propPatch)
     {
@@ -219,6 +221,8 @@ class TreeMultiGetTester extends TreeDirectoryTester implements IMultiGet
      *
      * If any children are not found, you do not have to return them.
      *
+     * @param array $paths
+     *
      * @return array
      */
     public function getMultipleChildren(array $paths)
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
index 715559df3..3627991bf 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
@@ -9,9 +9,11 @@ use Sabre\HTTP;
 
 class ACLMethodTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @expectedException \Sabre\DAV\Exception\BadRequest
+     */
     public function testCallback()
     {
-        $this->expectException('Sabre\DAV\Exception\BadRequest');
         $acl = new Plugin();
         $server = new DAV\Server();
         $server->addPlugin(new DAV\Auth\Plugin());
@@ -21,11 +23,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
     }
 
     /**
-    /**
+     /**
+     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
      */
     public function testNotSupportedByNode()
     {
-        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $tree = [
             new DAV\SimpleCollection('test'),
         ];
@@ -62,9 +64,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($acl->httpACL($server->httpRequest, $server->httpResponse));
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NotRecognizedPrincipal
+     */
     public function testUnrecognizedPrincipal()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NotRecognizedPrincipal');
         $tree = [
             new MockACLNode('test', []),
         ];
@@ -85,9 +89,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NotRecognizedPrincipal
+     */
     public function testUnrecognizedPrincipal2()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NotRecognizedPrincipal');
         $tree = [
             new MockACLNode('test', []),
             new DAV\SimpleCollection('principals', [
@@ -111,9 +117,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NotSupportedPrivilege
+     */
     public function testUnknownPrivilege()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NotSupportedPrivilege');
         $tree = [
             new MockACLNode('test', []),
         ];
@@ -134,9 +142,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NoAbstract
+     */
     public function testAbstractPrivilege()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NoAbstract');
         $tree = [
             new MockACLNode('test', []),
         ];
@@ -160,9 +170,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\AceConflict
+     */
     public function testUpdateProtectedPrivilege()
     {
-        $this->expectException('Sabre\DAVACL\Exception\AceConflict');
         $oldACL = [
             [
                 'principal' => 'principals/notfound',
@@ -191,9 +203,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\AceConflict
+     */
     public function testUpdateProtectedPrivilege2()
     {
-        $this->expectException('Sabre\DAVACL\Exception\AceConflict');
         $oldACL = [
             [
                 'principal' => 'principals/notfound',
@@ -222,9 +236,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\AceConflict
+     */
     public function testUpdateProtectedPrivilege3()
     {
-        $this->expectException('Sabre\DAVACL\Exception\AceConflict');
         $oldACL = [
             [
                 'principal' => 'principals/notfound',
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
index 04dd29c04..724abc685 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
@@ -13,7 +13,7 @@ class AllowAccessTest extends \PHPUnit\Framework\TestCase
      */
     protected $server;
 
-    public function setup(): void
+    public function setUp()
     {
         $nodes = [
             new DAV\Mock\Collection('testdir', [
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
index 566167ef0..3c3aaf6c9 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
@@ -14,7 +14,7 @@ class BlockAccessTest extends \PHPUnit\Framework\TestCase
     protected $server;
     protected $plugin;
 
-    public function setup(): void
+    public function setUp()
     {
         $nodes = [
             new DAV\SimpleCollection('testdir'),
@@ -36,9 +36,11 @@ class BlockAccessTest extends \PHPUnit\Framework\TestCase
         $this->server->addPlugin($this->plugin);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testGet()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('GET');
         $this->server->httpRequest->setUrl('/testdir');
 
@@ -54,87 +56,107 @@ class BlockAccessTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($r);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testHEAD()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('HEAD');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testOPTIONS()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('OPTIONS');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testPUT()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('PUT');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testPROPPATCH()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('PROPPATCH');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testCOPY()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('COPY');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testMOVE()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('MOVE');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testACL()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('ACL');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testLOCK()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->httpRequest->setMethod('LOCK');
         $this->server->httpRequest->setUrl('/testdir');
 
         $this->server->emit('beforeMethod:GET', [$this->server->httpRequest, $this->server->httpResponse]);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testBeforeBind()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->emit('beforeBind', ['testdir/file']);
     }
 
+    /**
+     * @expectedException \Sabre\DAVACL\Exception\NeedPrivileges
+     */
     public function testBeforeUnbind()
     {
-        $this->expectException('Sabre\DAVACL\Exception\NeedPrivileges');
         $this->server->emit('beforeUnbind', ['testdir']);
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
index 8afe6d30f..d0b67cfae 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
@@ -7,6 +7,8 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class ExpandPropertiesTest extends \PHPUnit\Framework\TestCase
 {
     public function getServer()
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
index 048b9f249..9ab16df74 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
@@ -7,11 +7,14 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAVACL/MockACLNode.php';
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class PluginAdminTest extends \PHPUnit\Framework\TestCase
 {
     public $server;
 
-    public function setup(): void
+    public function setUp()
     {
         $principalBackend = new PrincipalBackend\Mock();
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
index e6796e014..169629a03 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
@@ -72,9 +72,11 @@ class PluginUpdatePropertiesTest extends \PHPUnit\Framework\TestCase
         $this->assertEquals(['bar', 'baz'], $tree[0]->getGroupMemberSet());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception
+     */
     public function testSetBadValue()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $tree = [
             new MockPrincipal('foo', 'foo'),
         ];
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
index b18ab9488..95775d8fe 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
@@ -10,7 +10,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 {
     use DAV\DbTestHelperTrait;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->dropTables(['principals', 'groupmembers']);
         $this->createSchema('principals');
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
index 5f0434579..551a77900 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
@@ -126,7 +126,8 @@ class Mock extends AbstractBackend
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param string $path
+     * @param string               $path
+     * @param \Sabre\DAV\PropPatch $propPatch
      */
     public function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch)
     {
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
index 2777281a8..68aebe2ae 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
@@ -33,10 +33,10 @@ class PrincipalCollectionTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testBasic
+     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
      */
     public function testGetChildrenDisable()
     {
-        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $backend = new PrincipalBackend\Mock();
         $pc = new PrincipalCollection($backend);
         $pc->disableListing = true;
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
index 6883f25b4..55c64721e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
@@ -7,6 +7,8 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class PrincipalPropertySearchTest extends \PHPUnit\Framework\TestCase
 {
     public function getServer()
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
index ec834fe1a..b44b46fc5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
@@ -7,6 +7,8 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/HTTP/ResponseMock.php';
+
 class PrincipalSearchPropertySetTest extends \PHPUnit\Framework\TestCase
 {
     public function getServer()
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
index 7e1656a15..a4821da5a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
@@ -15,9 +15,11 @@ class PrincipalTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($principal instanceof Principal);
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception
+     */
     public function testConstructNoUri()
     {
-        $this->expectException('Sabre\DAV\Exception');
         $principalBackend = new PrincipalBackend\Mock();
         $principal = new Principal($principalBackend, []);
     }
@@ -175,9 +177,11 @@ class PrincipalTest extends \PHPUnit\Framework\TestCase
         ], $principal->getACL());
     }
 
+    /**
+     * @expectedException \Sabre\DAV\Exception\Forbidden
+     */
     public function testSetACl()
     {
-        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $principalBackend = new PrincipalBackend\Mock();
         $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
         $principal->setACL([]);
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
index effa15838..a1e9ee36c 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
@@ -7,6 +7,9 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
+require_once 'Sabre/DAVACL/MockPrincipal.php';
+require_once 'Sabre/DAVACL/MockACLNode.php';
+
 class SimplePluginTest extends \PHPUnit\Framework\TestCase
 {
     public function testValues()
diff --git a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
index 2f64df08c..982090d23 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
@@ -43,7 +43,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
     protected $carddavCards = [];
 
     /**
-     * @var \Sabre\DAV\Server
+     * @var Sabre\DAV\Server
      */
     protected $server;
     protected $tree = [];
@@ -82,17 +82,12 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
     protected $caldavSchedulePlugin;
 
     /**
-     * @var CalDAV\ICSExportPlugin
-     */
-    protected $caldavICSExportPlugin;
-
-    /**
-     * @var \Sabre\DAV\Auth\Plugin
+     * @var Sabre\DAV\Auth\Plugin
      */
     protected $authPlugin;
 
     /**
-     * @var \Sabre\DAV\Locks\Plugin
+     * @var Sabre\DAV\Locks\Plugin
      */
     protected $locksPlugin;
 
@@ -114,7 +109,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
      */
     protected $autoLogin = null;
 
-    public function setup(): void
+    public function setUp()
     {
         $this->initializeEverything();
     }
@@ -198,7 +193,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
     public function request($request, $expectedStatus = null)
     {
         if (is_array($request)) {
-            $request = HTTP\Sapi::createFromServerArray($request);
+            $request = HTTP\Request::createFromServerArray($request);
         }
         $response = new HTTP\ResponseMock();
 
@@ -300,6 +295,6 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
     public function assertHttpStatus($expectedStatus, HTTP\Request $req)
     {
         $resp = $this->request($req);
-        $this->assertEquals((int) $expectedStatus, (int) $resp->getStatus(), 'Incorrect HTTP status received: '.$resp->getStatus());
+        $this->assertEquals((int) $expectedStatus, (int) $resp->status, 'Incorrect HTTP status received: '.$resp->body);
     }
 }
diff --git a/vendor/sabre/dav/tests/bootstrap.php b/vendor/sabre/dav/tests/bootstrap.php
index d15805382..bc79b86ab 100644
--- a/vendor/sabre/dav/tests/bootstrap.php
+++ b/vendor/sabre/dav/tests/bootstrap.php
@@ -44,7 +44,6 @@ $config = [
 ];
 
 if (file_exists(__DIR__.'/config.user.php')) {
-    $userConfig = [];
     include __DIR__.'/config.user.php';
     foreach ($userConfig as $key => $value) {
         $config[$key] = $value;