fix stream acl

prooph · Jun 17, 2019 · a7530b1 · a7530b1
1 parent 6698428
commit a7530b1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 9 deletions.
diff --git a/src/StreamAcl.php b/src/StreamAcl.php
@@ -118,13 +118,29 @@ public function metaWriteRoles(): array
 
     public function toArray(): array
     {
-        return [
-            SystemMetadata::ACL_READ => $this->exportRoles($this->readRoles),
-            SystemMetadata::ACL_WRITE => $this->exportRoles($this->writeRoles),
-            SystemMetadata::ACL_DELETE => $this->exportRoles($this->deleteRoles),
-            SystemMetadata::ACL_META_READ => $this->exportRoles($this->metaReadRoles),
-            SystemMetadata::ACL_META_WRITE => $this->exportRoles($this->metaWriteRoles),
-        ];
+        $data = [];
+
+        if (! empty($this->readRoles)) {
+            $data[SystemMetadata::ACL_READ] = $this->exportRoles($this->readRoles);
+        }
+
+        if (! empty($this->writeRoles)) {
+            $data[SystemMetadata::ACL_WRITE] = $this->exportRoles($this->writeRoles);
+        }
+
+        if (! empty($this->deleteRoles)) {
+            $data[SystemMetadata::ACL_DELETE] = $this->exportRoles($this->deleteRoles);
+        }
+
+        if (! empty($this->metaReadRoles)) {
+            $data[SystemMetadata::ACL_META_READ] = $this->exportRoles($this->metaReadRoles);
+        }
+
+        if (! empty($this->metaWriteRoles)) {
+            $data[SystemMetadata::ACL_META_WRITE] = $this->exportRoles($this->metaWriteRoles);
+        }
+
+        return $data;
     }
 
     public static function fromArray(array $data): StreamAcl
@@ -140,7 +156,9 @@ public static function fromArray(array $data): StreamAcl
 
     private function exportRoles(?array $roles)
     {
-        if (null === $roles) {
+        if (null === $roles
+            || empty($roles)
+        ) {
             return null;
         }
 

diff --git a/src/StreamMetadata.php b/src/StreamMetadata.php
@@ -168,7 +168,11 @@ public function jsonSerialize(): object
         }
 
         if (null !== $this->acl) {
-            $object->{SystemMetadata::ACL} = $this->acl->toArray();
+            $acl = $this->acl->toArray();
+
+            if (! empty($acl)) {
+                $object->{SystemMetadata::ACL} = $acl;
+            }
         }
 
         foreach ($this->customMetadata as $key => $value) {