Change package for unzip from gbeushausen/distill to nelexa/zip

Author: TumTum

CHANGELOG.md

@@ -66,6 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     - `misc:generate:yaml:config` is now `deploy:generate:configration`
     - `misc:generate:yaml:module` is now `deploy:generate:module-activator`
     - `module:multiactivator` is now `deploy:module-activator`
+  - Change package for unzip from gbeushausen/distill to nelexa/zip
 
 ### Removed
   - `oxrun.phar` use ./vendor/bin/oe-console

composer.json

@@ -16,7 +16,8 @@
   ],
   "require": {
     "oxid-esales/oxideshop-ce": "^v6.5",
-    "guzzlehttp/guzzle": "*"
+    "guzzlehttp/guzzle": "*",
+    "nelexa/zip": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^9",

src/Oxrun/Command/Module/GenerateCommand.php

@@ -2,6 +2,7 @@
 
 namespace Oxrun\Command\Module;
 
+use OxidEsales\Facts\Facts;
 use Oxrun\GenerateModule\CreateModule;
 use Oxrun\GenerateModule\InteractModuleForm;
 use Oxrun\GenerateModule\ModuleSpecification;
@@ -54,20 +55,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $app = $this->getApplication();
+        $oxSourcePath = (new Facts())->getSourcePath();
+        $oxInstallationPath = (new Facts())->getShopRootPath();
 
         $skeletonUri = $input->getOption('skeleton');
 
         $output->writeln("Module will be create ... <info>please wait</info> ...");
         $output->writeln(" - Use Template: $skeletonUri", OutputInterface::VERBOSITY_VERBOSE);
 
-        $createModule = new CreateModule(OX_BASE_PATH, $app->getName(), $app->getVersion());
+        $createModule = new CreateModule($oxSourcePath, $app->getName(), $app->getVersion());
         $createModule->run($skeletonUri, $this->moduleSpecification);
 
-        $destinationPath = $this->moduleSpecification->getDestinationPath(OX_BASE_PATH);
+        $destinationPath = $this->moduleSpecification->getDestinationPath($oxSourcePath);
         $namespace = $this->moduleSpecification->getNamespace();
 
         $output->write("Enable new namespace <comment>`$namespace`</comment>, ");
-        $output->writeln('run <comment>`composer dumpautoload`</comment> into <comment>`'.INSTALLATION_ROOT_PATH.'`</comment>');
+        $output->writeln('run <comment>`composer dumpautoload`</comment> into <comment>`' . $oxInstallationPath . '`</comment>');
         $output->writeln("<info>Module is stored at <comment>{$destinationPath}</comment></info>");
 
         return 0;

src/Oxrun/GenerateModule/CreateModule.php

@@ -57,13 +57,6 @@ public function __construct($shopdir, $appname, $version, HandlerStack $mockHand
     /**
      * @param string $skeletonUri
      * @param ModuleSpecification $moduleSpecification
-     *
-     * @throws \Distill\Exception\IO\Input\FileEmptyException
-     * @throws \Distill\Exception\IO\Input\FileFormatNotSupportedException
-     * @throws \Distill\Exception\IO\Input\FileNotFoundException
-     * @throws \Distill\Exception\IO\Input\FileNotReadableException
-     * @throws \Distill\Exception\IO\Input\FileUnknownFormatException
-     * @throws \Distill\Exception\IO\Output\TargetDirectoryNotWritableException
      */
     public function run($skeletonUri, ModuleSpecification $moduleSpecification)
     {

src/Oxrun/GenerateModule/DownloadSkeleton.php

@@ -8,15 +8,15 @@
 
 namespace Oxrun\GenerateModule;
 
-use Distill\Distill;
-use Distill\Format;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\BadResponseException;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\RequestOptions;
+use PhpZip\ZipFile;
 use Symfony\Component\Filesystem\Exception\FileNotFoundException;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
+
 use function GuzzleHttp\Psr7\stream_for;
 
 /**
@@ -93,12 +93,6 @@ public function download($url)
 
     /**
      * @param $destination
-     * @throws \Distill\Exception\IO\Input\FileEmptyException
-     * @throws \Distill\Exception\IO\Input\FileFormatNotSupportedException
-     * @throws \Distill\Exception\IO\Input\FileNotFoundException
-     * @throws \Distill\Exception\IO\Input\FileNotReadableException
-     * @throws \Distill\Exception\IO\Input\FileUnknownFormatException
-     * @throws \Distill\Exception\IO\Output\TargetDirectoryNotWritableException
      * @throws \Exception
      */
     public function extractTo($destination)
@@ -116,10 +110,10 @@ public function extractTo($destination)
             @mkdir($downloadFolder, 0755, true);
         }
 
-        $distill = new Distill();
-        if (false == $distill->extract($this->tempnam, $downloadFolder, new Format\Simple\Zip())) {
-            throw new \Exception('Can not be extract.');
-        };
+        (new ZipFile())
+            ->openFile($this->tempnam)
+            ->extractTo($downloadFolder)
+        ;
 
         $filesystem = new Filesystem();
         $finder = new Finder();