From ede38709b5df0ede2542a3f62ee0a5e72243ba40 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 5 Sep 2024 23:00:27 +0200
Subject: [PATCH] chore(files): Use public API where possible

This is not fixing all issues in the helper,
but at least where possible use the public methods.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 apps/files/lib/Helper.php | 25 ++++++++++++++-----------
 build/psalm-baseline.xml  |  8 --------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php
index f79d4bc5f9cb0..6126c1270ebad 100644
--- a/apps/files/lib/Helper.php
+++ b/apps/files/lib/Helper.php
@@ -119,16 +119,18 @@ public static function compareSize(FileInfo $a, FileInfo $b) {
 	public static function formatFileInfo(FileInfo $i) {
 		$entry = [];
 
-		$entry['id'] = $i['fileid'];
-		$entry['parentId'] = $i['parent'];
-		$entry['mtime'] = $i['mtime'] * 1000;
+		$entry['id'] = $i->getId();
+		$entry['parentId'] = $i->getParentId();
+		$entry['mtime'] = $i->getMtime() * 1000;
 		// only pick out the needed attributes
 		$entry['name'] = $i->getName();
-		$entry['permissions'] = $i['permissions'];
-		$entry['mimetype'] = $i['mimetype'];
-		$entry['size'] = $i['size'];
-		$entry['type'] = $i['type'];
-		$entry['etag'] = $i['etag'];
+		$entry['permissions'] = $i->getPermissions();
+		$entry['mimetype'] = $i->getMimetype();
+		$entry['size'] = $i->getSize();
+		$entry['type'] = $i->getType();
+		$entry['etag'] = $i->getEtag();
+		// TODO: this is using the private implementation of FileInfo
+		// the array access is not part of the public interface
 		if (isset($i['tags'])) {
 			$entry['tags'] = $i['tags'];
 		}
@@ -138,6 +140,10 @@ public static function formatFileInfo(FileInfo $i) {
 		if (isset($i['is_share_mount_point'])) {
 			$entry['isShareMountPoint'] = $i['is_share_mount_point'];
 		}
+		if (isset($i['extraData'])) {
+			$entry['extraData'] = $i['extraData'];
+		}
+
 		$mountType = null;
 		$mount = $i->getMountPoint();
 		$mountType = $mount->getMountType();
@@ -147,9 +153,6 @@ public static function formatFileInfo(FileInfo $i) {
 			}
 			$entry['mountType'] = $mountType;
 		}
-		if (isset($i['extraData'])) {
-			$entry['extraData'] = $i['extraData'];
-		}
 		return $entry;
 	}
 
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 564236c360d9e..80e6493fd3691 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -802,14 +802,6 @@
       <code><![CDATA[$i]]></code>
       <code><![CDATA[$i]]></code>
       <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
-      <code><![CDATA[$i]]></code>
     </UndefinedInterfaceMethod>
   </file>
   <file src="apps/files/lib/Service/OwnershipTransferService.php">