From 2930f890d64c525f437154e2a18a152f9b52cfbe Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 26 Jun 2023 17:07:21 +0200 Subject: [PATCH] ci: adjust return annotation to older psalm version Signed-off-by: Arthur Schiwon --- lib/private/Files/Cache/QuerySearchHelper.php | 2 +- lib/private/Files/Node/Folder.php | 2 ++ lib/private/SystemTag/SystemTagsInFilesDetector.php | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php index c149276cf5a..f3401f7a9b6 100644 --- a/lib/private/Files/Cache/QuerySearchHelper.php +++ b/lib/private/Files/Cache/QuerySearchHelper.php @@ -196,7 +196,7 @@ class QuerySearchHelper { } /** - * @return list{0?: array, 1?: array} + * @return array{0?: array, 1?: array} */ public function getCachesAndMountPointsForSearch(IRootFolder $root, string $path, bool $limitToHome = false): array { $rootLength = strlen($path); diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 4f5ac07a15a..b376d4673e4 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -230,6 +230,8 @@ class Folder extends Node implements \OCP\Files\Folder { /** @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); diff --git a/lib/private/SystemTag/SystemTagsInFilesDetector.php b/lib/private/SystemTag/SystemTagsInFilesDetector.php index a214bd77e7b..cf7f8d5992d 100644 --- a/lib/private/SystemTag/SystemTagsInFilesDetector.php +++ b/lib/private/SystemTag/SystemTagsInFilesDetector.php @@ -57,6 +57,7 @@ class SystemTagsInFilesDetector { } $query = new SearchQuery($operator, $limit, $offset, []); + /** @var \OCP\Files\Cache\ICache[] $caches */ [$caches, ] = $this->searchHelper->getCachesAndMountPointsForSearch( $this->getRootFolder($folder), $folder->getPath(), -- 2.39.5