Browse Source

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>
tags/v11.0RC2
Lukas Reschke 7 years ago
parent
commit
086d43f26d
No account linked to committer's email address
2 changed files with 3 additions and 21 deletions
  1. 1
    20
      lib/private/Archive/Archive.php
  2. 2
    1
      lib/private/Installer.php

+ 1
- 20
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
*/

+ 2
- 1
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);

Loading…
Cancel
Save