fix(TreeMapper): Fix Replacement for removed array_flatten function

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Db/TreeMapper.php

@@ -258,8 +258,8 @@ protected function getFindSoftDeletedChildrenQuery(string $type): IQueryBuilder
 	 * @psalm-param T $type
 	 * @param int $folderId
 	 * @param bool $softDeleted
-	 * @return Entity[]
-	 * @psalm-return E[]
+	 * @return list<Entity>
+	 * @psalm-return list<E>
 	 * @psalm-template T as TreeMapper::TYPE_*
 	 * @psalm-template E as (T is TreeMapper::TYPE_FOLDER ? Folder : (T is TreeMapper::TYPE_BOOKMARK ? Bookmark : SharedFolder))
 	 */
@@ -313,21 +313,41 @@ public function findParentsOf(string $type, int $itemId, $withSoftDeletions = fa
 	 * @param string $type
 	 * @psalm-param T $type
 	 * @param int $folderId
-	 * @return Entity[]
-	 * @psalm-return E[]
+	 * @return list<Entity>
+	 * @psalm-return list<E>
 	 * @psalm-template T as TreeMapper::TYPE_*
 	 * @psalm-template E as (T is TreeMapper::TYPE_FOLDER ? Folder : (T is TreeMapper::TYPE_BOOKMARK ? Bookmark : SharedFolder))
 	 */
 	public function findByAncestorFolder(string $type, int $folderId): array {
-		$descendants = [];
-		$newDescendants = $this->findChildren($type, $folderId);
-		do {
-			array_push($descendants, ...$newDescendants);
-			$newDescendants = array_merge(...array_map(function (Entity $descendant) use ($type) {
-				return $this->findChildren($type, $descendant->getId());
-			}, $newDescendants));
-		} while (count($newDescendants) > 0);
-		return $descendants;
+		if ($type === TreeMapper::TYPE_FOLDER) {
+			$descendants = [];
+			$newDescendants = $this->findChildren(TreeMapper::TYPE_FOLDER, $folderId);
+			do {
+				array_push($descendants, ...$newDescendants);
+				$newDescendants = array_merge(...array_map(function (Folder $folder): array {
+					return $this->findChildren(TreeMapper::TYPE_FOLDER, $folder->getId());
+				}, $newDescendants));
+			} while (count($newDescendants) > 0);
+			return $descendants;
+		}
+
+		if ($type === TreeMapper::TYPE_SHARE) {
+			$descendantFolders = $this->findChildren(TreeMapper::TYPE_FOLDER, $folderId);
+			$descendants = array_merge(...array_map(function (Folder $folder): array {
+				return $this->findChildren(TreeMapper::TYPE_SHARE, $folder->getId());
+			}, $descendantFolders));
+			return $descendants;
+		}
+
+		if ($type === TreeMapper::TYPE_BOOKMARK) {
+			$descendantFolders = $this->findChildren(TreeMapper::TYPE_FOLDER, $folderId);
+			$descendants = array_merge(...array_map(function (Folder $folder): array {
+				return $this->findChildren(TreeMapper::TYPE_BOOKMARK, $folder->getId());
+			}, $descendantFolders));
+			return $descendants;
+		}
+
+		throw new \InvalidArgumentException('Invalid type');
 	}
 
 	/**

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.13.0@70cdf647255a1362b426bb0f522a85817b8c791c">
+<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
   <file src="lib/AppInfo/Application.php">
     <InvalidArgument>
       <code><![CDATA[UsersGroupsCirclesListener::class]]></code>
@@ -80,10 +80,15 @@
       <code><![CDATA[Folder]]></code>
     </InvalidReturnType>
     <NoValue>
+      <code><![CDATA[$share]]></code>
+      <code><![CDATA[$share]]></code>
+      <code><![CDATA[$share]]></code>
       <code><![CDATA[return $this->findEntityWithType($qb, TreeMapper::TYPE_FOLDER);]]></code>
     </NoValue>
     <ReservedWord>
-      <code><![CDATA[Entity]]></code>
+      <code><![CDATA[Folder]]></code>
+      <code><![CDATA[Folder]]></code>
+      <code><![CDATA[Folder]]></code>
       <code><![CDATA[Folder]]></code>
       <code><![CDATA[SharedFolder]]></code>
     </ReservedWord>
@@ -150,6 +155,12 @@
       <code><![CDATA[\OC\User\NoUserException]]></code>
     </UndefinedDocblockClass>
   </file>
+  <file src="lib/Service/BookmarkService.php">
+    <NoValue>
+      <code><![CDATA[$bookmark]]></code>
+      <code><![CDATA[$folder]]></code>
+    </NoValue>
+  </file>
   <file src="lib/Service/BookmarksParser.php">
     <InvalidScalarArgument>
       <code><![CDATA[(int)($attributes['add_date']) / 1000]]></code>
@@ -184,6 +195,12 @@
       <code><![CDATA[string]]></code>
     </InvalidReturnType>
   </file>
+  <file src="lib/Service/HtmlExporter.php">
+    <NoValue>
+      <code><![CDATA[$bookmark]]></code>
+      <code><![CDATA[$childFolder]]></code>
+    </NoValue>
+  </file>
   <file src="lib/Service/LinkExplorer.php">
     <UndefinedInterfaceMethod>
       <code><![CDATA[setMinimumImageDimensions]]></code>