Merge pull request 'v1.2.4' (#9) from dev into master

Reviewed-on: #9

README.md

@@ -32,7 +32,7 @@ These formats are supported for now: `http`, `curl`, `wget`.
 - tests, phpcs, psalm, etc.;
 - web version.
 
-## Installation
+## Install and upgrade
 
 ```
 composer global r axenov/pm-convert

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "axenov/pm-convert",
     "type": "library",
-    "description": "Postman collection coverter",
+    "description": "Postman collection converter",
     "license": "MIT",
     "homepage": "https://axenov.dev/",
     "authors": [

pm-convert

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use PmConverter\Processor;
 
@@ -20,8 +20,13 @@ foreach ($paths as $path) {
 
 is_null($file) && throw new RuntimeException('Unable to locate autoload.php file.');
 
+$processor = new Processor($argv);
 try {
-    (new Processor($argv))->convert();
+    $processor->convert();
+} catch (InvalidArgumentException $e) {
+    fwrite(STDERR, sprintf('ERROR: %s%s', $e->getMessage(), PHP_EOL));
+    print(implode(PHP_EOL, $processor->usage()));
+    die(1);
 } catch (Exception $e) {
     fwrite(STDERR, sprintf('ERROR: %s%s', $e->getMessage(), PHP_EOL));
     die(1);

src/Exporters/Abstract/AbstractConverter.php

@@ -32,9 +32,9 @@ abstract class AbstractConverter implements ConverterContract
     protected array $vars = [];
 
     /**
-     * @var Environment
+     * @var Environment|null
      */
-    protected Environment $env;
+    protected ?Environment $env = null;
 
     /**
      * Sets an environment with vars
@@ -71,7 +71,7 @@ abstract class AbstractConverter implements ConverterContract
      */
     protected function setVariables(): static
     {
-        if ($this->collection->variable) {
+        if (isset($this->collection?->variable)) {
             foreach ($this->collection->variable as $var) {
                 $this->vars["{{{$var->key}}}"] = $var->value;
             }
@@ -173,11 +173,11 @@ abstract class AbstractConverter implements ConverterContract
      */
     protected function interpolate(string $content): string
     {
-        if (empty($this->vars) && $this->env->hasVars()) {
+        if (empty($this->vars) && !$this->env?->hasVars()) {
             return $content;
         }
         $matches = [];
-        if (preg_match_all('/\{\{[a-zA-Z][a-zA-Z0-9]+}}/', $content, $matches, PREG_PATTERN_ORDER) > 0) {
+        if (preg_match_all('/\{\{[a-zA-Z][a-zA-Z0-9]*}}/m', $content, $matches, PREG_PATTERN_ORDER) > 0) {
             foreach ($matches[0] as $key => $var) {
                 if (str_contains($content, $var)) {
                     $content = str_replace($var, $this->vars[$var] ?? $this->env[$var] ?? $var, $content);

src/Exporters/Wget/WgetRequest.php

@@ -53,7 +53,7 @@ class WgetRequest extends AbstractRequest
                 $output[] = http_build_query($params);
                 return $output;
             default:
-                return ["\t$this->body"];
+                return ["\t'$this->body' \ "];
         }
     }
 
@@ -75,7 +75,6 @@ class WgetRequest extends AbstractRequest
             $this->prepareHeaders(),
             $this->prepareBody()
         );
-        $output[] = rtrim(array_pop($output), '\ ');
         $output[] = "\t'$this->url'";
         return implode(PHP_EOL, array_merge($output, ['']));
     }

src/FileSystem.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace PmConverter;
 

src/Processor.php

@@ -7,22 +7,21 @@ namespace PmConverter;
 use Exception;
 use InvalidArgumentException;
 use JsonException;
-use PmConverter\Exceptions\CannotCreateDirectoryException;
+use PmConverter\Exceptions\{
-use PmConverter\Exceptions\DirectoryIsNotReadableException;
+    CannotCreateDirectoryException,
-use PmConverter\Exceptions\DirectoryIsNotWriteableException;
+    DirectoryIsNotReadableException,
-use PmConverter\Exceptions\DirectoryNotExistsException;
+    DirectoryIsNotWriteableException,
-use PmConverter\Exporters\ConverterContract;
+    DirectoryNotExistsException};
-use PmConverter\Exporters\ConvertFormat;
+use PmConverter\Exporters\{
+    ConverterContract,
+    ConvertFormat};
 
-/**
- *
- */
 class Processor
 {
     /**
      * Converter version
      */
-    public const VERSION = '1.2.0';
+    public const VERSION = '1.2.4';
 
     /**
      * @var string[] Paths to collection files
@@ -89,9 +88,6 @@ class Processor
      * Parses an array of arguments came from cli
      *
      * @return void
-     * @throws DirectoryIsNotWriteableException
-     * @throws DirectoryNotExistsException
-     * @throws DirectoryIsNotReadableException
      */
     protected function parseArgs(): void
     {
@@ -167,6 +163,9 @@ class Processor
         if (empty($this->collectionPaths)) {
             throw new InvalidArgumentException('there are no collections to convert');
         }
+        if (empty($this->outputPath)) {
+            throw new InvalidArgumentException('-o is required');
+        }
         if (empty($this->formats)) {
             $this->formats = [ConvertFormat::Http->name => ConvertFormat::Http];
         }
@@ -226,6 +225,9 @@ class Processor
      */
     protected function initEnv(): void
     {
+        if (!isset($this->envFile)) {
+            return;
+        }
         $content = file_get_contents(FileSystem::normalizePath($this->envFile));
         $content = json_decode($content, flags: JSON_THROW_ON_ERROR);
         if (!property_exists($content, 'environment') || empty($content?->environment)) {
@@ -279,13 +281,13 @@ class Processor
     {
         $time = (hrtime(true) - $this->initTime) / 1_000_000;
         $ram = (memory_get_peak_usage(true) - $this->initRam) / 1024 / 1024;
-        printf('Converted %d of %d in %.3f ms using %.3f MiB RAM', $success, $count, $time, $ram);
+        printf('Converted %d of %d in %.3f ms using %.3f MiB RAM%s', $success, $count, $time, $ram, PHP_EOL);
     }
 
     /**
      * @return string[]
      */
-    protected function version(): array
+    public function version(): array
     {
         return ["Postman collection converter v" . self::VERSION];
     }
@@ -293,7 +295,7 @@ class Processor
     /**
      * @return string[]
      */
-    protected function copyright(): array
+    public function copyright(): array
     {
         return [
             'Anthony Axenov (c) ' . date('Y') . ", MIT license",
@@ -304,7 +306,7 @@ class Processor
     /**
      * @return array
      */
-    protected function usage(): array
+    public function usage(): array
     {
         return array_merge($this->version(), [
             'Usage:',
@@ -315,7 +317,7 @@ class Processor
             '',
             'Possible ARGUMENTS:',
             "\t-f, --file       - a PATH to single collection located in PATH to convert from",
-            "\t-d, --dir        - a directory with collections located in COLLECTION_FILEPATH to convert from",
+            "\t-d, --dir        - a directory with collections located in PATH to convert from",
             "\t-o, --output     - a directory OUTPUT_PATH to put results in",
             "\t-e, --env        - use environment file with variable values to replace in request",
             "\t-p, --preserve   - do not delete OUTPUT_PATH (if exists)",
@@ -335,6 +337,7 @@ class Processor
             "\t--http   - generate raw *.http files (default)",
             "\t--curl   - generate shell scripts with curl command",
             "\t--wget   - generate shell scripts with wget command",
+            '',
             'If no FORMATS specified then --http implied.',
             'Any of FORMATS can be specified at the same time.',
             '',