wip #4163 @0.5

diff --git a/src/Zip.php b/src/Zip.php
index 498b9026b9bca9e92ee00167a402028639274de3..5859dc84950652b0209543e0428389e4f96299e9 100644 (file)
--- a/src/Zip.php
+++ b/src/Zip.php
@@ -4,44 +4,57 @@ namespace Cubist\Util;
 class Zip
 {
 
-       public static function extract($zip, $dir)
-       {
-
-               if (!file_exists($dir)) {
-                       mkdir($dir, 0777, true);
-               }
-               if (true) {
-                       $cl = new CommandLine('unzip');
-                       $cl->cd($dir);
-                       $cl->setArg('o');
-                       $cl->setArg(null, $zip);
-                       $cl->execute();
-               } else if (class_exists('ZipArchive')) {
-                       $za = new \ZipArchive();
-                       $za->open($zip);
-                       $za->extractTo($dir);
-                       $za->close();
-               }
-       }
-
-       public static function archive($source, $zip)
-       {
-               $zipexe = 'zip';
-
-               $cl = new CommandLine($zipexe);
-               if (is_array($source)) {
-                       $cl->setArg('j');
-                       $cl->setArg(null, $zip);
-                       foreach ($source as $item) {
-                               $cl->setArg(null, $item);
-                       }
-               } else if (@is_dir($source)) {
-                       $cl->cd($source);
-                       $cl->setArg('r');
-                       $cl->setArg(null, $zip);
-                       $cl->setArg(null, '*');
-               }
-               $cl->execute();
-       }
+    /**
+     * @param $zip
+     * @param $dir
+     * @return CommandLine
+     */
+    public static function extract($zip, $dir)
+    {
+
+        if (!file_exists($dir)) {
+            mkdir($dir, 0777, true);
+        }
+
+        $cl = new CommandLine('unzip');
+        $cl->cd($dir);
+        $cl->setArg('o');
+        $cl->setArg(null, $zip);
+        $cl->execute();
+        return $cl;
+//             } else if (class_exists('ZipArchive')) {
+//                     $za = new \ZipArchive();
+//                     $za->open($zip);
+//                     $za->extractTo($dir);
+//                     $za->close();
+//             }
+    }
+
+    /**
+     * @param $source string
+     * @param $zip string
+     * @return CommandLine
+     */
+    public static function archive($source, $zip)
+    {
+        $zipexe = 'zip';
+
+        $cl = new CommandLine($zipexe);
+        if (is_array($source)) {
+            $cl->setArg('j');
+            $cl->setArg(null, $zip);
+            foreach ($source as $item) {
+                $cl->setArg(null, $item);
+            }
+        } else if (@is_dir($source)) {
+            $cl->cd($source);
+            $cl->setArg('r');
+            $cl->setArg(null, $zip);
+            $cl->setArg(null, '*');
+        }
+        $cl->execute();
+        return $cl;
+
+    }
 
 }
\ No newline at end of file