Bläddra i källkod

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 år sedan
förälder
incheckning
086d43f26d
Inget konto är kopplat till bidragsgivarens mejladress
2 ändrade filer med 3 tillägg och 21 borttagningar
  1. 1
    20
      lib/private/Archive/Archive.php
  2. 2
    1
      lib/private/Installer.php

+ 1
- 20
lib/private/Archive/Archive.php Visa fil



namespace OC\Archive; 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 * @param $source
*/ */

+ 2
- 1
lib/private/Installer.php Visa fil

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


if($archive) { if($archive) {
$archive->extract($extractDir); $archive->extract($extractDir);

Laddar…
Avbryt
Spara