Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ci: adjust return annotation to older psalm version
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
blizzz committed Jun 26, 2023
commit 013d34977ba8c028a9e95bf053fddaec541beb17
2 changes: 1 addition & 1 deletion lib/private/Files/Cache/QuerySearchHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
}

/**
* @return list{0?: array<array-key, ICache>, 1?: array<array-key, IMountPoint>}
* @return array{0?: array<array-key, ICache>, 1?: array<array-key, IMountPoint>}
*/
public function getCachesAndMountPointsForSearch(IRootFolder $root, string $path, bool $limitToHome = false): array {
$rootLength = strlen($path);
Expand Down
2 changes: 2 additions & 0 deletions lib/private/Files/Node/Folder.php
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ public function search($query) {

/** @var QuerySearchHelper $searchHelper */
$searchHelper = \OC::$server->get(QuerySearchHelper::class);
/** @var \OCP\Files\Cache\ICache[] $caches */
/** @var \OCP\Files\Mount\IMountPoint[] $mountByMountPoint */
[$caches, $mountByMountPoint] = $searchHelper->getCachesAndMountPointsForSearch($this->root, $this->path, $limitToHome);
$resultsPerCache = $searchHelper->searchInCaches($query, $caches);

Expand Down
1 change: 1 addition & 0 deletions lib/private/SystemTag/SystemTagsInFilesDetector.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public function detectAssignedSystemTagsIn(
}

$query = new SearchQuery($operator, $limit, $offset, []);
/** @var \OCP\Files\Cache\ICache[] $caches */
[$caches, ] = $this->searchHelper->getCachesAndMountPointsForSearch(
$this->getRootFolder($folder),
$folder->getPath(),
Expand Down