Merge branch '5.0RC'5.0

2 files changed, 9 insertions, 11 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
index 63d692ec9..4d99aee7d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
@@ -6,14 +6,12 @@ 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()
+    public function setup(): void
     {
         $this->node = new FileMock();
         $this->tree[] = $this->node;
@@ -44,7 +42,7 @@ class PluginTest extends \Sabre\DAVServerTest
         ]);
         $response = $this->request($request);
 
-        $this->assertEquals(400, $response->status, 'Full response body:'.$response->body);
+        $this->assertEquals(400, $response->status, 'Full response body:'.$response->getBodyAsString());
     }
 
     public function testPatchNotSupported()
@@ -56,7 +54,7 @@ class PluginTest extends \Sabre\DAVServerTest
         );
         $response = $this->request($request);
 
-        $this->assertEquals(405, $response->status, 'Full response body:'.$response->body);
+        $this->assertEquals(405, $response->status, 'Full response body:'.$response->getBodyAsString());
     }
 
     public function testPatchNoContentType()
@@ -68,7 +66,7 @@ class PluginTest extends \Sabre\DAVServerTest
         );
         $response = $this->request($request);
 
-        $this->assertEquals(415, $response->status, 'Full response body:'.$response->body);
+        $this->assertEquals(415, $response->status, 'Full response body:'.$response->getBodyAsString());
     }
 
     public function testPatchBadRange()
@@ -80,7 +78,7 @@ class PluginTest extends \Sabre\DAVServerTest
         );
         $response = $this->request($request);
 
-        $this->assertEquals(416, $response->status, 'Full response body:'.$response->body);
+        $this->assertEquals(416, $response->status, 'Full response body:'.$response->getBodyAsString());
     }
 
     public function testPatchNoLength()
@@ -92,7 +90,7 @@ class PluginTest extends \Sabre\DAVServerTest
         );
         $response = $this->request($request);
 
-        $this->assertEquals(411, $response->status, 'Full response body:'.$response->body);
+        $this->assertEquals(411, $response->status, 'Full response body:'.$response->getBodyAsString());
     }
 
     public function testPatchSuccess()
@@ -104,7 +102,7 @@ class PluginTest extends \Sabre\DAVServerTest
         );
         $response = $this->request($request);
 
-        $this->assertEquals(204, $response->status, 'Full response body:'.$response->body);
+        $this->assertEquals(204, $response->status, 'Full response body:'.$response->getBodyAsString());
         $this->assertEquals('aaabbbaa', $this->node->get());
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
index 56b2d576f..a727a13e2 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()
+    public function setup(): void
     {
         $tree = [
             new File(SABRE_TEMPDIR.'/foobar.txt'),
@@ -32,7 +32,7 @@ class SpecificationTest extends \PHPUnit\Framework\TestCase
         $this->server = $server;
     }
 
-    public function tearDown()
+    public function teardown(): void
     {
         \Sabre\TestUtil::clearTempDir();
     }