diff options
Diffstat (limited to 'lib/private/Files/Cache')
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/Cache/CacheQueryBuilder.php | 9 | ||||
| -rw-r--r-- | lib/private/Files/Cache/QuerySearchHelper.php | 13 |
3 files changed, 21 insertions, 5 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 240f02b3fba..27db4dfe809 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -178,7 +178,7 @@ class Cache implements ICache { } elseif (!$data) { return $data; } else { - $data['metadata'] = $metadataQuery->extractMetadata($data)->asArray(); + $data['metadata'] = $metadataQuery?->extractMetadata($data)->asArray() ?? []; return self::cacheEntryFromData($data, $this->mimetypeLoader); } } @@ -250,7 +250,7 @@ class Cache implements ICache { $result->closeCursor(); return array_map(function (array $data) use ($metadataQuery) { - $data['metadata'] = $metadataQuery->extractMetadata($data)->asArray(); + $data['metadata'] = $metadataQuery?->extractMetadata($data)->asArray() ?? []; return self::cacheEntryFromData($data, $this->mimetypeLoader); }, $files); } diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php index a0fa7b6be43..365d28fc8c5 100644 --- a/lib/private/Files/Cache/CacheQueryBuilder.php +++ b/lib/private/Files/Cache/CacheQueryBuilder.php @@ -135,9 +135,14 @@ class CacheQueryBuilder extends QueryBuilder { return $this; } - public function selectMetadata(): IMetadataQuery { + /** + * join metadata to current query builder and returns an helper + * + * @return IMetadataQuery|null NULL if no metadata have never been generated + */ + public function selectMetadata(): ?IMetadataQuery { $metadataQuery = $this->filesMetadataManager->getMetadataQuery($this, $this->alias, 'fileid'); - $metadataQuery->retrieveMetadata(); + $metadataQuery?->retrieveMetadata(); return $metadataQuery; } } 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); |