Migrate from alchemy/zippy to chumper/zipper (#40)

* Migrate from alchemy/zippy to chumper/zipper

* Make phpcs happy

* Remove superfluous try-catch

Author: aphofstede

composer.json

@@ -6,7 +6,7 @@
         "php": ">=5.6",
         "justinrainbow/json-schema": "^5.2",
         "frictionlessdata/tableschema": "^0.1.9",
-        "alchemy/zippy": "=0.3.5"
+        "chumper/zipper": "1.0.x"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.35",

src/Datapackages/BaseDatapackage.php

@@ -7,7 +7,7 @@
 use frictionlessdata\datapackage\Utils;
 use frictionlessdata\datapackage\Validators\DatapackageValidator;
 use frictionlessdata\datapackage\Exceptions\DatapackageValidationFailedException;
-use Alchemy\Zippy\Zippy;
+use Chumper\Zipper\Zipper;
 
 abstract class BaseDatapackage implements \Iterator
 {
@@ -170,7 +170,7 @@ public function valid()
 
     public function save($zip_filename)
     {
-        $zippy = Zippy::load();
+        $zipper = new Zipper();
         $base = tempnam(sys_get_temp_dir(), 'datapackage-zip-');
         $files = [
             'datapackage.json' => $base.'datapackage.json',
@@ -185,7 +185,8 @@ public function save($zip_filename)
             ++$ri;
         }
         $this->saveDescriptor($files['datapackage.json']);
-        $zippy->create($zip_filename, $files);
+        /* @noinspection PhpUnhandledExceptionInspection Never occurs with our args */
+        $zipper->make($zip_filename)->add($files)->close();
         foreach (array_values($files) as $file) {
             unlink($file);
         }

src/Factory.php

@@ -4,7 +4,7 @@
 
 use frictionlessdata\datapackage\Datapackages\BaseDatapackage;
 use frictionlessdata\datapackage\Resources\BaseResource;
-use Alchemy\Zippy\Zippy;
+use Chumper\Zipper\Zipper;
 
 /**
  * datapackage and resource have different classes depending on the corresponding profile
@@ -349,14 +349,16 @@ protected static function loadHttpZipSource($source)
 
     protected static function loadFileZipSource($source)
     {
-        $zippy = Zippy::load();
+        $zipper = new Zipper();
         $tempdir = tempnam(sys_get_temp_dir(), 'datapackage-php');
         unlink($tempdir);
         mkdir($tempdir);
         register_shutdown_function(function () use ($tempdir) {Utils::removeDir($tempdir); });
-        $zippy->open($source)->extract($tempdir);
+        /* @noinspection PhpUnhandledExceptionInspection File existence is checked afterwards anyway */
+        $zipper->make($source)->extractTo($tempdir);
+        $zipper->close();
         if (!file_exists($tempdir.'/datapackage.json')) {
-            throw new Exceptions\DatapackageInvalidSourceException('zip file must contain a datappackage.json file');
+            throw new Exceptions\DatapackageInvalidSourceException('zip file must contain a datapackage.json file');
         }
 
         return static::loadSource($tempdir.'/datapackage.json', $tempdir);

tests/DatapackageTest.php

@@ -2,7 +2,7 @@
 
 namespace frictionlessdata\datapackage\tests;
 
-use Alchemy\Zippy\Zippy;
+use Chumper\Zipper\Zipper;
 use frictionlessdata\datapackage\Utils;
 use frictionlessdata\datapackage\Validators\DatapackageValidationError;
 use PHPUnit\Framework\TestCase;
@@ -465,14 +465,14 @@ public function testCreateEditDatapackageDescriptor()
 
         $filename = tempnam(sys_get_temp_dir(), 'datapackage-php-tests-').'.zip';
         $package->save($filename);
-        $zippy = Zippy::load();
+        $zipper = new Zipper();
         $tempdir = sys_get_temp_dir().DIRECTORY_SEPARATOR.'datapackage-php-tests-zipdir';
         if (file_exists($tempdir)) {
             Utils::removeDir($tempdir);
         }
         mkdir($tempdir);
-        $archive = $zippy->open($filename);
-        $archive->extract($tempdir);
+        $zipper->make($filename)->extractTo($tempdir);
+        $zipper->close();
         unlink($filename);
         $tempdir = $tempdir.DIRECTORY_SEPARATOR;
         $this->assertEquals($expectedDatapackageDescriptor, json_decode(file_get_contents($tempdir.'datapackage.json')));