Rename method again

diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php
index 47d5409d5b325a03c1925a6b3f1de1b7e3b1a0f0..5ee1b65d88cd0885833e8c12f084716ad780f552 100644 (file)
--- a/src/Module/ActivityPub/Objects.php
+++ b/src/Module/ActivityPub/Objects.php
@@ -86,7 +86,7 @@ class Objects extends BaseModule
                                        $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $item['uid']);
                                        if (!empty($permissionSets)) {
                                                $psid = array_merge($permissionSets->column('id'),
-                                                       [DI::permissionSet()->selectPublic($item['uid'])]);
+                                                       [DI::permissionSet()->selectPublicForUser($item['uid'])]);
                                                $validated = in_array($item['psid'], $psid);
                                        }
                                }

diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php
index c2d691f1cf1e63139704b53e364bbeed784f8a7f..e93fc5699e005ff76841992ef63bb2a5d2275ebd 100644 (file)
--- a/src/Module/Profile/Status.php
+++ b/src/Module/Profile/Status.php
@@ -213,7 +213,7 @@ class Status extends BaseProfile
                                $permissionSets = DI::permissionSet()->selectByContactId($remote_user, $profile['uid']);
                                if (!empty($permissionSets)) {
                                        $condition = ['psid' => array_merge($permissionSets->column('id'),
-                                                       [DI::permissionSet()->selectPublic($profile['uid'])->id])];
+                                                       [DI::permissionSet()->selectPublicForUser($profile['uid'])->id])];
                                }
                        } elseif ($profile['uid'] == local_user()) {
                                $condition = [];

diff --git a/src/Profile/ProfileField/Depository/ProfileField.php b/src/Profile/ProfileField/Depository/ProfileField.php
index 79bf21b4905ce9a629f9f4eb26516d8bc90b7d48..b792edf8f745d7ab440fd1099867fdb2981d0d64 100644 (file)
--- a/src/Profile/ProfileField/Depository/ProfileField.php
+++ b/src/Profile/ProfileField/Depository/ProfileField.php
@@ -125,7 +125,7 @@ class ProfileField extends BaseDepository
        public function selectPublicFieldsByUserId(int $uid): Collection\ProfileFields
        {
                try {
-                       $publicPermissionSet = $this->permissionSetDepository->selectPublic($uid);
+                       $publicPermissionSet = $this->permissionSetDepository->selectPublicForUser($uid);
 
                        return $this->select([
                                'uid'  => $uid,
@@ -168,7 +168,7 @@ class ProfileField extends BaseDepository
                $permissionSetIds = $permissionSets->column('id');
 
                // Includes public custom fields
-               $permissionSetIds[] = $this->permissionSetDepository->selectPublic($uid)->id;
+               $permissionSetIds[] = $this->permissionSetDepository->selectPublicForUser($uid)->id;
 
                return $this->select(
                        ['uid' => $uid, 'psid' => $permissionSetIds],

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index f0ed0cf5a897d2f0fae698f02c29101ed349c116..ab7b63866db4e89a6c530334419193a3152734ef 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -229,7 +229,7 @@ class Transmitter
                                $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']);
                                if (!empty($permissionSets)) {
                                        $condition = ['psid' => array_merge($permissionSets->column('id'),
-                                                       [DI::permissionSet()->selectPublic($owner['uid'])])];
+                                                       [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
                                }
                        }
                }

diff --git a/src/Security/PermissionSet/Depository/PermissionSet.php b/src/Security/PermissionSet/Depository/PermissionSet.php
index b65a933b4835cf108dbc458421843d2bd75ba982..09ecceaf0185e5db22b24d2bc39542c3ef086eee 100644 (file)
--- a/src/Security/PermissionSet/Depository/PermissionSet.php
+++ b/src/Security/PermissionSet/Depository/PermissionSet.php
@@ -202,7 +202,7 @@ class PermissionSet extends BaseDepository
         *
         * @return Entity\PermissionSet
         */
-       public function selectPublic(int $uid): Entity\PermissionSet
+       public function selectPublicForUser(int $uid): Entity\PermissionSet
        {
                return $this->factory->createFromString($uid, '', '', '', '', self::PUBLIC);
        }
@@ -222,7 +222,7 @@ class PermissionSet extends BaseDepository
 
                // Don't select/update Public permission sets
                if ($this->checkPublic($permissionSet)) {
-                       return $this->selectPublic($permissionSet->uid);
+                       return $this->selectPublicForUser($permissionSet->uid);
                }
 
                try {
@@ -242,7 +242,7 @@ class PermissionSet extends BaseDepository
        {
                // Don't save/update the common public PermissionSet
                if ($this->checkPublic($permissionSet)) {
-                       return $this->selectPublic($permissionSet->uid);
+                       return $this->selectPublicForUser($permissionSet->uid);
                }
 
                $fields = $this->convertToTableRow($permissionSet);

diff --git a/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php b/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php
index ecd4014fa64e759ccd3a8548116ca588aab8d280..2218deebb3ac7d031956d5ba30a31d81845f7613 100644 (file)
--- a/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php
+++ b/tests/src/Profile/ProfileField/Depository/ProfileFieldTest.php
@@ -136,12 +136,12 @@ class ProfileFieldTest extends DatabaseTest
 
                self::assertEquals($savedProfileField, $selectedProfileField);
 
-               $savedProfileField->update('another', 5, $this->permissionSetDepository->selectPublic(42));
+               $savedProfileField->update('another', 5, $this->permissionSetDepository->selectPublicForUser(42));
                self::assertEquals(PermissionSet::PUBLIC, $savedProfileField->permissionSet->id);
 
                $publicProfileField = $this->depository->save($savedProfileField);
 
-               self::assertEquals($this->permissionSetDepository->selectPublic(42), $publicProfileField->permissionSet);
+               self::assertEquals($this->permissionSetDepository->selectPublicForUser(42), $publicProfileField->permissionSet);
                self::assertEquals('another', $publicProfileField->value);
                self::assertEquals(5, $publicProfileField->order);
        }

diff --git a/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php b/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php
index a136ff84c0fa9b3e537ac02aafb7438e384e430b..f5d2e22c64a5dd637005ab5d34f70b8375935502 100644 (file)
--- a/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php
+++ b/tests/src/Security/PermissionSet/Depository/PermissionSetTest.php
@@ -31,7 +31,7 @@ class PermissionSetTest extends DatabaseTest
 
        public function testSelectOneByIdPublic()
        {
-               $permissionSet = $this->depository->selectPublic(1);
+               $permissionSet = $this->depository->selectPublicForUser(1);
 
                $this->assertInstanceOf(\Friendica\Security\PermissionSet\Entity\PermissionSet::class, $permissionSet);
                self::assertEmpty($permissionSet->allow_cid);