Merge branch '5.0RC'5.0

2 files changed, 6 insertions, 18 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
index 8036635b2..95ff86fa1 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
@@ -39,20 +39,16 @@ class ProxyReadTest extends \PHPUnit\Framework\TestCase
         $this->assertNull($i->getLastModified());
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\Forbidden
-     */
     public function testDelete()
     {
+        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $i = $this->getInstance();
         $i->delete();
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\Forbidden
-     */
     public function testSetName()
     {
+        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $i = $this->getInstance();
         $i->setName('foo');
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
index 2c690c65d..fd079acb2 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
@@ -26,20 +26,16 @@ class UserTest extends \PHPUnit\Framework\TestCase
         ]);
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\Forbidden
-     */
     public function testCreateFile()
     {
+        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $u = $this->getInstance();
         $u->createFile('test');
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\Forbidden
-     */
     public function testCreateDirectory()
     {
+        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $u = $this->getInstance();
         $u->createDirectory('test');
     }
@@ -58,20 +54,16 @@ class UserTest extends \PHPUnit\Framework\TestCase
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyWrite', $child);
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\NotFound
-     */
     public function testGetChildNotFound()
     {
+        $this->expectException('Sabre\DAV\Exception\NotFound');
         $u = $this->getInstance();
         $child = $u->getChild('foo');
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\NotFound
-     */
     public function testGetChildNotFound2()
     {
+        $this->expectException('Sabre\DAV\Exception\NotFound');
         $u = $this->getInstance();
         $child = $u->getChild('random');
     }