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

Move to non-static version 

The static version is used nowhere in the code and just decreases coverage

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
This commit is contained in:
Lukas Reschke 2016-10-31 18:42:19 +01:00
parent d805df7bb3
commit 086d43f26d
No known key found for this signature in database
GPG Key ID: B9F6980CF6E759B1
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/private/Archive/Archive.php
View File

@ -32,26 +32,7 @@
namespace OC\Archive;
abstract class Archive{
/**
* Open any of the supported archive types
*
* @param string $path
* @return Archive|void
*/
public static function open($path) {
$mime = \OC::$server->getMimeTypeDetector()->detect($path);
switch($mime) {
case 'application/zip':
return new ZIP($path);
case 'application/x-gzip':
return new TAR($path);
case 'application/x-bzip2':
return new TAR($path);
}
}
abstract class Archive {
/**
* @param $source
*/

3
lib/private/Installer.php
View File

@ -46,6 +46,7 @@ use OC\App\CodeChecker\CodeChecker;
use OC\App\CodeChecker\EmptyCheck;
use OC\App\CodeChecker\PrivateCheck;
use OC\Archive\Archive;
use OC\Archive\TAR;
use OC_App;
use OC_DB;
use OC_Helper;
@ -254,7 +255,7 @@ class Installer {
if($verified === true) {
// Seems to match, let's proceed
$extractDir = $this->tempManager->getTemporaryFolder();
$archive = Archive::open($tempFile);
$archive = new TAR($tempFile);
if($archive) {
$archive->extract($extractDir);