Merge pull request #45140 from nextcloud/fix-fileaccess-single

kesselb · web-flow · commit dbd2bc7a666b · 2024-05-02T19:10:14.000+02:00
fix: fix FileAccess::getByFileId(InStorage)
diff --git a/lib/private/Files/Cache/FileAccess.php b/lib/private/Files/Cache/FileAccess.php
@@ -56,7 +56,7 @@ private function getQuery(): CacheQueryBuilder {
 	}
 
 	public function getByFileIdInStorage(int $fileId, int $storageId): ?CacheEntry {
-		$items = $this->getByFileIdsInStorage([$fileId], $storageId);
+		$items = array_values($this->getByFileIdsInStorage([$fileId], $storageId));
 		return $items[0] ?? null;
 	}
 
@@ -70,7 +70,7 @@ public function getByPathInStorage(string $path, int $storageId): ?CacheEntry {
 	}
 
 	public function getByFileId(int $fileId): ?CacheEntry {
-		$items = $this->getByFileIds([$fileId]);
+		$items = array_values($this->getByFileIds([$fileId]));
 		return $items[0] ?? null;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private function getQuery(): CacheQueryBuilder {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function getByFileIdInStorage(int $fileId, int $storageId): ?CacheEntry {`
`59`		`- $items = $this->getByFileIdsInStorage([$fileId], $storageId);`
	`59`	`+ $items = array_values($this->getByFileIdsInStorage([$fileId], $storageId));`
`60`	`60`	`return $items[0] ?? null;`
`61`	`61`	`}`
`62`	`62`
`@@ -70,7 +70,7 @@ public function getByPathInStorage(string $path, int $storageId): ?CacheEntry {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public function getByFileId(int $fileId): ?CacheEntry {`
`73`		`- $items = $this->getByFileIds([$fileId]);`
	`73`	`+ $items = array_values($this->getByFileIds([$fileId]));`
`74`	`74`	`return $items[0] ?? null;`
`75`	`75`	`}`
`76`	`76`