Merge remote-tracking branch 'upstream/2021.06-rc' into http-input-data

[friendica.git] / tests / src / Util / ACLFormaterTest.php

diff --git a/tests/src/Util/ACLFormaterTest.php b/tests/src/Util/ACLFormaterTest.php
index 37535b55859039eccceca0fbed38a51fb1198985..f0fb9590f58bd5e1269da1184a03352bfc397abd 100644 (file)
--- a/tests/src/Util/ACLFormaterTest.php
+++ b/tests/src/Util/ACLFormaterTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Test\src\Util;
 
-use Error;
 use Friendica\Model\Group;
 use Friendica\Util\ACLFormatter;
 use PHPUnit\Framework\TestCase;
@@ -37,18 +36,18 @@ class ACLFormaterTest extends TestCase
 
                $acl = $aclFormatter->expand($text);
 
-               $this->assertEquals($assert, $acl);
+               self::assertEquals($assert, $acl);
 
-               $this->assertMergable($acl);
+               self::assertMergable($acl);
        }
 
        public function assertMergable(array $aclOne, array $aclTwo = [])
        {
-               $this->assertTrue(is_array($aclOne));
-               $this->assertTrue(is_array($aclTwo));
+               self::assertTrue(is_array($aclOne));
+               self::assertTrue(is_array($aclTwo));
 
                $aclMerged = array_unique(array_merge($aclOne, $aclTwo));
-               $this->assertTrue(is_array($aclMerged));
+               self::assertTrue(is_array($aclMerged));
 
                return $aclMerged;
        }
@@ -118,7 +117,7 @@ class ACLFormaterTest extends TestCase
         */
        public function testExpand($input, array $assert)
        {
-               $this->assertAcl($input, $assert);
+               self::assertAcl($input, $assert);
        }
 
        /**
@@ -131,11 +130,11 @@ class ACLFormaterTest extends TestCase
                $allow_people = $aclFormatter->expand();
                $allow_groups = $aclFormatter->expand();
 
-               $this->assertEmpty($aclFormatter->expand(null));
-               $this->assertEmpty($aclFormatter->expand());
+               self::assertEmpty($aclFormatter->expand(null));
+               self::assertEmpty($aclFormatter->expand());
 
                $recipients   = array_unique(array_merge($allow_people, $allow_groups));
-               $this->assertEmpty($recipients);
+               self::assertEmpty($recipients);
        }
 
        public function dataAclToString()
@@ -188,6 +187,6 @@ class ACLFormaterTest extends TestCase
        {
                $aclFormatter = new ACLFormatter();
 
-               $this->assertEquals($assert, $aclFormatter->toString($input));
+               self::assertEquals($assert, $aclFormatter->toString($input));
        }
 }