serializer: handle wildcard users

alchemy-fr · Sep 24, 2024 · a969b42 · a969b42
1 parent a79f8df
commit a969b42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Serializer/AceSerializer.php b/Serializer/AceSerializer.php
@@ -19,6 +19,8 @@ public function __construct(
 
     public function serialize(AccessControlEntryInterface $ace): array
     {
+        $userId = $ace->getUserId();
+
         $payload = [
             'id' => $ace->getId(),
             'userType' => array_search($ace->getUserType(), AccessControlEntryInterface::USER_TYPES, true),
@@ -29,11 +31,12 @@ public function serialize(AccessControlEntryInterface $ace): array
             'parentId' => $ace->getParentId(),
         ];
 
-        $id = $ace->getUserId();
-        if ($ace->getUserType() === AccessControlEntryInterface::TYPE_USER_VALUE) {
-            $payload['user'] = $this->userRepository->getUser($id);
-        } elseif ($ace->getUserType() === AccessControlEntryInterface::TYPE_GROUP_VALUE) {
-            $payload['group'] = $this->groupRepository->getGroup($id);
+        if (null !== $userId) {
+            if ($ace->getUserType() === AccessControlEntryInterface::TYPE_USER_VALUE) {
+                $payload['user'] = $this->userRepository->getUser($userId);
+            } elseif ($ace->getUserType() === AccessControlEntryInterface::TYPE_GROUP_VALUE) {
+                $payload['group'] = $this->groupRepository->getGroup($userId);
+            }
         }
 
         return $payload;

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
   "homepage": "https://www.alchemy.fr/",
   "license": "MIT",
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-json": "*",
     "doctrine/orm": "^2.6",
     "ramsey/uuid-doctrine": "^1.5",