cleanup shared cache

3 files changed, 9 insertions, 4 deletions

diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/files/cache/wrapper/cachejail.php
index 4d708c2d191..4188fb72622 100644
--- a/lib/private/files/cache/wrapper/cachejail.php
+++ b/lib/private/files/cache/wrapper/cachejail.php
@@ -34,7 +34,7 @@ class CacheJail extends CacheWrapper {
 	protected $root;
 
 	/**
-	 * @param \OC\Files\Cache\Cache $cache
+	 * @param \OCP\Files\Cache\ICache $cache
 	 * @param string $root
 	 */
 	public function __construct($cache, $root) {
diff --git a/lib/private/files/cache/wrapper/cachepermissionsmask.php b/lib/private/files/cache/wrapper/cachepermissionsmask.php
index 1eeb3c4783d..b3a7bcb3a73 100644
--- a/lib/private/files/cache/wrapper/cachepermissionsmask.php
+++ b/lib/private/files/cache/wrapper/cachepermissionsmask.php
@@ -29,7 +29,7 @@ class CachePermissionsMask extends CacheWrapper {
 	protected $mask;
 
 	/**
-	 * @param \OC\Files\Cache\Cache $cache
+	 * @param \OCP\Files\Cache\ICache $cache
 	 * @param int $mask
 	 */
 	public function __construct($cache, $mask) {
diff --git a/lib/private/files/cache/wrapper/cachewrapper.php b/lib/private/files/cache/wrapper/cachewrapper.php
index 39a6b63205b..1ce4f028c75 100644
--- a/lib/private/files/cache/wrapper/cachewrapper.php
+++ b/lib/private/files/cache/wrapper/cachewrapper.php
@@ -26,15 +26,16 @@ namespace OC\Files\Cache\Wrapper;
 
 use OC\Files\Cache\Cache;
 use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\Cache\ICache;
 
 class CacheWrapper extends Cache {
 	/**
-	 * @var \OC\Files\Cache\Cache
+	 * @var \OCP\Files\Cache\ICache
 	 */
 	protected $cache;
 
 	/**
-	 * @param \OC\Files\Cache\Cache $cache
+	 * @param \OCP\Files\Cache\ICache $cache
 	 */
 	public function __construct($cache) {
 		$this->cache = $cache;
@@ -159,6 +160,10 @@ class CacheWrapper extends Cache {
 		$this->cache->move($source, $target);
 	}
 
+	public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath) {
+		$this->cache->moveFromCache($sourceCache, $sourcePath, $targetPath);
+	}
+
 	/**
 	 * remove all entries for files that are stored on the storage from the cache
 	 */