From 560df4a73c525a8fa46f914aa36c6b9d3af96558 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 12 Feb 2026 14:53:55 +0100
Subject: [PATCH 1/2] fix(cache): filter out invalid entries in
 `OC\Files\Cache\Wrapper\CacheWrapper::getFolderContentsById`

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

[skip ci]
---
 lib/private/Files/Cache/Wrapper/CacheWrapper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index 06e94ae146317..dfdc8cb8042a5 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -97,10 +97,10 @@ public function getFolderContents(string $folder, ?string $mimeTypeFilter = null
 	}
 
 	/**
-	 * get the metadata of all files stored in $folder
+	 * Get the metadata of all files stored in given folder
 	 *
 	 * @param int $fileId the file id of the folder
-	 * @return array
+	 * @return ICacheEntry[]
 	 */
 	public function getFolderContentsById(int $fileId, ?string $mimeTypeFilter = null) {
 		$results = $this->getCache()->getFolderContentsById($fileId, $mimeTypeFilter);

From 88bb82ccfe7f1b46862b09cf4c0819619bf66ce1 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 12 Feb 2026 14:53:55 +0100
Subject: [PATCH 2/2] fix(cache): filter out invalid entries in
 `OC\Files\Cache\Wrapper\CacheWrapper::getFolderContentsById`

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---
 build/psalm-baseline.xml                         | 5 -----
 lib/private/Files/Cache/Wrapper/CacheWrapper.php | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 9243b71bc5dab..c837e74952171 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -3509,11 +3509,6 @@
       <code><![CDATA[self::getGlobalCache()->getStorageInfo($storageId)]]></code>
     </NullableReturnStatement>
   </file>
-  <file src="lib/private/Files/Cache/Wrapper/CacheWrapper.php">
-    <LessSpecificImplementedReturnType>
-      <code><![CDATA[array]]></code>
-    </LessSpecificImplementedReturnType>
-  </file>
   <file src="lib/private/Files/Config/MountProviderCollection.php">
     <InvalidOperand>
       <code><![CDATA[$user]]></code>
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index dfdc8cb8042a5..ff1953b230486 100644
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -104,7 +104,7 @@ public function getFolderContents(string $folder, ?string $mimeTypeFilter = null
 	 */
 	public function getFolderContentsById(int $fileId, ?string $mimeTypeFilter = null) {
 		$results = $this->getCache()->getFolderContentsById($fileId, $mimeTypeFilter);
-		return array_map($this->formatCacheEntry(...), $results);
+		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	/**