reuse dependencies from wrapped cache

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index 6479ea793b000eb33c74e2ba485beccc82db3a79..39a78f31343c370f1a044a1c64bbf6ef7022e50f 100644 (file)
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -33,8 +33,10 @@ use OC\Files\Cache\Cache;
 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() {