From f132436af3c90cff8dcef852bd836546311036f3 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 7 May 2020 21:48:26 +0000
Subject: composer updates 2

---
 .../sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php | 36 ++++++----------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php')

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
index 3627991bf..715559df3 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
@@ -9,11 +9,9 @@ use Sabre\HTTP;
 
 class ACLMethodTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @expectedException \Sabre\DAV\Exception\BadRequest
-     */
     public function testCallback()
     {
+        $this->expectException('Sabre\DAV\Exception\BadRequest');
         $acl = new Plugin();
         $server = new DAV\Server();
         $server->addPlugin(new DAV\Auth\Plugin());
@@ -23,11 +21,11 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
     }
 
     /**
-     /**
-     * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
+    /**
      */
     public function testNotSupportedByNode()
     {
+        $this->expectException('Sabre\DAV\Exception\MethodNotAllowed');
         $tree = [
             new DAV\SimpleCollection('test'),
         ];
@@ -64,11 +62,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $this->assertFalse($acl->httpACL($server->httpRequest, $server->httpResponse));
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\NotRecognizedPrincipal
-     */
     public function testUnrecognizedPrincipal()
     {
+        $this->expectException('Sabre\DAVACL\Exception\NotRecognizedPrincipal');
         $tree = [
             new MockACLNode('test', []),
         ];
@@ -89,11 +85,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\NotRecognizedPrincipal
-     */
     public function testUnrecognizedPrincipal2()
     {
+        $this->expectException('Sabre\DAVACL\Exception\NotRecognizedPrincipal');
         $tree = [
             new MockACLNode('test', []),
             new DAV\SimpleCollection('principals', [
@@ -117,11 +111,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\NotSupportedPrivilege
-     */
     public function testUnknownPrivilege()
     {
+        $this->expectException('Sabre\DAVACL\Exception\NotSupportedPrivilege');
         $tree = [
             new MockACLNode('test', []),
         ];
@@ -142,11 +134,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\NoAbstract
-     */
     public function testAbstractPrivilege()
     {
+        $this->expectException('Sabre\DAVACL\Exception\NoAbstract');
         $tree = [
             new MockACLNode('test', []),
         ];
@@ -170,11 +160,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\AceConflict
-     */
     public function testUpdateProtectedPrivilege()
     {
+        $this->expectException('Sabre\DAVACL\Exception\AceConflict');
         $oldACL = [
             [
                 'principal' => 'principals/notfound',
@@ -203,11 +191,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\AceConflict
-     */
     public function testUpdateProtectedPrivilege2()
     {
+        $this->expectException('Sabre\DAVACL\Exception\AceConflict');
         $oldACL = [
             [
                 'principal' => 'principals/notfound',
@@ -236,11 +222,9 @@ class ACLMethodTest extends \PHPUnit\Framework\TestCase
         $acl->httpACL($server->httpRequest, $server->httpResponse);
     }
 
-    /**
-     * @expectedException \Sabre\DAVACL\Exception\AceConflict
-     */
     public function testUpdateProtectedPrivilege3()
     {
+        $this->expectException('Sabre\DAVACL\Exception\AceConflict');
         $oldACL = [
             [
                 'principal' => 'principals/notfound',
-- 
cgit v1.2.3