Move to PermissionSet::isPublic()

diff --git a/src/Security/PermissionSet/Depository/PermissionSet.php b/src/Security/PermissionSet/Depository/PermissionSet.php
index 09ecceaf0185e5db22b24d2bc39542c3ef086eee..b91f45218006e6f18e8c6f15513431c992dc1396 100644 (file)
--- a/src/Security/PermissionSet/Depository/PermissionSet.php
+++ b/src/Security/PermissionSet/Depository/PermissionSet.php
@@ -86,16 +86,6 @@ class PermissionSet extends BaseDepository
                return new Collection\PermissionSets(parent::_select($condition, $params)->getArrayCopy());
        }
 
-       private function checkPublic(Entity\PermissionSet $permissionSet): bool
-       {
-               return (($permissionSet->id === self::PUBLIC) ||
-                               (is_null($permissionSet->id) &&
-                                empty($permissionSet->allow_cid) &&
-                                empty($permissionSet->allow_gid) &&
-                                empty($permissionSet->deny_cid) &&
-                                empty($permissionSet->deny_gid)));
-       }
-
        /**
         * Converts a given PermissionSet into a DB compatible row array
         *
@@ -221,7 +211,7 @@ class PermissionSet extends BaseDepository
                }
 
                // Don't select/update Public permission sets
-               if ($this->checkPublic($permissionSet)) {
+               if ($permissionSet->isPublic()) {
                        return $this->selectPublicForUser($permissionSet->uid);
                }
 
@@ -241,7 +231,7 @@ class PermissionSet extends BaseDepository
        public function save(Entity\PermissionSet $permissionSet): Entity\PermissionSet
        {
                // Don't save/update the common public PermissionSet
-               if ($this->checkPublic($permissionSet)) {
+               if ($permissionSet->isPublic()) {
                        return $this->selectPublicForUser($permissionSet->uid);
                }
 

diff --git a/src/Security/PermissionSet/Entity/PermissionSet.php b/src/Security/PermissionSet/Entity/PermissionSet.php
index 849871647d151e85e55a167f4a3f230d9c41576c..6a04093315f20f3887b424832e8e0876b13fc7a8 100644 (file)
--- a/src/Security/PermissionSet/Entity/PermissionSet.php
+++ b/src/Security/PermissionSet/Entity/PermissionSet.php
@@ -3,6 +3,7 @@
 namespace Friendica\Security\PermissionSet\Entity;
 
 use Friendica\BaseEntity;
+use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
 
 /**
  * @property-read int|null $id
@@ -47,6 +48,21 @@ class PermissionSet extends BaseEntity
                $this->deny_gid  = $deny_gid;
        }
 
+       /**
+        * Checks, if the current PermissionSet is a/the public PermissionSet
+        *
+        * @return bool
+        */
+       public function isPublic(): bool
+       {
+               return (($this->id === PermissionSetDepository::PUBLIC) ||
+                               (is_null($this->id) &&
+                                empty($this->allow_cid) &&
+                                empty($this->allow_gid) &&
+                                empty($this->deny_cid) &&
+                                empty($this->deny_gid)));
+       }
+
        /**
         * Creates a new Entity with a new allowed_cid list (wipes the id because it isn't the same entity anymore)
         *