composer updates 2

1 files changed, 11 insertions, 6 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
index 982090d23..2f64df08c 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,12 +82,17 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
     protected $caldavSchedulePlugin;
 
     /**
-     * @var Sabre\DAV\Auth\Plugin
+     * @var CalDAV\ICSExportPlugin
+     */
+    protected $caldavICSExportPlugin;
+
+    /**
+     * @var \Sabre\DAV\Auth\Plugin
      */
     protected $authPlugin;
 
     /**
-     * @var Sabre\DAV\Locks\Plugin
+     * @var \Sabre\DAV\Locks\Plugin
      */
     protected $locksPlugin;
 
@@ -109,7 +114,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
      */
     protected $autoLogin = null;
 
-    public function setUp()
+    public function setup(): void
     {
         $this->initializeEverything();
     }
@@ -193,7 +198,7 @@ abstract class DAVServerTest extends \PHPUnit\Framework\TestCase
     public function request($request, $expectedStatus = null)
     {
         if (is_array($request)) {
-            $request = HTTP\Request::createFromServerArray($request);
+            $request = HTTP\Sapi::createFromServerArray($request);
         }
         $response = new HTTP\ResponseMock();
 
@@ -295,6 +300,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->status, 'Incorrect HTTP status received: '.$resp->body);
+        $this->assertEquals((int) $expectedStatus, (int) $resp->getStatus(), 'Incorrect HTTP status received: '.$resp->getStatus());
     }
 }