Merge pull request 'v1.2.0' (#3) from dev into master

Reviewed-on: #3

pm-convert

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

src/Exporters/Abstract/AbstractConverter.php

@@ -71,7 +71,7 @@ abstract class AbstractConverter implements ConverterContract
      */
     protected function setVariables(): static
     {
-        if (isset($this->collection?->variable)) {
+        if ($this->collection->variable) {
             foreach ($this->collection->variable as $var) {
                 $this->vars["{{{$var->key}}}"] = $var->value;
             }
@@ -173,7 +173,7 @@ abstract class AbstractConverter implements ConverterContract
      */
     protected function interpolate(string $content): string
     {
-        if (empty($this->vars) && !empty($this->env) && $this->env->hasVars()) {
+        if (empty($this->vars) && $this->env->hasVars()) {
             return $content;
         }
         $matches = [];

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,6 +75,7 @@ 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

@@ -22,7 +22,7 @@ class Processor
     /**
      * Converter version
      */
-    public const VERSION = '1.2.3';
+    public const VERSION = '1.2.0';
 
     /**
      * @var string[] Paths to collection files
@@ -167,9 +167,6 @@ 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];
         }
@@ -229,9 +226,6 @@ 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)) {
@@ -291,7 +285,7 @@ class Processor
     /**
      * @return string[]
      */
-    public function version(): array
+    protected function version(): array
     {
         return ["Postman collection converter v" . self::VERSION];
     }
@@ -299,7 +293,7 @@ class Processor
     /**
      * @return string[]
      */
-    public function copyright(): array
+    protected function copyright(): array
     {
         return [
             'Anthony Axenov (c) ' . date('Y') . ", MIT license",
@@ -310,7 +304,7 @@ class Processor
     /**
      * @return array
      */
-    public function usage(): array
+    protected function usage(): array
     {
         return array_merge($this->version(), [
             'Usage:',