1 files changed, 12 insertions, 1 deletions
diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
index aca998cc4a7..d8c5e66e129 100644
--- a/lib/private/Files/Cache/QuerySearchHelper.php
+++ b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -67,6 +67,12 @@ class QuerySearchHelper {
 		);
 	}
 
+	/**
+	 * @param CacheQueryBuilder $query
+	 * @param ISearchQuery $searchQuery
+	 * @param array $caches
+	 * @param IMetadataQuery|null $metadataQuery
+	 */
 	protected function applySearchConstraints(
 		CacheQueryBuilder $query,
 		ISearchQuery $searchQuery,
@@ -189,7 +195,12 @@ class QuerySearchHelper {
 		$files = $result->fetchAll();
 
 		$rawEntries = array_map(function (array $data) use ($metadataQuery) {
-			$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
+			// migrate to null safe ...
+			if ($metadataQuery === null) {
+				$data['metadata'] = [];
+			} else {
+				$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
+			}
 			return Cache::cacheEntryFromData($data, $this->mimetypeLoader);
 		}, $files);