1 files changed, 6 insertions, 14 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
index 7d6414a80..18c3ec126 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
@@ -6,8 +6,6 @@ namespace Sabre\CalDAV;
 
 use Sabre\DAV\PropPatch;
 
-require_once 'Sabre/CalDAV/TestUtil.php';
-
 class CalendarTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -24,7 +22,7 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
      */
     protected $calendars;
 
-    public function setup()
+    public function setup(): void
     {
         $this->backend = TestUtil::getBackend();
 
@@ -33,7 +31,7 @@ class CalendarTest extends \PHPUnit\Framework\TestCase
         $this->calendar = new Calendar($this->backend, $this->calendars[0]);
     }
 
-    public function teardown()
+    public function teardown(): void
     {
         unset($this->backend);
     }
@@ -80,11 +78,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');
     }
 
@@ -110,19 +108,15 @@ 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');
     }
 
@@ -211,11 +205,9 @@ 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([]);
     }