From 9ea03a9534c1d8c40c500d6d484c001ae66c5f9a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 15 Aug 2023 16:44:23 +0200 Subject: [PATCH] reuse dependencies from wrapped cache Signed-off-by: Robin Appelman --- lib/private/Files/Cache/Wrapper/CacheWrapper.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php index 6479ea793b000..39a78f31343c3 100644 --- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php +++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php @@ -33,8 +33,10 @@ use OC\Files\Cache\QuerySearchHelper; use OCP\Files\Cache\ICache; use OCP\Files\Cache\ICacheEntry; +use OCP\Files\IMimeTypeLoader; use OCP\Files\Search\ISearchOperator; use OCP\Files\Search\ISearchQuery; +use OCP\IDBConnection; class CacheWrapper extends Cache { /** @@ -47,9 +49,15 @@ class CacheWrapper extends Cache { */ public function __construct($cache) { $this->cache = $cache; - $this->mimetypeLoader = \OC::$server->getMimeTypeLoader(); - $this->connection = \OC::$server->getDatabaseConnection(); - $this->querySearchHelper = \OC::$server->get(QuerySearchHelper::class); + if ($cache instanceof Cache) { + $this->mimetypeLoader = $cache->mimetypeLoader; + $this->connection = $cache->connection; + $this->querySearchHelper = $cache->querySearchHelper; + } else { + $this->mimetypeLoader = \OC::$server->get(IMimeTypeLoader::class); + $this->connection = \OC::$server->get(IDBConnection::class); + $this->querySearchHelper = \OC::$server->get(QuerySearchHelper::class); + } } protected function getCache() {