mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove \OCP\Files::tmpFile 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-03-19 10:52:35 +01:00
parent 63bc633d89
commit 47a3008141
No known key found for this signature in database
GPG Key ID: F941078878347C0C
11 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_external/lib/Lib/Storage/AmazonS3.php
View File

@ -410,7 +410,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
}
case 'w':
case 'wb':
$tmpFile = \OCP\Files::tmpFile();
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
$handle = fopen($tmpFile, 'w');
return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) {
@ -431,7 +431,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
} else {
$ext = '';
}
$tmpFile = \OCP\Files::tmpFile($ext);
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
if ($this->file_exists($path)) {
$source = $this->readObject($path);
file_put_contents($tmpFile, $source);

2
apps/files_external/lib/Lib/Storage/FTP.php
View File

@ -128,7 +128,7 @@ class FTP extends StreamWrapper{
} else {
$ext='';
}
$tmpFile=\OCP\Files::tmpFile($ext);
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
if ($this->file_exists($path)) {
$this->getFile($path, $tmpFile);
}

2
apps/files_external/lib/Lib/Storage/SMB.php
View File

@ -353,7 +353,7 @@ class SMB extends Common implements INotifyStorage {
if (!$this->isCreatable(dirname($path))) {
return false;
}
$tmpFile = \OCP\Files::tmpFile($ext);
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
}
$source = fopen($tmpFile, $mode);
$share = $this->share;

2
apps/files_external/lib/Lib/Storage/Swift.php
View File

@ -428,7 +428,7 @@ class Swift extends \OC\Files\Storage\Common {
} else {
$ext = '';
}
$tmpFile = \OCP\Files::tmpFile($ext);
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
// Fetch existing file if required
if ($mode[0] !== 'w' && $this->file_exists($path)) {
if ($mode[0] === 'x') {

2
lib/private/Archive/TAR.php
View File

@ -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') {

2
lib/private/Archive/ZIP.php
View File

@ -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);
}

2
lib/private/Files/Storage/Flysystem.php
View File

@ -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) {

13
lib/public/Files.php
View File

@ -88,19 +88,6 @@ class Files {
return $count;
}
/**
* 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

2
tests/lib/Archive/TARTest.php
View File

@ -18,6 +18,6 @@ class TARTest extends TestBase {
}
protected function getNew() {
return new TAR(\OCP\Files::tmpFile('.tar.gz'));
return new TAR(\OC::$server->getTempManager()->getTemporaryFile('.tar.gz'));
}
}

2
tests/lib/Archive/TestBase.php
View File

@ -58,7 +58,7 @@ abstract class TestBase extends \Test\TestCase {
$textFile=$dir.'/lorem.txt';
$this->assertEquals(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
$tmpFile=\OCP\Files::tmpFile('.txt');
$tmpFile = \OC::$server->getTempManager()->getTemporaryFile('.txt');
$this->instance->extractFile('lorem.txt', $tmpFile);
$this->assertEquals(file_get_contents($textFile), file_get_contents($tmpFile));
}

2
tests/lib/Archive/ZIPTest.php
View File

@ -18,6 +18,6 @@ class ZIPTest extends TestBase {
}
protected function getNew() {
return new ZIP(\OCP\Files::tmpFile('.zip'));
return new ZIP(\OC::$server->getTempManager()->getTemporaryFile('.zip'));
}
}