Merge branch '5.0RC'5.0

1 files changed, 5 insertions, 11 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
index e9362c8e4..85a95c90e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ClientTest.php
@@ -6,11 +6,9 @@ namespace Sabre\DAV;
 
 use Sabre\HTTP\Response;
 
-require_once 'Sabre/DAV/ClientMock.php';
-
 class ClientTest extends \PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setup(): void
     {
         if (!function_exists('curl_init')) {
             $this->markTestSkipped('CURL must be installed to test the client');
@@ -25,11 +23,9 @@ class ClientTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('Sabre\DAV\ClientMock', $client);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testConstructNoBaseUri()
     {
+        $this->expectException('InvalidArgumentException');
         $client = new ClientMock([]);
     }
 
@@ -139,11 +135,9 @@ XML;
         ], $request->getHeaders());
     }
 
-    /**
-     * @expectedException \Sabre\HTTP\ClientHttpException
-     */
     public function testPropFindError()
     {
+        $this->expectException('Sabre\HTTP\ClientHttpException');
         $client = new ClientMock([
             'baseUri' => '/',
         ]);
@@ -225,10 +219,10 @@ XML;
 
     /**
      * @depends testPropPatch
-     * @expectedException \Sabre\HTTP\ClientHttpException
      */
     public function testPropPatchHTTPError()
     {
+        $this->expectException('Sabre\HTTP\ClientHttpException');
         $client = new ClientMock([
             'baseUri' => '/',
         ]);
@@ -239,10 +233,10 @@ XML;
 
     /**
      * @depends testPropPatch
-     * @expectedException \Sabre\HTTP\ClientException
      */
     public function testPropPatchMultiStatusError()
     {
+        $this->expectException('Sabre\HTTP\ClientException');
         $client = new ClientMock([
             'baseUri' => '/',
         ]);