Merge pull request #47957 from nextcloud/backport/47954/stable30

provokateurin · web-flow · commit b5347e89e78e · 2024-09-14T14:30:01.000+02:00
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -873,8 +873,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
@@ -214,8 +214,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
`@@ -873,8 +873,8 @@ public function searchByMime($mimetype) {`
`873`	`873`	`return $this->searchQuery(new SearchQuery($operator, 0, 0, [], null));`
`874`	`874`	`}`
`875`	`875`
`876`		`- public function searchQuery(ISearchQuery $searchQuery) {`
`877`		`- return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));`
	`876`	`+ public function searchQuery(ISearchQuery $query) {`
	`877`	`+ return current($this->querySearchHelper->searchInCaches($query, [$this]));`
`878`	`878`	`}`
`879`	`879`
`880`	`880`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -214,8 +214,8 @@ public function getStatus($file) {`
`214`	`214`	`return $this->getCache()->getStatus($file);`
`215`	`215`	`}`
`216`	`216`
`217`		`- public function searchQuery(ISearchQuery $searchQuery) {`
`218`		`- return current($this->querySearchHelper->searchInCaches($searchQuery, [$this]));`
	`217`	`+ public function searchQuery(ISearchQuery $query) {`
	`218`	`+ return current($this->querySearchHelper->searchInCaches($query, [$this]));`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`/**`