From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 30 Dec 2020 20:03:43 +0000 (+0100)
Subject: wip #4163 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c1bda8314a5b31984b140aa685d4997dff1fb857;p=cubist_util.git

wip #4163 @0.5
---

diff --git a/src/Zip.php b/src/Zip.php
index 498b902..5859dc8 100644
--- 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