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