Merge pull request #47956 from nextcloud/backport/47954/stable28

provokateurin · web-flow · commit 0b65a3e762a4 · 2024-09-14T14:30:01.000+02:00
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -885,8 +885,8 @@ public function searchByMime($mimetype) {
 		return $this->searchQuery(new SearchQuery($operator, 0, 0, [], null));
 	}
 
-	public function searchQuery(ISearchQuery $searchQuery) {
-		return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));
+	public function searchQuery(ISearchQuery $query) {
+		return current($this->querySearchHelper->searchInCaches($query, [$this]));
 	}
 
 	/**
diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -237,8 +237,8 @@ public function getStatus($file) {
 		return $this->getCache()->getStatus($file);
 	}
 
-	public function searchQuery(ISearchQuery $searchQuery) {
-		return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));
+	public function searchQuery(ISearchQuery $query) {
+		return current($this->querySearchHelper->searchInCaches($query, [$this]));
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -885,8 +885,8 @@ public function searchByMime($mimetype) {`
`885`	`885`	`return $this->searchQuery(new SearchQuery($operator, 0, 0, [], null));`
`886`	`886`	`}`
`887`	`887`
`888`		`- public function searchQuery(ISearchQuery $searchQuery) {`
`889`		`- return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));`
	`888`	`+ public function searchQuery(ISearchQuery $query) {`
	`889`	`+ return current($this->querySearchHelper->searchInCaches($query, [$this]));`
`890`	`890`	`}`
`891`	`891`
`892`	`892`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,8 @@ public function getStatus($file) {`
`237`	`237`	`return $this->getCache()->getStatus($file);`
`238`	`238`	`}`
`239`	`239`
`240`		`- public function searchQuery(ISearchQuery $searchQuery) {`
`241`		`- return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));`
	`240`	`+ public function searchQuery(ISearchQuery $query) {`
	`241`	`+ return current($this->querySearchHelper->searchInCaches($query, [$this]));`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`/**`