From fae70bf0a7f1b566d25e30064f60d58ab150951a Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 7 May 2020 23:35:02 +0200
Subject: Revert "composer updates"

This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00
---
 .../sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php | 36 ++++++++++++++++------
 1 file changed, 26 insertions(+), 10 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 715559df3..3627991bf 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
@@ -9,9 +9,11 @@ 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());
@@ -21,11 +23,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'),
         ];
@@ -62,9 +64,11 @@ 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', []),
         ];
@@ -85,9 +89,11 @@ 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', [
@@ -111,9 +117,11 @@ 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', []),
         ];
@@ -134,9 +142,11 @@ 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', []),
         ];
@@ -160,9 +170,11 @@ 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',
@@ -191,9 +203,11 @@ 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',
@@ -222,9 +236,11 @@ 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