replace close:// streamwrapper with CallBackWrapper

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

1 files changed, 9 insertions, 10 deletions

diff --git a/lib/private/Archive/TAR.php b/lib/private/Archive/TAR.php
index bbd24bd05a1..07ccd09f399 100644
--- a/lib/private/Archive/TAR.php
+++ b/lib/private/Archive/TAR.php
@@ -33,6 +33,8 @@
 
 namespace OC\Archive;
 
+use Icewind\Streams\CallbackWrapper;
+
 class TAR extends Archive {
 	const PLAIN = 0;
 	const GZIP = 1;
@@ -359,22 +361,19 @@ class TAR extends Archive {
 		if ($mode == 'r' or $mode == 'rb') {
 			return fopen($tmpFile, $mode);
 		} else {
-			\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-			self::$tempFiles[$tmpFile] = $path;
-			return fopen('close://' . $tmpFile, $mode);
+			$handle = fopen($tmpFile, $mode);
+			return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
+				$this->writeBack($tmpFile, $path);
+			});
 		}
 	}
 
-	private static $tempFiles = array();
-
 	/**
 	 * write back temporary files
 	 */
-	function writeBack($tmpFile) {
-		if (isset(self::$tempFiles[$tmpFile])) {
-			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
-			unlink($tmpFile);
-		}
+	function writeBack($tmpFile, $path) {
+		$this->addFile($path, $tmpFile);
+		unlink($tmpFile);
 	}
 
 	/**