Merge pull request #4154 from nextcloud/backport/4132/stable32

Author: provokateurin

lib/Command/ListCommand.php

@@ -84,11 +84,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 			foreach ($formatted as &$folder) {
 				$folder['size'] = $folder['root_cache_entry']->getSize();
 				unset($folder['root_cache_entry']);
-				$folder['group_details'] = $folder['groups'];
-				$folder['groups'] = array_map(fn (array $group): int => $group['permissions'], $folder['groups']);
+				$folder['groups_list'] = array_map(fn (array $group): int => $group['permissions'], $folder['groups']);
+				$folder['options'] = $folder['options'];
+				$folder['mountPoint'] = $folder['mount_point'];
+				unset($folder['mount_point']);
+				$folder['rootId'] = $folder['root_id'];
+				unset($folder['root_id']);
+				$folder['storageId'] = $folder['storage_id'];
+				unset($folder['storage_id']);
 			}
 
-			$this->writeArrayInOutputFormat($input, $output, $folders);
+			$this->writeArrayInOutputFormat($input, $output, $formatted);
 		} else {
 			$table = new Table($output);
 			$table->setHeaders(['Folder Id', 'Name', 'Groups', 'Quota', 'Size', 'Advanced Permissions', 'Manage advanced permissions']);

lib/Folder/FolderWithMappingsAndCache.php

@@ -65,6 +65,7 @@ public function toArray(): array {
 			'root_cache_entry' => $this->rootCacheEntry,
 			'groups' => $this->groups,
 			'manage' => $this->manage,
+			'options' => $this->options,
 		];
 	}
 }