Fix overly strict return value for revokeFollow methods

[friendica.git] / src / Model / ProfileField.php

diff --git a/src/Model/ProfileField.php b/src/Model/ProfileField.php
index eafb88db788ff895c43cf9fa452a9236e7526f0f..66833890e8f5d4db3d324c5ba2f3a44ff9937160 100644 (file)
--- a/src/Model/ProfileField.php
+++ b/src/Model/ProfileField.php
@@ -23,6 +23,7 @@ namespace Friendica\Model;
 
 use Friendica\BaseModel;
 use Friendica\Database\Database;
+use Friendica\Network\HTTPException\NotFoundException;
 use Friendica\Security\PermissionSet\Depository\PermissionSet as PermissionSetDepository;
 use Friendica\Security\PermissionSet\Entity\PermissionSet;
 use Psr\Log\LoggerInterface;
@@ -40,12 +41,12 @@ use Psr\Log\LoggerInterface;
  * @property string value
  * @property string created
  * @property string edited
- * @property PermissionSet permissionset
+ * @property PermissionSet permissionSet
  */
 class ProfileField extends BaseModel
 {
        /** @var PermissionSet */
-       private $permissionset;
+       private $permissionSet;
 
        /** @var PermissionSetDepository */
        private $permissionSetDepository;
@@ -62,10 +63,17 @@ class ProfileField extends BaseModel
                $this->checkValid();
 
                switch ($name) {
-                       case 'permissionset':
-                               $this->permissionset = $this->permissionset ?? $this->permissionSetDepository->selectOneForUser($this->uid, $this->psid);
+                       case 'permissionSet':
+                               if (empty($this->permissionSet)) {
+                                       $permissionSet = $this->permissionSetDepository->selectOneById($this->psid);
+                                       if ($permissionSet->uid !== $this->uid) {
+                                               throw new NotFoundException(sprintf('PermissionSet %d (user-id: %d) for ProfileField %d (user-id: %d) is invalid.', $permissionSet->id, $permissionSet->uid, $this->id, $this->uid));
+                                       }
 
-                               $return = $this->permissionset;
+                                       $this->permissionSet = $permissionSet;
+                               }
+
+                               $return = $this->permissionSet;
                                break;
                        default:
                                $return = parent::__get($name);