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>

diff --git a/lib/private/Archive/Archive.php b/lib/private/Archive/Archive.php
index da2c53f2aa14c44939efdd86dfe3addfa080ae7a..fadc12d2a24bcab1022a99dddc907f76a4795943 100644 (file)
--- a/lib/private/Archive/Archive.php
+++ b/lib/private/Archive/Archive.php
@@ -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
         */

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 67c949bc1352bba9a72868ea68e1c962970bcd25..120992d3e632cc3620400576db79fe5453e23146 100644 (file)
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -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);