fix(cache): filter out invalid entries in OC\Files\Cache\Wrapper\CacheWrapper::getFolderContentsById

susnux · susnux · commit 88bb82ccfe7f · 2026-02-17T17:20:46.000+01:00
Signed-off-by: Ferdinand Thiessen &lt;opensource@fthiessen.de&gt;
diff --git 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
@@ -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));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function getFolderContents(string $folder, ?string $mimeTypeFilter = null`
`104`	`104`	`*/`
`105`	`105`	`public function getFolderContentsById(int $fileId, ?string $mimeTypeFilter = null) {`
`106`	`106`	`$results = $this->getCache()->getFolderContentsById($fileId, $mimeTypeFilter);`
`107`		`- return array_map($this->formatCacheEntry(...), $results);`
	`107`	`+ return array_filter(array_map($this->formatCacheEntry(...), $results));`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`