"getStyledURL" is now public

[friendica.git] / src / Security / PermissionSet / Factory / PermissionSet.php

diff --git a/src/Security/PermissionSet/Factory/PermissionSet.php b/src/Security/PermissionSet/Factory/PermissionSet.php
index 9887ffeb11a8f5ab8aaa47f4443bc84966517778..2ef65d8ac8111f5c1916f795a946163ae9f8b1d6 100644 (file)
--- a/src/Security/PermissionSet/Factory/PermissionSet.php
+++ b/src/Security/PermissionSet/Factory/PermissionSet.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Security\PermissionSet\Factory;
 
@@ -20,39 +39,47 @@ class PermissionSet extends BaseFactory implements ICanCreateFromTableRow
                $this->formatter = $formatter;
        }
 
+       /**
+        * @inheritDoc
+        */
        public function createFromTableRow(array $row): Entity\PermissionSet
        {
                return new Entity\PermissionSet(
                        $row['uid'],
-                       $this->formatter->expand($row['allow_cid'] ?? []),
-                       $this->formatter->expand($row['allow_gid'] ?? []),
-                       $this->formatter->expand($row['deny_cid'] ?? []),
-                       $this->formatter->expand($row['deny_gid'] ?? []),
+                       $this->formatter->expand($row['allow_cid'] ?? ''),
+                       $this->formatter->expand($row['allow_gid'] ?? ''),
+                       $this->formatter->expand($row['deny_cid'] ?? ''),
+                       $this->formatter->expand($row['deny_gid'] ?? ''),
                        $row['id'] ?? null
                );
        }
 
+       /**
+        * Creates a new PermissionSet based on it's fields
+        *
+        * @param int    $uid
+        * @param string $allow_cid
+        * @param string $allow_gid
+        * @param string $deny_cid
+        * @param string $deny_gid
+        *
+        * @return Entity\PermissionSet
+        */
        public function createFromString(
                int $uid,
                string $allow_cid = '',
                string $allow_gid = '',
                string $deny_cid = '',
-               string $deny_gid = '')
+               string $deny_gid = '',
+               int $id = null): Entity\PermissionSet
        {
-               return new Entity\PermissionSet(
-                       $uid,
-                       $this->formatter->expand($allow_cid),
-                       $this->formatter->expand($allow_gid),
-                       $this->formatter->expand($deny_cid),
-                       $this->formatter->expand($deny_gid)
-               );
-       }
-
-       public function createPrototypeForUser(int $uid, string $allowCid): Entity\PermissionSet
-       {
-               return new Entity\PermissionSet(
-                       $uid,
-                       $this->formatter->expand($allowCid)
-               );
+               return $this->createFromTableRow([
+                       'uid'       => $uid,
+                       'allow_cid' => $allow_cid,
+                       'allow_gid' => $allow_gid,
+                       'deny_cid'  => $deny_cid,
+                       'deny_gid'  => $deny_gid,
+                       'id'        => $id,
+               ]);
        }
 }