From a770e58b81e8b8407c2e0fa2af55e91420c78a62 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Tue, 14 Nov 2023 23:33:55 -0100
Subject: [PATCH] null safe on metadata

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/private/Files/Cache/QuerySearchHelper.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
index d8c5e66e12951..77ffb8abcde3d 100644
--- a/lib/private/Files/Cache/QuerySearchHelper.php
+++ b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -194,13 +194,8 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
 		$result = $query->execute();
 		$files = $result->fetchAll();
 
-		$rawEntries = array_map(function (array $data) use ($metadataQuery) {
-			// migrate to null safe ...
-			if ($metadataQuery === null) {
-				$data['metadata'] = [];
-			} else {
-				$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
-			}
+		$rawEntries = array_map(function (array $data) use ($metadataQuery): CacheEntry {
+			$data['metadata'] = $metadataQuery?->extractMetadata($data)->asArray() ?? [];
 			return Cache::cacheEntryFromData($data, $this->mimetypeLoader);
 		}, $files);