1 files changed, 11 insertions, 13 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
index daa04c354..79ffb0186 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
@@ -7,8 +7,6 @@ namespace Sabre\DAV\FSExt;
 use Sabre\DAV;
 use Sabre\HTTP;
 
-require_once 'Sabre/DAV/AbstractServer.php';
-
 class ServerTest extends DAV\AbstractServer
 {
     protected function getRootNode()
@@ -34,7 +32,7 @@ class ServerTest extends DAV\AbstractServer
             $this->response->getHeaders()
          );
 
-        $this->assertEquals('Test contents', stream_get_contents($this->response->body));
+        $this->assertEquals('Test contents', $this->response->getBodyAsString());
     }
 
     public function testHEAD()
@@ -55,7 +53,7 @@ class ServerTest extends DAV\AbstractServer
          );
 
         $this->assertEquals(200, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
     }
 
     public function testPut()
@@ -73,7 +71,7 @@ class ServerTest extends DAV\AbstractServer
         ], $this->response->getHeaders());
 
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
         $this->assertEquals('Testing new file', file_get_contents($filename));
     }
 
@@ -105,7 +103,7 @@ class ServerTest extends DAV\AbstractServer
         ], $this->response->getHeaders());
 
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
         $this->assertTrue(is_dir($this->tempDir.'/testcol'));
     }
 
@@ -119,7 +117,7 @@ class ServerTest extends DAV\AbstractServer
         $this->assertEquals('0', $this->response->getHeader('Content-Length'));
 
         $this->assertEquals(204, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
         $this->assertEquals('Testing updated file', file_get_contents($this->tempDir.'/test.txt'));
     }
 
@@ -135,7 +133,7 @@ class ServerTest extends DAV\AbstractServer
         ], $this->response->getHeaders());
 
         $this->assertEquals(204, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
         $this->assertFalse(file_exists($this->tempDir.'/test.txt'));
     }
 
@@ -153,7 +151,7 @@ class ServerTest extends DAV\AbstractServer
             'Content-Length' => ['0'],
         ], $this->response->getHeaders());
         $this->assertEquals(204, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
         $this->assertFalse(file_exists($this->tempDir.'/testcol'));
     }
 
@@ -173,7 +171,7 @@ class ServerTest extends DAV\AbstractServer
         ], $this->response->getHeaders());
 
         $this->assertEquals(200, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
     }
 
     public function testMove()
@@ -185,7 +183,7 @@ class ServerTest extends DAV\AbstractServer
         $this->server->exec();
 
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
 
         $this->assertEquals([
             'Content-Length' => ['0'],
@@ -220,7 +218,7 @@ class ServerTest extends DAV\AbstractServer
         $this->server->exec();
 
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
 
         $this->assertEquals([
             'Content-Length' => ['0'],
@@ -241,7 +239,7 @@ class ServerTest extends DAV\AbstractServer
         $this->server->exec();
 
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals('', $this->response->body);
+        $this->assertEquals('', $this->response->getBodyAsString());
 
         $this->assertEquals([
             'Content-Length' => ['0'],