Merge pull request #8878 from nextcloud/remove_tmpfile

Remove deprecated tmpFile/tmpFolder

4 files changed, 6 insertions, 31 deletions

diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php
index f37da6fc52d..ef2ea83c3c6 100644
--- a/lib/private/Archive/TAR.php
+++ b/lib/private/Archive/TAR.php
@@ -139,7 +139,7 @@ class TAR extends Archive {
 	 */
 	public function rename($source, $dest) {
 		//no proper way to delete, rename entire archive, rename file and remake archive
-		$tmp = \OCP\Files::tmpFolder();
+		$tmp = \OC::$server->getTempManager()->getTemporaryFolder();
 		$this->tar->extract($tmp);
 		rename($tmp . $source, $tmp . $dest);
 		$this->tar = null;
@@ -258,7 +258,7 @@ class TAR extends Archive {
 	 * @return bool
 	 */
 	public function extractFile($path, $dest) {
-		$tmp = \OCP\Files::tmpFolder();
+		$tmp = \OC::$server->getTempManager()->getTemporaryFolder();
 		if (!$this->fileExists($path)) {
 			return false;
 		}
@@ -323,7 +323,7 @@ class TAR extends Archive {
 		$this->fileList = false;
 		$this->cachedHeaders = false;
 		//no proper way to delete, extract entire archive, delete file and remake archive
-		$tmp = \OCP\Files::tmpFolder();
+		$tmp = \OC::$server->getTempManager()->getTemporaryFolder();
 		$this->tar->extract($tmp);
 		\OCP\Files::rmdirr($tmp . $path);
 		$this->tar = null;
@@ -346,7 +346,7 @@ class TAR extends Archive {
 		} else {
 			$ext = '';
 		}
-		$tmpFile = \OCP\Files::tmpFile($ext);
+		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 		if ($this->fileExists($path)) {
 			$this->extractFile($path, $tmpFile);
 		} elseif ($mode == 'r' or $mode == 'rb') {
diff --git a/lib/private/Archive/ZIP.php b/lib/private/Archive/ZIP.php
index fb3e2fdde97..fb727aba224 100644
--- a/lib/private/Archive/ZIP.php
+++ b/lib/private/Archive/ZIP.php
@@ -198,7 +198,7 @@ class ZIP extends Archive{
 			}else{
 				$ext='';
 			}
-			$tmpFile=\OCP\Files::tmpFile($ext);
+			$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 			if($this->fileExists($path)) {
 				$this->extractFile($path, $tmpFile);
 			}
diff --git a/lib/private/Files/Storage/Flysystem.php b/lib/private/Files/Storage/Flysystem.php
index 423a6f0d83e..232222db358 100644
--- a/lib/private/Files/Storage/Flysystem.php
+++ b/lib/private/Files/Storage/Flysystem.php
@@ -206,7 +206,7 @@ abstract class Flysystem extends Common {
 					if (!$this->isCreatable(dirname($path))) {
 						return false;
 					}
-					$tmpFile = \OCP\Files::tmpFile();
+					$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
 				}
 				$source = fopen($tmpFile, $mode);
 				return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) {
diff --git a/lib/public/Files.php b/lib/public/Files.php
index d66e0f1b645..7b1b1921ed9 100644
--- a/lib/public/Files.php
+++ b/lib/public/Files.php
@@ -89,31 +89,6 @@ class Files {
 	}
 
 	/**
-	 * Create a temporary file with an unique filename
-	 * @param string $postfix
-	 * @return string
-	 *
-	 * temporary files are automatically cleaned up after the script is finished
-	 * @deprecated 8.1.0 use getTemporaryFile() of \OCP\ITempManager - \OC::$server->getTempManager()
-	 * @since 5.0.0
-	 */
-	public static function tmpFile( $postfix='' ) {
-		return \OC::$server->getTempManager()->getTemporaryFile($postfix);
-	}
-
-	/**
-	 * Create a temporary folder with an unique filename
-	 * @return string
-	 *
-	 * temporary files are automatically cleaned up after the script is finished
-	 * @deprecated 8.1.0 use getTemporaryFolder() of \OCP\ITempManager - \OC::$server->getTempManager()
-	 * @since 5.0.0
-	 */
-	public static function tmpFolder() {
-		return \OC::$server->getTempManager()->getTemporaryFolder();
-	}
-
-	/**
 	 * Adds a suffix to the name in case the file exists
 	 * @param string $path
 	 * @param string $filename