Merge branch '5.0RC'5.0

1 files changed, 2 insertions, 6 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
index a4821da5a..7e1656a15 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
@@ -15,11 +15,9 @@ class PrincipalTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($principal instanceof Principal);
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception
-     */
     public function testConstructNoUri()
     {
+        $this->expectException('Sabre\DAV\Exception');
         $principalBackend = new PrincipalBackend\Mock();
         $principal = new Principal($principalBackend, []);
     }
@@ -177,11 +175,9 @@ class PrincipalTest extends \PHPUnit\Framework\TestCase
         ], $principal->getACL());
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception\Forbidden
-     */
     public function testSetACl()
     {
+        $this->expectException('Sabre\DAV\Exception\Forbidden');
         $principalBackend = new PrincipalBackend\Mock();
         $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
         $principal->setACL([]);