1 files changed, 3 insertions, 40 deletions
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 9fef53fa95a..ed85d3c07cc 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -56,6 +56,9 @@ use OCP\Files\ReservedWordException;
  * in classes which extend it, e.g. $this->stat() .
  */
 abstract class Common implements Storage {
+
+	use LocalTempFileTrait;
+
 	protected $cache;
 	protected $scanner;
 	protected $watcher;
@@ -63,11 +66,6 @@ abstract class Common implements Storage {
 
 	protected $mountOptions = [];
 
-	/**
-	 * @var string[]
-	 */
-	protected $cachedFiles = array();
-
 	public function __construct($parameters) {
 	}
 
@@ -247,27 +245,6 @@ abstract class Common implements Storage {
 		return $this->getCachedFile($path);
 	}
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function toTmpFile($path) { //no longer in the storage api, still useful here
-		$source = $this->fopen($path, 'r');
-		if (!$source) {
-			return false;
-		}
-		if ($pos = strrpos($path, '.')) {
-			$extension = substr($path, $pos);
-		} else {
-			$extension = '';
-		}
-		$tmpFile = \OC_Helper::tmpFile($extension);
-		$target = fopen($tmpFile, 'w');
-		\OC_Helper::streamCopy($source, $target);
-		fclose($target);
-		return $tmpFile;
-	}
-
 	public function getLocalFolder($path) {
 		$baseDir = \OC_Helper::tmpFolder();
 		$this->addLocalFolder($path, $baseDir);
@@ -451,20 +428,6 @@ abstract class Common implements Storage {
 	}
 
 	/**
-	 * @param string $path
-	 */
-	protected function getCachedFile($path) {
-		if (!isset($this->cachedFiles[$path])) {
-			$this->cachedFiles[$path] = $this->toTmpFile($path);
-		}
-		return $this->cachedFiles[$path];
-	}
-
-	protected function removeCachedFile($path) {
-		unset($this->cachedFiles[$path]);
-	}
-
-	/**
 	 * Check if the storage is an instance of $class or is a wrapper for a storage that is an instance of $class
 	 *
 	 * @param string $class