1 files changed, 46 insertions, 61 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
index 9fef3018d..89f69b10a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
@@ -1,16 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAVACL\PrincipalBackend;
 
 use Sabre\DAV;
-use Sabre\HTTP;
-
-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
+abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
+{
     use DAV\DbTestHelperTrait;
 
-    function setUp() {
-
+    public function setUp()
+    {
         $this->dropTables(['principals', 'groupmembers']);
         $this->createSchema('principals');
 
@@ -19,92 +20,85 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/user','user@example.org','User')");
         $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/group','group@example.org','Group')");
 
-        $pdo->query("INSERT INTO groupmembers (principal_id,member_id) VALUES (5,4)");
-
+        $pdo->query('INSERT INTO groupmembers (principal_id,member_id) VALUES (5,4)');
     }
 
-
-    function testConstruct() {
-
+    public function testConstruct()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
         $this->assertTrue($backend instanceof PDO);
-
     }
 
     /**
      * @depends testConstruct
      */
-    function testGetPrincipalsByPrefix() {
-
+    public function testGetPrincipalsByPrefix()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
         $expected = [
             [
-                'uri'                                   => 'principals/admin',
+                'uri' => 'principals/admin',
                 '{http://sabredav.org/ns}email-address' => 'admin@example.org',
-                '{DAV:}displayname'                     => 'Administrator',
+                '{DAV:}displayname' => 'Administrator',
             ],
             [
-                'uri'                                   => 'principals/user',
+                'uri' => 'principals/user',
                 '{http://sabredav.org/ns}email-address' => 'user@example.org',
-                '{DAV:}displayname'                     => 'User',
+                '{DAV:}displayname' => 'User',
             ],
             [
-                'uri'                                   => 'principals/group',
+                'uri' => 'principals/group',
                 '{http://sabredav.org/ns}email-address' => 'group@example.org',
-                '{DAV:}displayname'                     => 'Group',
+                '{DAV:}displayname' => 'Group',
             ],
         ];
 
         $this->assertEquals($expected, $backend->getPrincipalsByPrefix('principals'));
         $this->assertEquals([], $backend->getPrincipalsByPrefix('foo'));
-
     }
 
     /**
      * @depends testConstruct
      */
-    function testGetPrincipalByPath() {
-
+    public function testGetPrincipalByPath()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
         $expected = [
-            'id'                                    => 4,
-            'uri'                                   => 'principals/user',
+            'id' => 4,
+            'uri' => 'principals/user',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
-            '{DAV:}displayname'                     => 'User',
+            '{DAV:}displayname' => 'User',
         ];
 
         $this->assertEquals($expected, $backend->getPrincipalByPath('principals/user'));
         $this->assertEquals(null, $backend->getPrincipalByPath('foo'));
-
     }
 
-    function testGetGroupMemberSet() {
-
+    public function testGetGroupMemberSet()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
         $expected = ['principals/user'];
 
         $this->assertEquals($expected, $backend->getGroupMemberSet('principals/group'));
-
     }
 
-    function testGetGroupMembership() {
-
+    public function testGetGroupMembership()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
         $expected = ['principals/group'];
 
         $this->assertEquals($expected, $backend->getGroupMembership('principals/user'));
-
     }
 
-    function testSetGroupMemberSet() {
-
+    public function testSetGroupMemberSet()
+    {
         $pdo = $this->getPDO();
 
         // Start situation
@@ -118,12 +112,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         // Adding principals again
         $backend->setGroupMemberSet('principals/group', ['principals/user']);
         $this->assertEquals(['principals/user'], $backend->getGroupMemberSet('principals/group'));
-
-
     }
 
-    function testSearchPrincipals() {
-
+    public function testSearchPrincipals()
+    {
         $pdo = $this->getPDO();
 
         $backend = new PDO($pdo);
@@ -139,11 +131,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $result = $backend->searchPrincipals('mom', ['{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE']);
         $this->assertEquals([], $result);
-
     }
 
-    function testUpdatePrincipal() {
-
+    public function testUpdatePrincipal()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
@@ -157,22 +148,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $this->assertTrue($result);
 
         $this->assertEquals([
-            'id'                                    => 4,
-            'uri'                                   => 'principals/user',
-            '{DAV:}displayname'                     => 'pietje',
+            'id' => 4,
+            'uri' => 'principals/user',
+            '{DAV:}displayname' => 'pietje',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
         ], $backend->getPrincipalByPath('principals/user'));
-
     }
 
-    function testUpdatePrincipalUnknownField() {
-
+    public function testUpdatePrincipalUnknownField()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
         $propPatch = new DAV\PropPatch([
             '{DAV:}displayname' => 'pietje',
-            '{DAV:}unknown'     => 'foo',
+            '{DAV:}unknown' => 'foo',
         ]);
 
         $backend->updatePrincipal('principals/user', $propPatch);
@@ -182,36 +172,31 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals([
             '{DAV:}displayname' => 424,
-            '{DAV:}unknown'     => 403
+            '{DAV:}unknown' => 403,
         ], $propPatch->getResult());
 
         $this->assertEquals([
-            'id'                                    => '4',
-            'uri'                                   => 'principals/user',
-            '{DAV:}displayname'                     => 'User',
+            'id' => '4',
+            'uri' => 'principals/user',
+            '{DAV:}displayname' => 'User',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
         ], $backend->getPrincipalByPath('principals/user'));
-
     }
 
-    function testFindByUriUnknownScheme() {
-
+    public function testFindByUriUnknownScheme()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
         $this->assertNull($backend->findByUri('http://foo', 'principals'));
-
     }
 
-
-    function testFindByUri() {
-
+    public function testFindByUri()
+    {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
         $this->assertEquals(
             'principals/user',
             $backend->findByUri('mailto:user@example.org', 'principals')
         );
-
     }
-
 }