Merge pull request 'v1.4.0' (#12 ) from dev into master

Reviewed-on: #12
Bump version
2023-09-10 07:32:27 +00:00 · 2023-09-10 15:31:41 +08:00 · 2023-09-10 15:28:09 +08:00 · 2023-09-10 09:17:12 +08:00 · 2023-09-10 09:14:03 +08:00 · 2023-09-10 01:12:37 +00:00
27 changed files with 3003 additions and 358 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 /.idea
 /.vscode
 /vendor
+.phpunit.result.cache
+.phpunit.cache
--- a/README.md
+++ b/README.md
@@ -24,18 +24,20 @@ These formats are supported for now: `http`, `curl`, `wget`.

 ## Planned features

+- conversion between postman schema v2.1 <-> v2.0 (#11);
 - support as many as possible/necessary of authentication kinds (_currently only `Bearer` supported_);
 - support as many as possible/necessary of body formats (_currently only `json` and `formdata`_);
- documentation generation support (markdown) with responce examples (if present);
+- documentation generation support (markdown) with responce examples (if present) (#6);
 - maybe some another convert formats (like httpie or something...);
 - better logging;
- tests, phpcs, psalm, etc.;
+- 90%+ test coverage, phpcs, psalm, etc.;
 - web version.

-## Installation
+## Install and upgrade

 ```
-composer global r axenov/pm-convert
+composer global r axenov/pm-convert   # install
+composer global u axenov/pm-convert   # upgrade
 ```

 Make sure your `~/.config/composer/vendor/bin` is in `$PATH` env:
@@ -58,30 +60,40 @@ Usage:
        ./vendor/bin/pm-convert -f|-d PATH -o OUTPUT_PATH [ARGUMENTS] [FORMATS]

 Possible ARGUMENTS:
-        -f, --file       - a PATH to single collection located in PATH to convert from
-        -d, --dir        - a directory with collections located in COLLECTION_FILEPATH to convert from
-        -o, --output     - a directory OUTPUT_PATH to put results in
-        -e, --env        - use environment file with variable values to replace in request
-        -p, --preserve   - do not delete OUTPUT_PATH (if exists)
-        -h, --help       - show this help message and exit
-        -v, --version    - show version info and exit
+        -f, --file          - a PATH to a single collection file to convert from
+        -d, --dir           - a PATH to a directory with collections to convert from
+        -o, --output        - a directory OUTPUT_PATH to put results in
+        -e, --env           - use environment file with variables to replace in requests
+        --var "NAME=VALUE"  - force replace specified env variable called NAME with custom VALUE
+                              (see interpolation notes below)
+        -p, --preserve      - do not delete OUTPUT_PATH (if exists)
+        -h, --help          - show this help message and exit
+        -v, --version       - show version info and exit

 If no ARGUMENTS passed then --help implied.
-If both -f and -d are specified then only unique set of files will be converted.
+If both -f and -d are specified then only unique set of files from both arguments will be converted.
 -f or -d are required to be specified at least once, but each may be specified multiple times.
 PATH must be a valid path to readable json-file or directory.
 OUTPUT_PATH must be a valid path to writeable directory.
-If -o is specified several times then only last one will be used.
-If -e is specified several times then only last one will be used.
-If -e is not specified then only collection vars will be replaced (if any).
+If -o or -e was specified several times then only last one will be used.

 Possible FORMATS:
        --http   - generate raw *.http files (default)
        --curl   - generate shell scripts with curl command
        --wget   - generate shell scripts with wget command
+
 If no FORMATS specified then --http implied.
 Any of FORMATS can be specified at the same time.

+Notes about variable interpolation:
+        1. You can use -e to tell where to find variables to replace in requests.
+        2. You can use one or several --var to replace specific env variables to your own value.
+        3. Correct syntax is `--var "NAME=VALUE". NAME may be in curly braces like {{NAME}}.
+        4. Since -e is optional, a bunch of --var will emulate an environment. Also it does not
+           matter if there is --var in environment file you provided or not.
+        5. Even if you (not) provided -e and/or --var, any of variable may still be overridden
+           from collection (if any), so last ones has top priority.
+
 Example:
    ./pm-convert \ 
        -f ~/dir1/first.postman_collection.json \ 
@@ -89,14 +101,27 @@ Example:
        --file ~/dir2/second.postman_collection.json \ 
        --env ~/localhost.postman_environment.json \ 
        -d ~/personal \ 
+        --var "myvar=some value" \ 
        -o ~/postman_export 

 ```
-### Notice

-Make sure every (I mean _every_) collection (not collection file), its folders and/or requests has unique names.
-If not, you can rename them in Postman or convert collections with similar names into different directories.
-Otherwise converted files may be overwritten by each other.
+### Notices
+
+1. Result of `pm-convert` execution is bunch of generated files.
+   Most likely they will contain errors such as not interpolated `{{variables}}` values (due to missed ones in collection),
+   wrong command format or `GET`s with bodies.
+   You must review any generated file before using.
+2. Make sure every (I mean _every_) collection (not collection file), its folders and/or requests has unique names.
+   If not, you can rename them in Postman or convert collections with similar names into different directories.
+   Otherwise any generated file may be accidently overwritten by another one.
+
+## How to implement a new format
+
+1. Create new namespace in `./src/Converters` and name it according to format of your choice
+2. Create two classes for converter and request object which extends `Converters\Abstract\Abstract{Converter, Request}` respectively
+3. Change constants values in your new request class according to format you want to implement
+4. Write your own logic in converter's `__toString()` method, write new methods and override abstract ones

 ## License

--- a/composer.json
+++ b/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": [
@@ -15,9 +15,7 @@
        "php": "^8.1",
        "ext-json": "*"
    },
-    "bin": [
-        "pm-convert"
-    ],
+    "bin": ["pm-convert"],
    "autoload": {
        "psr-4": {
            "PmConverter\\": "src\\"
@@ -30,5 +28,8 @@
        "optimize-autoloader": true,
        "preferred-install": "dist",
        "sort-packages": true
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^10.3"
    }
 }
--- a/composer.lock
+++ b/composer.lock
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="Main">
+<!--            <directory>tests</directory>-->
+            <file>tests/AbstractRequestTest.php</file>
+            <file>tests/HttpRequestTest.php</file>
+            <file>tests/WgetRequestTest.php</file>
+        </testsuite>
+    </testsuites>
+
+    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
+</phpunit>
--- a/src/Converters/Abstract/AbstractConverter.php
+++ b/src/Converters/Abstract/AbstractConverter.php
@@ -2,13 +2,14 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Abstract;
+namespace PmConverter\Converters\Abstract;

 use Exception;
-use PmConverter\Environment;
-use PmConverter\Exporters\{
+use PmConverter\Converters\{
    ConverterContract,
    RequestContract};
+use PmConverter\Environment;
+use PmConverter\Exceptions\InvalidHttpVersionException;
 use PmConverter\FileSystem;

 /**
@@ -27,14 +28,9 @@ abstract class AbstractConverter implements ConverterContract
    protected string $outputPath;

    /**
-     * @var string[]
+     * @var Environment|null
     */
-    protected array $vars = [];
-
-    /**
-     * @var Environment
-     */
-    protected Environment $env;
+    protected ?Environment $env = null;

    /**
     * Sets an environment with vars
@@ -71,9 +67,10 @@ abstract class AbstractConverter implements ConverterContract
     */
    protected function setVariables(): static
    {
-        if ($this->collection->variable) {
+        empty($this->env) && $this->env = new Environment($this->collection?->variable);
+        if (!empty($this->collection?->variable)) {
            foreach ($this->collection->variable as $var) {
-                $this->vars["{{{$var->key}}}"] = $var->value;
+                $this->env[$var->key] = $var->value;
            }
        }
        return $this;
@@ -129,14 +126,16 @@ abstract class AbstractConverter implements ConverterContract
     *
     * @param object $item
     * @return RequestContract
+     * @throws InvalidHttpVersionException
     */
    protected function initRequest(object $item): RequestContract
    {
        $request_class = static::REQUEST_CLASS;

        /** @var RequestContract $result */
-        $result = new $request_class($this->vars);
+        $result = new $request_class();
        $result->setName($item->name);
+        $result->setHttpVersion(1.1); //TODO http version?
        $result->setDescription($item->request?->description ?? null);
        $result->setVerb($item->request->method);
        $result->setUrl($item->request->url->raw);
@@ -173,21 +172,18 @@ abstract class AbstractConverter implements ConverterContract
     */
    protected function interpolate(string $content): string
    {
-        if (empty($this->vars) && $this->env->hasVars()) {
+        if (!$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('/\{\{.*}}/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);
+                    $content = str_replace($var, $this->env[$var] ?: $var, $content);
                    unset($matches[0][$key]);
                }
            }
        }
-        // if (!empty($matches[0])) {
-        //     fwrite(STDERR, sprintf('  No values found: %s%s', implode(', ', $matches[0]), PHP_EOL));
-        // }
        return $content;
    }
 }
--- a/src/Converters/Abstract/AbstractRequest.php
+++ b/src/Converters/Abstract/AbstractRequest.php
@@ -0,0 +1,295 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PmConverter\Converters\Abstract;
+
+use PmConverter\Converters\RequestContract;
+use PmConverter\Exceptions\{
+    EmptyHttpVerbException,
+    InvalidHttpVersionException};
+use PmConverter\HttpVersions;
+use Stringable;
+
+/**
+ * Class to determine file content with any request format
+ */
+abstract class AbstractRequest implements Stringable, RequestContract
+{
+    /**
+     * @var string HTTP verb (GET, POST, etc.)
+     */
+    protected string $verb;
+
+    /**
+     * @var string URL where to send a request
+     */
+    protected string $url;
+
+    /**
+     * @var float HTTP protocol version
+     */
+    protected float $httpVersion = 1.1;
+
+    /**
+     * @var string Request name
+     */
+    protected string $name;
+
+    /**
+     * @var string|null Request description
+     */
+    protected ?string $description = null;
+
+    /**
+     * @var array Request headers
+     */
+    protected array $headers = [];
+
+    /**
+     * @var mixed Request body
+     */
+    protected mixed $body = null;
+
+    /**
+     * @var string Request body type
+     */
+    protected string $bodymode = 'raw';
+
+    /**
+     * @inheritDoc
+     */
+    public function setHttpVersion(float $version): static
+    {
+        if (!in_array($version, HttpVersions::values())) {
+            throw new InvalidHttpVersionException(
+                'Only these HTTP versions are supported: ' . implode(', ', HttpVersions::values())
+            );
+        }
+        $this->httpVersion = $version;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getHttpVersion(): float
+    {
+        return $this->httpVersion;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setName(string $name): static
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName(): string
+    {
+        return str_replace(DIRECTORY_SEPARATOR, '_', $this->name);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setDescription(?string $description): static
+    {
+        $this->description = $description;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setVerb(string $verb): static
+    {
+        $this->verb = $verb;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getVerb(): string
+    {
+        empty($this->verb) && throw new EmptyHttpVerbException('Request HTTP verb must be defined before conversion');
+        return $this->verb;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setUrl(string $url): static
+    {
+        $this->url = $url;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getUrl(): string
+    {
+        return $this->url ?: '<empty url>';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setHeaders(?array $headers): static
+    {
+        foreach ($headers as $header) {
+            $this->setHeader($header->key, $header->value, $header?->disabled ?? false);
+        }
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setHeader(string $name, mixed $value, bool $disabled = false): static
+    {
+        $this->headers[$name] = [
+            'value' => $value,
+            'disabled' => $disabled,
+        ];
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getHeaders(): array
+    {
+        return $this->headers;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setAuth(?object $auth): static
+    {
+        if (!empty($auth)) {
+            switch ($auth->type) {
+                case 'bearer':
+                    $this->setHeader('Authorization', 'Bearer ' . $auth->{$auth->type}[0]->value);
+                    break;
+                default:
+                    break;
+            }
+        }
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBodymode(string $bodymode): static
+    {
+        $this->bodymode = $bodymode;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBodymode(): string
+    {
+        return $this->bodymode;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBody(object $body): static
+    {
+        $this->setBodymode($body->mode);
+        if ($body->mode === 'formdata') {
+            $this->setHeader('Content-Type', 'multipart/form-data')
+                ->setFormdataBody($body);
+        } elseif (!empty($body->options) && $body->options->{$this->bodymode}->language === 'json') {
+            $this->setHeader('Content-Type', 'application/json')
+                ->setJsonBody($body);
+        }
+        return $this;
+    }
+
+    /**
+     * Sets body content from multipart/formdata
+     *
+     * @param object $body
+     * @return $this
+     */
+    protected function setFormdataBody(object $body): static
+    {
+        foreach ($body->formdata as $field) {
+            $this->body[$field->key] = [
+                'value' => $field->type === 'file' ? $field->src : $field->value,
+                'type' => $field->type,
+            ];
+        }
+        return $this;
+    }
+
+    /**
+     * Sets body content from application/json
+     *
+     * @param object $body
+     * @return $this
+     */
+    protected function setJsonBody(object $body): static
+    {
+        $this->body = $body->{$this->getBodymode()};
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBody(): mixed
+    {
+        return $this->body;
+    }
+
+    /**
+     * Returns array of description lines
+     *
+     * @return array
+     */
+    abstract protected function prepareDescription(): array;
+
+    /**
+     * Returns array of headers
+     *
+     * @return array
+     */
+    abstract protected function prepareHeaders(): array;
+
+    /**
+     * Returns array of request body lines
+     *
+     * @return array
+     */
+    abstract protected function prepareBody(): array;
+
+    /**
+     * Converts request object to string to be written in result file
+     *
+     * @return string
+     */
+    abstract public function __toString(): string;
+}
--- a/src/Converters/ConvertFormat.php
+++ b/src/Converters/ConvertFormat.php
@@ -2,12 +2,13 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters;
+namespace PmConverter\Converters;


-use PmConverter\Exporters\Curl\CurlConverter;
-use PmConverter\Exporters\Http\HttpConverter;
-use PmConverter\Exporters\Wget\WgetConverter;
+use PmConverter\Converters\{
+    Curl\CurlConverter,
+    Http\HttpConverter,
+    Wget\WgetConverter};

 enum ConvertFormat: string
 {
--- a/src/Converters/ConverterContract.php
+++ b/src/Converters/ConverterContract.php
@@ -2,7 +2,7 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters;
+namespace PmConverter\Converters;

 interface ConverterContract
 {
--- a/src/Converters/Curl/CurlConverter.php
+++ b/src/Converters/Curl/CurlConverter.php
@@ -2,9 +2,9 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Curl;
+namespace PmConverter\Converters\Curl;

-use PmConverter\Exporters\{
+use PmConverter\Converters\{
    Abstract\AbstractConverter,
    ConverterContract};

--- a/src/Converters/Curl/CurlRequest.php
+++ b/src/Converters/Curl/CurlRequest.php
@@ -2,9 +2,9 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Curl;
+namespace PmConverter\Converters\Curl;

-use PmConverter\Exporters\Abstract\AbstractRequest;
+use PmConverter\Converters\Abstract\AbstractRequest;

 /**
 * Class to determine file content with curl request format
@@ -31,7 +31,7 @@ class CurlRequest extends AbstractRequest
            if ($header['disabled']) {
                continue;
            }
-            $output[] = sprintf("\t--header '%s=%s' \ ", $header_key, $header['value']);
+            $output[] = sprintf("\t--header '%s: %s' \ ", $header_key, $header['value']);
        }
        return $output;
    }
@@ -44,12 +44,12 @@ class CurlRequest extends AbstractRequest
        $output = [];
        switch ($this->bodymode) {
            case 'formdata':
-                foreach ($this->body as $data) {
+                foreach ($this->body as $key => $data) {
                    $output[] = sprintf(
                        "%s\t--form '%s=%s' \ ",
-                        isset($data->disabled) ? '# ' : '',
-                        $data->key,
-                        $data->type === 'file' ? "@$data->src" : $data->value
+                        isset($data['disabled']) ? '# ' : '',
+                        $key,
+                        $data['type'] === 'file' ? "@" . $data['value'] : $data['value']
                    );
                }
                break;
--- a/src/Converters/Http/HttpConverter.php
+++ b/src/Converters/Http/HttpConverter.php
@@ -2,9 +2,9 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Http;
+namespace PmConverter\Converters\Http;

-use PmConverter\Exporters\{
+use PmConverter\Converters\{
    Abstract\AbstractConverter,
    ConverterContract};

--- a/src/Converters/Http/HttpRequest.php
+++ b/src/Converters/Http/HttpRequest.php
@@ -2,9 +2,11 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Http;
+namespace PmConverter\Converters\Http;

-use PmConverter\Exporters\Abstract\AbstractRequest;
+use PmConverter\Converters\Abstract\AbstractRequest;
+use PmConverter\Exceptions\{
+    EmptyHttpVerbException};

 /**
 * Class to determine file content with http request format
@@ -23,12 +25,13 @@ class HttpRequest extends AbstractRequest

    /**
     * @inheritDoc
+     * @throws EmptyHttpVerbException
     */
    protected function prepareHeaders(): array
    {
-        $output[] = "$this->verb $this->url $this->http";
-        foreach ($this->headers as $header_key => $header) {
-            $output[] = sprintf('%s%s: %s', $header['disabled'] ? '# ' : '', $header_key, $header['value']);
+        $output[] = sprintf('%s %s HTTP/%s', $this->getVerb(), $this->getUrl(), $this->getHttpVersion());
+        foreach ($this->headers as $name => $data) {
+            $output[] = sprintf('%s%s: %s', $data['disabled'] ? '# ' : '', $name, $data['value']);
        }
        return $output;
    }
@@ -38,15 +41,15 @@ class HttpRequest extends AbstractRequest
     */
    protected function prepareBody(): array
    {
-        switch ($this->bodymode) {
+        switch ($this->getBodymode()) {
            case 'formdata':
                $output = [''];
-                foreach ($this->body as $data) {
+                foreach ($this->body as $key => $data) {
                    $output[] = sprintf(
                        '%s%s=%s',
-                        empty($data->disabled) ? '' : '# ',
-                        $data->key,
-                        $data->type === 'file' ? $data->src : $data->value
+                        empty($data['disabled']) ? '' : '# ',
+                        $key,
+                        $data['type'] === 'file' ? '@' . $data['value'] : $data['value']
                    );
                }
                return $output;
@@ -57,6 +60,7 @@ class HttpRequest extends AbstractRequest

    /**
     * @inheritDoc
+     * @throws EmptyHttpVerbException
     */
    public function __toString(): string
    {
--- a/src/Converters/RequestContract.php
+++ b/src/Converters/RequestContract.php
@@ -0,0 +1,153 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PmConverter\Converters;
+
+use PmConverter\Converters\Http\HttpRequest;
+use PmConverter\Exceptions\{
+    EmptyHttpVerbException,
+    InvalidHttpVersionException};
+
+interface RequestContract
+{
+    /**
+     * Sets HTTP protocol version
+     *
+     * @param float $version
+     * @return $this
+     * @throws InvalidHttpVersionException
+     */
+    public function setHttpVersion(float $version): static;
+
+    /**
+     * Returns HTTP protocol version
+     *
+     * @return float
+     */
+    public function getHttpVersion(): float;
+
+    /**
+     * Sets name from collection item to request object
+     *
+     * @param string $name
+     * @return HttpRequest
+     */
+    public function setName(string $name): static;
+
+    /**
+     * Returns name of request
+     *
+     * @return string
+     */
+    public function getName(): string;
+
+    /**
+     * Sets description from collection item to request object
+     *
+     * @param string|null $description
+     * @return HttpRequest
+     */
+    public function setDescription(?string $description): static;
+
+    /**
+     * Returns description request
+     *
+     * @return string|null
+     */
+    public function getDescription(): ?string;
+
+    /**
+     * Sets HTTP verb from collection item to request object
+     *
+     * @param string $verb
+     * @return HttpRequest
+     */
+    public function setVerb(string $verb): static;
+
+    /**
+     * Returns HTTP verb of request
+     *
+     * @return string
+     * @throws EmptyHttpVerbException
+     */
+    public function getVerb(): string;
+
+    /**
+     * Sets URL from collection item to request object
+     *
+     * @param string $url
+     * @return HttpRequest
+     */
+    public function setUrl(string $url): static;
+
+    /**
+     * Returns URL of request
+     *
+     * @return string
+     */
+    public function getUrl(): string;
+
+    /**
+     * Sets headers from collection item to request object
+     *
+     * @param object[]|null $headers
+     * @return $this
+     */
+    public function setHeaders(?array $headers): static;
+
+    /**
+     * Sets one header to request object
+     *
+     * @param string $name Header's name
+     * @param mixed $value Header's value
+     * @param bool $disabled Pass true to skip (or comment out) this header
+     * @return $this
+     */
+    public function setHeader(string $name, mixed $value, bool $disabled = false): static;
+
+    /**
+     * Returns array of prepared headers
+     *
+     * @return array
+     */
+    public function getHeaders(): array;
+
+    /**
+     * Sets authorization headers
+     *
+     * @param object|null $auth
+     * @return $this
+     */
+    public function setAuth(object $auth): static;
+
+    /**
+     * Sets body mode from collection item to request object
+     *
+     * @param string $bodymode
+     * @return HttpRequest
+     */
+    public function setBodymode(string $bodymode): static;
+
+    /**
+     * Returns body mode of request
+     *
+     * @return HttpRequest
+     */
+    public function getBodymode(): string;
+
+    /**
+     * Sets body from collection item to request object
+     *
+     * @param object $body
+     * @return $this
+     */
+    public function setBody(object $body): static;
+
+    /**
+     * Returns body content
+     *
+     * @return mixed
+     */
+    public function getBody(): mixed;
+}
--- a/src/Converters/Wget/WgetConverter.php
+++ b/src/Converters/Wget/WgetConverter.php
@@ -2,9 +2,9 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Wget;
+namespace PmConverter\Converters\Wget;

-use PmConverter\Exporters\{
+use PmConverter\Converters\{
    Abstract\AbstractConverter,
    ConverterContract};

--- a/src/Converters/Wget/WgetRequest.php
+++ b/src/Converters/Wget/WgetRequest.php
@@ -2,9 +2,10 @@

 declare(strict_types=1);

-namespace PmConverter\Exporters\Wget;
+namespace PmConverter\Converters\Wget;

-use PmConverter\Exporters\Abstract\AbstractRequest;
+use PmConverter\Converters\Abstract\AbstractRequest;
+use PmConverter\Exceptions\EmptyHttpVerbException;

 /**
 * Class to determine file content with wget request format
@@ -31,7 +32,7 @@ class WgetRequest extends AbstractRequest
            if ($header['disabled']) {
                continue;
            }
-            $output[] = sprintf("\t--header '%s=%s' \ ", $header_key, $header['value']);
+            $output[] = sprintf("\t--header '%s: %s' \ ", $header_key, $header['value']);
        }
        return $output;
    }
@@ -43,22 +44,22 @@ class WgetRequest extends AbstractRequest
    {
        switch ($this->bodymode) {
            case 'formdata':
-                $params = [];
-                foreach ($this->body as $data) {
-                    if ($data->type === 'file') {
+                $output = [];
+                foreach ($this->body as $key => $data) {
+                    if ($data['type'] === 'file') {
                        continue;
                    }
-                    $params[$data->key] = $data->value;
+                    $output[$key] = $data['value'];
                }
-                $output[] = http_build_query($params);
                return $output;
            default:
-                return ["\t$this->body"];
+                return [$this->body];
        }
    }

    /**
     * @inheritDoc
+     * @throws EmptyHttpVerbException
     */
    public function __toString(): string
    {
@@ -68,15 +69,26 @@ class WgetRequest extends AbstractRequest
            [
                'wget \ ',
                "\t--no-check-certificate \ ",
-                "\t--quiet \ ",
-                "\t--timeout=0 \ ",
+                "\t--timeout 0 \ ",
                "\t--method $this->verb \ ",
            ],
            $this->prepareHeaders(),
-            $this->prepareBody()
        );
-        $output[] = rtrim(array_pop($output), '\ ');
-        $output[] = "\t'$this->url'";
+        if ($this->getBodymode() === 'formdata') {
+            if ($this->getBody()) {
+                if ($this->getVerb() === 'GET') {
+                    $output[] = sprintf("\t%s?%s", $this->getUrl(), http_build_query($this->prepareBody()));
+                } else {
+                    $output[] = sprintf("\t--body-data '%s' \ ", http_build_query($this->prepareBody()));
+                    $output[] = sprintf("\t%s", $this->getUrl());
+                }
+            }
+        } else {
+            if ($this->getVerb() !== 'GET') {
+                $output[] = sprintf("\t--body-data '%s' \ ", implode("\n", $this->prepareBody()));
+                $output[] = sprintf("\t%s", $this->getUrl());
+            }
+        }
        return implode(PHP_EOL, array_merge($output, ['']));
    }
 }
--- a/src/Environment.php
+++ b/src/Environment.php
@@ -17,7 +17,7 @@ class Environment implements \ArrayAccess
    public function __construct(protected object $env)
    {
        foreach ($env->values as $var) {
-            $this->vars["{{{$var->key}}}"] = $var->value;
+            $this->vars[static::formatKey($var->key)] = $var->value;
        }
    }

@@ -36,7 +36,7 @@ class Environment implements \ArrayAccess
     */
    public function offsetExists(mixed $offset): bool
    {
-        return array_key_exists($offset, $this->vars);
+        return array_key_exists(static::formatKey($offset), $this->vars);
    }

    /**
@@ -44,7 +44,7 @@ class Environment implements \ArrayAccess
     */
    public function offsetGet(mixed $offset): mixed
    {
-        return $this->vars[$offset];
+        return $this->vars[static::formatKey($offset)] ?? null;
    }

    /**
@@ -52,7 +52,7 @@ class Environment implements \ArrayAccess
     */
    public function offsetSet(mixed $offset, mixed $value): void
    {
-        $this->vars[$offset] = $value;
+        $this->vars[static::formatKey($offset)] = $value;
    }

    /**
@@ -60,6 +60,17 @@ class Environment implements \ArrayAccess
     */
    public function offsetUnset(mixed $offset): void
    {
-        unset($this->vars[$offset]);
+        unset($this->vars[static::formatKey($offset)]);
+    }
+
+    /**
+     * Returns correct variable {{name}}
+     *
+     * @param string $key
+     * @return string
+     */
+    public static function formatKey(string $key): string
+    {
+        return sprintf('{{%s}}', str_replace(['{', '}'], '', $key));
    }
 }
--- a/src/Exceptions/EmptyHttpVerbException.php
+++ b/src/Exceptions/EmptyHttpVerbException.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PmConverter\Exceptions;
+
+use Exception;
+
+class EmptyHttpVerbException extends Exception
+{
+}
--- a/src/Exceptions/EmptyURLException.php
+++ b/src/Exceptions/EmptyURLException.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PmConverter\Exceptions;
+
+use Exception;
+
+class EmptyURLException extends Exception
+{
+}
--- a/src/Exceptions/InvalidHttpVersionException.php
+++ b/src/Exceptions/InvalidHttpVersionException.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PmConverter\Exceptions;
+
+use Exception;
+
+class InvalidHttpVersionException extends Exception
+{
+}
--- a/src/Exporters/Abstract/AbstractRequest.php
+++ b/src/Exporters/Abstract/AbstractRequest.php
@@ -1,222 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PmConverter\Exporters\Abstract;
-
-use PmConverter\Exporters\Http\HttpRequest;
-use PmConverter\Exporters\RequestContract;
-
-/**
- * Class to determine file content with any request format
- */
-abstract class AbstractRequest implements RequestContract
-{
-    /**
-     * @var string
-     */
-    protected string $http = 'HTTP/1.1'; //TODO proto
-
-    /**
-     * @var string
-     */
-    protected string $name;
-
-    /**
-     * @var string|null
-     */
-    protected ?string $description = null;
-
-    /**
-     * @var array
-     */
-    protected array $headers = [];
-
-    /**
-     * @var mixed
-     */
-    protected mixed $body = null;
-
-    /**
-     * @var string
-     */
-    protected string $bodymode = 'raw';
-
-    /**
-     * @var string
-     */
-    protected string $verb;
-
-    /**
-     * @var string
-     */
-    protected string $url;
-
-    /**
-     * Sets name from collection item to request object
-     *
-     * @param string $name
-     * @return HttpRequest
-     */
-    public function setName(string $name): static
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Returns name of request
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return str_replace(DIRECTORY_SEPARATOR, '_', $this->name);
-    }
-
-    /**
-     * Sets description from collection item to request object
-     *
-     * @param string|null $description
-     * @return HttpRequest
-     */
-    public function setDescription(?string $description): static
-    {
-        $this->description = $description;
-        return $this;
-    }
-
-    /**
-     * Sets HTTP verb from collection item to request object
-     *
-     * @param string $verb
-     * @return HttpRequest
-     */
-    public function setVerb(string $verb): static
-    {
-        $this->verb = $verb;
-        return $this;
-    }
-
-    /**
-     * Sets URL from collection item to request object
-     *
-     * @param string $url
-     * @return HttpRequest
-     */
-    public function setUrl(string $url): static
-    {
-        $this->url = $url;
-        return $this;
-    }
-
-    /**
-     * Sets headers from collection item to request object
-     *
-     * @param object[]|null $headers
-     * @return $this
-     */
-    public function setHeaders(?array $headers): static
-    {
-        foreach ($headers as $header) {
-            $this->headers[$header->key] = [
-                'value' => $header->value,
-                'disabled' => $header?->disabled ?? false,
-            ];
-        }
-        return $this;
-    }
-
-    /**
-     * Sets authorization headers
-     *
-     * @param object|null $auth
-     * @return $this
-     */
-    public function setAuth(?object $auth): static
-    {
-        if (!empty($auth)) {
-            switch ($auth->type) {
-                case 'bearer':
-                    $this->headers['Authorization'] = [
-                        'value' => 'Bearer ' . $auth->{$auth->type}[0]->value,
-                        'disabled' => false,
-                    ];
-                    break;
-                default:
-                    break;
-            }
-        }
-        return $this;
-    }
-
-
-    /**
-     * Sets body mode from collection item to request object
-     *
-     * @param string $bodymode
-     * @return HttpRequest
-     */
-    public function setBodymode(string $bodymode): static
-    {
-        $this->bodymode = $bodymode;
-        return $this;
-    }
-
-    /**
-     * Sets body from collection item to request object
-     *
-     * @param object $body
-     * @return $this
-     */
-    public function setBody(object $body): static
-    {
-        $this->setBodymode($body->mode);
-        if (!empty($body->options) && $body->options->{$this->bodymode}->language === 'json') {
-            empty($this->headers['Content-Type']) && $this->setHeaders([
-                (object)[
-                    'key' => 'Content-Type',
-                    'value' => 'application/json',
-                    'disabled' => false,
-                ],
-            ]);
-        }
-        $body->mode === 'formdata' && $this->setHeaders([
-            (object)[
-                'key' => 'Content-Type',
-                'value' => 'multipart/form-data',
-                'disabled' => false,
-            ],
-        ]);
-        $this->body = $body->{$body->mode};
-        return $this;
-    }
-
-    /**
-     * Returns array of description lines
-     *
-     * @return array
-     */
-    abstract protected function prepareDescription(): array;
-
-    /**
-     * Returns array of headers
-     *
-     * @return array
-     */
-    abstract protected function prepareHeaders(): array;
-
-    /**
-     * Returns array of request body lines
-     *
-     * @return array
-     */
-    abstract protected function prepareBody(): array;
-
-    /**
-     * Converts request object to string to be written in result file
-     *
-     * @return string
-     */
-    abstract public function __toString(): string;
-}
--- a/src/Exporters/RequestContract.php
+++ b/src/Exporters/RequestContract.php
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace PmConverter\Exporters;
-
-interface RequestContract
-{
-    public function setName(string $name): static;
-    public function getName(): string;
-    public function setDescription(?string $description): static;
-    public function setVerb(string $verb): static;
-    public function setUrl(string $url): static;
-    public function setAuth(object $auth): static;
-    public function setHeaders(?array $headers): static;
-    public function setBodymode(string $bodymode): static;
-    public function setBody(object $body): static;
-    public function __toString(): string;
-}
--- a/src/HttpVersions.php
+++ b/src/HttpVersions.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PmConverter;
+
+enum HttpVersions: string
+{
+    case Version10 = '1.0';
+    case Version11 = '1.1';
+    case Version2 = '2';
+    case Version3 = '3';
+
+    public static function values(): array
+    {
+        return array_combine(
+            array_column(self::cases(), 'name'),
+            array_column(self::cases(), 'value'),
+        );
+    }
+}
--- a/src/Processor.php
+++ b/src/Processor.php
@@ -7,22 +7,21 @@ namespace PmConverter;
 use Exception;
 use InvalidArgumentException;
 use JsonException;
-use PmConverter\Exceptions\CannotCreateDirectoryException;
-use PmConverter\Exceptions\DirectoryIsNotReadableException;
-use PmConverter\Exceptions\DirectoryIsNotWriteableException;
-use PmConverter\Exceptions\DirectoryNotExistsException;
-use PmConverter\Exporters\ConverterContract;
-use PmConverter\Exporters\ConvertFormat;
+use PmConverter\Converters\{
+    ConverterContract,
+    ConvertFormat};
+use PmConverter\Exceptions\{
+    CannotCreateDirectoryException,
+    DirectoryIsNotReadableException,
+    DirectoryIsNotWriteableException,
+    DirectoryNotExistsException};

-/**
- *
- */
 class Processor
 {
    /**
     * Converter version
     */
-    public const VERSION = '1.2.1';
+    public const VERSION = '1.4.0';

    /**
     * @var string[] Paths to collection files
@@ -39,6 +38,11 @@ class Processor
     */
    protected bool $preserveOutput = false;

+    /**
+     * @var string[] Additional variables
+     */
+    protected array $vars;
+
    /**
     * @var ConvertFormat[] Formats to convert a collections into
     */
@@ -65,7 +69,7 @@ class Processor
    protected int $initRam;

    /**
-     * @var string
+     * @var string Path to environment file
     */
    protected string $envFile;

@@ -89,9 +93,6 @@ class Processor
     * Parses an array of arguments came from cli
     *
     * @return void
-     * @throws DirectoryIsNotWriteableException
-     * @throws DirectoryNotExistsException
-     * @throws DirectoryIsNotReadableException
     */
    protected function parseArgs(): void
    {
@@ -155,6 +156,11 @@ class Processor
                    $this->formats[ConvertFormat::Wget->name] = ConvertFormat::Wget;
                    break;

+                case '--var':
+                    [$var, $value] = explode('=', trim($this->argv[$idx + 1]));
+                    $this->vars[$var] = $value;
+                    break;
+
                case '-v':
                case '--version':
                    die(implode(PHP_EOL, $this->version()) . PHP_EOL);
@@ -202,6 +208,7 @@ class Processor
        foreach ($this->formats as $type) {
            $this->converters[$type->name] = new $type->value($this->preserveOutput);
        }
+        unset($this->formats);
    }

    /**
@@ -219,6 +226,7 @@ class Processor
            }
            $this->collections[$content->collection->info->name] = $content->collection;
        }
+        unset($this->collectionPaths, $content);
    }

    /**
@@ -229,12 +237,19 @@ 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)) {
            throw new JsonException("not a valid environment: $this->envFile");
        }
        $this->env = new Environment($content->environment);
+        foreach ($this->vars as $var => $value) {
+            $this->env[$var] = $value;
+        }
+        unset($this->vars, $this->envFile, $content, $var, $value);
    }

    /**
@@ -268,6 +283,7 @@ class Processor
            print(PHP_EOL);
            ++$success;
        }
+        unset($this->converters, $type, $exporter, $outputPath, $this->collections, $collectionName, $collection);
        $this->printStats($success, $current);
    }

@@ -282,7 +298,7 @@ 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 up to %.3f MiB RAM%s', $success, $count, $time, $ram, PHP_EOL);
    }

    /**
@@ -317,30 +333,40 @@ class Processor
            "\t./vendor/bin/pm-convert -f|-d PATH -o OUTPUT_PATH [ARGUMENTS] [FORMATS]",
            '',
            '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-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)",
-            "\t-h, --help       - show this help message and exit",
-            "\t-v, --version    - show version info and exit",
+            "\t-f, --file          - a PATH to a single collection file to convert from",
+            "\t-d, --dir           - a PATH to a directory with collections to convert from",
+            "\t-o, --output        - a directory OUTPUT_PATH to put results in",
+            "\t-e, --env           - use environment file with variables to replace in requests",
+            "\t--var \"NAME=VALUE\"  - force replace specified env variable called NAME with custom VALUE",
+            "\t                      (see interpolation notes below)",
+            "\t-p, --preserve      - do not delete OUTPUT_PATH (if exists)",
+            "\t-h, --help          - show this help message and exit",
+            "\t-v, --version       - show version info and exit",
            '',
            'If no ARGUMENTS passed then --help implied.',
-            'If both -f and -d are specified then only unique set of files will be converted.',
+            'If both -f and -d are specified then only unique set of files from both arguments will be converted.',
            '-f or -d are required to be specified at least once, but each may be specified multiple times.',
            'PATH must be a valid path to readable json-file or directory.',
            'OUTPUT_PATH must be a valid path to writeable directory.',
-            'If -o is specified several times then only last one will be used.',
-            'If -e is specified several times then only last one will be used.',
-            'If -e is not specified then only collection vars will be replaced (if any).',
+            'If -o or -e was specified several times then only last one will be used.',
            '',
            'Possible FORMATS:',
            "\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.',
            '',
+            'Notes about variable interpolation:',
+            "\t1. You can use -e to tell where to find variables to replace in requests.",
+            "\t2. You can use one or several --var to replace specific env variables to your own value.",
+            "\t3. Correct syntax is `--var \"NAME=VALUE\". NAME may be in curly braces like {{NAME}}.",
+            "\t4. Since -e is optional, a bunch of --var will emulate an environment. Also it does not",
+            "\t   matter if there is --var in environment file you provided or not.",
+            "\t5. Even if you (not) provided -e and/or --var, any of variable may still be overridden",
+            "\t   from collection (if any), so last ones has top priority.",
+            '',
            'Example:',
            "    ./pm-convert \ ",
            "        -f ~/dir1/first.postman_collection.json \ ",
@@ -348,6 +374,7 @@ class Processor
            "        --file ~/dir2/second.postman_collection.json \ ",
            "        --env ~/localhost.postman_environment.json \ ",
            "        -d ~/personal \ ",
+            "        --var \"myvar=some value\" \ ",
            "        -o ~/postman_export ",
            "",
        ], $this->copyright());
--- a/tests/AbstractRequestTest.php
+++ b/tests/AbstractRequestTest.php
@@ -0,0 +1,297 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
+use PmConverter\Exceptions\{
+    EmptyHttpVerbException,
+    InvalidHttpVersionException};
+
+class AbstractRequestTest extends TestCase
+{
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\HttpVersions
+     * @return void
+     * @throws InvalidHttpVersionException
+     */
+    public function testHttpVersion(): void
+    {
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setHttpVersion(2.0);
+
+        $this->assertSame(2.0, $request->getHttpVersion());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getVerb()
+     * @covers PmConverter\HttpVersions
+     * @return void
+     * @throws InvalidHttpVersionException
+     */
+    public function testInvalidHttpVersionException(): void
+    {
+        $this->expectException(InvalidHttpVersionException::class);
+
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setHttpVersion(5);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setVerb()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getVerb()
+     * @return void
+     * @throws EmptyHttpVerbException
+     */
+    public function testVerb(): void
+    {
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setVerb('GET');
+
+        $this->assertSame('GET', $request->getVerb());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getVerb()
+     * @return void
+     * @throws EmptyHttpVerbException
+     */
+    public function testEmptyHttpVerbException(): void
+    {
+        $this->expectException(EmptyHttpVerbException::class);
+
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->getVerb();
+    }
+
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setUrl()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getUrl()
+     * @return void
+     */
+    public function testUrl(): void
+    {
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setUrl('http://localhost');
+
+        $this->assertSame('http://localhost', $request->getUrl());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setName()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getName()
+     * @return void
+     */
+    public function testName(): void
+    {
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setName('lorem ipsum');
+
+        $this->assertSame('lorem ipsum', $request->getName());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setDescription()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getDescription()
+     * @return void
+     */
+    public function testDescription(): void
+    {
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setDescription("lorem ipsum\ndolor sit\namet");
+
+        $this->assertSame("lorem ipsum\ndolor sit\namet", $request->getDescription());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setBodymode()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getBodymode()
+     * @return void
+     */
+    public function testBodyMode(): void
+    {
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setBodymode('raw');
+
+        $this->assertSame('raw', $request->getBodymode());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setHeaders()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setHeader()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getHeaders()
+     * @return void
+     */
+    public function testHeaders(): void
+    {
+        $headers = [
+            (object)[
+                'key' => 'Header 1',
+                'value' => 'Value 1',
+                'disabled' => true,
+            ],
+            (object)[
+                'key' => 'Header 2',
+                'value' => 'Value 2',
+                'disabled' => false,
+            ],
+            (object)[
+                'key' => 'Header 3',
+                'value' => 'Value 3',
+            ],
+        ];
+        $expected = [
+            'Header 1' => [
+                'value' => 'Value 1',
+                'disabled' => true,
+            ],
+            'Header 2' => [
+                'value' => 'Value 2',
+                'disabled' => false,
+            ],
+            'Header 3' => [
+                'value' => 'Value 3',
+                'disabled' => false,
+            ],
+            'Header 4' => [
+                'value' => 'Value 4',
+                'disabled' => false,
+            ],
+            'Header 5' => [
+                'value' => 'Value 5',
+                'disabled' => true,
+            ],
+        ];
+
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setHeaders($headers)
+            ->setHeader('Header 4', 'Value 4')
+            ->setHeader('Header 5', 'Value 5', true);
+
+        $this->assertSame($expected, $request->getHeaders());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setAuth()
+     * @return void
+     */
+    public function testAuthBearer(): void
+    {
+        $auth = (object)[
+            'type' => 'bearer',
+            'bearer' => [
+                (object)[
+                    'key' => 'token',
+                    'value' => 'qwerty',
+                    'type' => 'string',
+                ]
+            ]
+        ];
+        $expected = [
+            'Authorization' => [
+                'value' => 'Bearer qwerty',
+                'disabled' => false,
+            ],
+        ];
+
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setAuth($auth);
+
+        $this->assertSame($expected, $request->getHeaders());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setBodymode()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setHeader()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setBody()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setJsonBody()
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getBody()
+     * @return void
+     */
+    public function testJson(): void
+    {
+        $body = (object)[
+            'mode' => 'raw',
+            'raw' => $expectedBody = '["lorem ipsum dolor sit amet"]',
+            'options' => (object)[
+                'raw' => (object)[
+                    'language' => 'json',
+                ]
+            ]
+        ];
+
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setBody($body);
+
+        $expectedHeaders = [
+            'Content-Type' => [
+                'value' => 'application/json',
+                'disabled' => false,
+            ],
+        ];
+
+        $this->assertSame($expectedHeaders, $request->getHeaders());
+        $this->assertSame($expectedBody, $request->getBody());
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setBodymode
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setHeader
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setBody
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::setFormdataBody
+     * @covers PmConverter\Converters\Abstract\AbstractRequest::getBody
+     * @return void
+     */
+    public function testFormdata(): void
+    {
+        $body = (object)[
+            'mode' => 'formdata',
+            'formdata' => [
+                (object)[
+                    'key' => 'param1',
+                    'value' => 'value1',
+                    'type' => 'text',
+                ],
+                (object)[
+                    'key' => 'param2',
+                    'src' => '/tmp/somefile.txt',
+                    'type' => 'file',
+                ],
+            ],
+        ];
+        $expectedBody = [
+            'param1' => [
+                'value' => 'value1',
+                'type' => 'text',
+            ],
+            'param2' => [
+                'value' => '/tmp/somefile.txt',
+                'type' => 'file',
+            ],
+        ];
+        $expectedHeaders = [
+            'Content-Type' => [
+                'value' => 'multipart/form-data',
+                'disabled' => false,
+            ],
+        ];
+
+        $request = new \PmConverter\Converters\Http\HttpRequest();
+        $request->setBody($body);
+
+        $this->assertSame($expectedHeaders, $request->getHeaders());
+        $this->assertSame($expectedBody, $request->getBody());
+    }
+}
--- a/tests/HttpRequestTest.php
+++ b/tests/HttpRequestTest.php
@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
+use PmConverter\Converters\Http\HttpRequest;
+
+class HttpRequestTest extends TestCase
+{
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Http\HttpRequest
+     * @covers PmConverter\Converters\Http\HttpRequest::prepareDescription()
+     * @covers PmConverter\Converters\Http\HttpRequest::__toString()
+     * @return void
+     */
+    public function testPrepareDescription()
+    {
+        $description = [
+            'lorem ipsum',
+            'dolor sit',
+            'amet',
+        ];
+        $needle = implode("\n", [
+            '# lorem ipsum',
+            '# dolor sit',
+            '# amet',
+        ]);
+
+        $request = (new HttpRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setDescription(implode("\n", $description));
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Http\HttpRequest
+     * @covers PmConverter\Converters\Http\HttpRequest::prepareHeaders()
+     * @covers PmConverter\Converters\Http\HttpRequest::__toString()
+     * @return void
+     */
+    public function testPrepareHeaders()
+    {
+        $headers = [
+            (object)[
+                'key' => 'Header1',
+                'value' => 'Value 1',
+                'disabled' => true,
+            ],
+            (object)[
+                'key' => 'Header2',
+                'value' => 'Value 2',
+                'disabled' => false,
+            ],
+            (object)[
+                'key' => 'Header3',
+                'value' => 'Value 3',
+            ],
+        ];
+        $needle = implode("\n", [
+            '# Header1: Value 1',
+            'Header2: Value 2',
+            'Header3: Value 3',
+        ]);
+
+        $request = (new HttpRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setHeaders($headers);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Http\HttpRequest
+     * @covers PmConverter\Converters\Http\HttpRequest::prepareBody()
+     * @covers PmConverter\Converters\Http\HttpRequest::__toString()
+     * @return void
+     */
+    public function testPrepareFormdataBody()
+    {
+        $body = (object)[
+            'mode' => 'formdata',
+            'formdata' => [
+                (object)[
+                    'key' => 'param1',
+                    'value' => 'value1',
+                    'type' => 'text',
+                ],
+                (object)[
+                    'key' => 'param2',
+                    'src' => '/tmp/somefile.txt',
+                    'type' => 'file',
+                ],
+            ],
+        ];
+        $needle = implode("\n", [
+            'param1=value1',
+            'param2=@/tmp/somefile.txt',
+        ]);
+
+        $request = (new HttpRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setBody($body);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Http\HttpRequest
+     * @covers PmConverter\Converters\Http\HttpRequest::prepareBody()
+     * @covers PmConverter\Converters\Http\HttpRequest::__toString()
+     * @return void
+     */
+    public function testPrepareJsonBody()
+    {
+        $body = (object)[
+            'mode' => 'raw',
+            'raw' => $needle = '["lorem ipsum dolor sit amet"]',
+            'options' => (object)[
+                'raw' => (object)[
+                    'language' => 'json',
+                ]
+            ]
+        ];
+
+        $request = (new HttpRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setBody($body);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+}
--- a/tests/WgetRequestTest.php
+++ b/tests/WgetRequestTest.php
@@ -0,0 +1,232 @@
+<?php
+
+declare(strict_types=1);
+
+use PHPUnit\Framework\TestCase;
+use PmConverter\Converters\Wget\WgetRequest;
+
+class WgetRequestTest extends TestCase
+{
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareDescription()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareNotEmptyDescription()
+    {
+        $request = (new WgetRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setDescription(null);
+
+        $result = explode("\n", (string)$request);
+
+        $this->assertFalse(str_starts_with($result[0], '# ') && str_starts_with($result[1], '# '));
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareDescription()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareEmptyDescription()
+    {
+        $description = [
+            'lorem ipsum',
+            'dolor sit',
+            'amet',
+        ];
+        $needle = implode("\n", [
+            '# lorem ipsum',
+            '# dolor sit',
+            '# amet',
+        ]);
+
+        $request = (new WgetRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setDescription(implode("\n", $description));
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareHeaders()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareHeaders()
+    {
+        $headers = [
+            (object)[
+                'key' => 'Header1',
+                'value' => 'Value 1',
+                'disabled' => true,
+            ],
+            (object)[
+                'key' => 'Header2',
+                'value' => 'Value 2',
+                'disabled' => false,
+            ],
+            (object)[
+                'key' => 'Header3',
+                'value' => 'Value 3',
+            ],
+        ];
+        $needle = implode("\n", [
+            "\t--header 'Header2: Value 2' \ ",
+            "\t--header 'Header3: Value 3' \ ",
+        ]);
+
+        $request = (new WgetRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setHeaders($headers);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareBody()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareFormdataBodyGet()
+    {
+        $body = (object)[
+            'mode' => 'formdata',
+            'formdata' => [
+                (object)[
+                    'key' => 'param1',
+                    'value' => 'value1',
+                    'type' => 'text',
+                ],
+                (object)[
+                    'key' => 'param2',
+                    'src' => '/tmp/somefile.txt',
+                    'type' => 'file',
+                ],
+                (object)[
+                    'key' => 'param3',
+                    'value' => 'value3',
+                    'type' => 'text',
+                ],
+            ],
+        ];
+        $needle = 'http://localhost?' . http_build_query([
+            'param1' => 'value1',
+            'param3' => 'value3',
+        ]);
+
+        $request = (new WgetRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setBody($body);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareBody()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareFormdataBodyPost()
+    {
+        $body = (object)[
+            'mode' => 'formdata',
+            'formdata' => [
+                (object)[
+                    'key' => 'param1',
+                    'value' => 'value1',
+                    'type' => 'text',
+                ],
+                (object)[
+                    'key' => 'param2',
+                    'src' => '/tmp/somefile.txt',
+                    'type' => 'file',
+                ],
+                (object)[
+                    'key' => 'param3',
+                    'value' => 'value3',
+                    'type' => 'text',
+                ],
+            ],
+        ];
+        $needle = http_build_query([
+            'param1' => 'value1',
+            'param3' => 'value3',
+        ]);
+
+        $request = (new WgetRequest())
+            ->setVerb('POST')
+            ->setUrl('http://localhost')
+            ->setBody($body);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareBody()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareJsonBodyGet()
+    {
+        $body = (object)[
+            'mode' => 'raw',
+            'raw' => $needle = '["lorem ipsum dolor sit amet"]',
+            'options' => (object)[
+                'raw' => (object)[
+                    'language' => 'json',
+                ]
+            ]
+        ];
+
+        $request = (new WgetRequest())
+            ->setVerb('GET')
+            ->setUrl('http://localhost')
+            ->setBody($body);
+
+        $this->assertStringNotContainsString($needle, (string)$request);
+    }
+
+    /**
+     * @covers PmConverter\Converters\Abstract\AbstractRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest
+     * @covers PmConverter\Converters\Wget\WgetRequest::prepareBody()
+     * @covers PmConverter\Converters\Wget\WgetRequest::__toString()
+     * @return void
+     */
+    public function testPrepareJsonBodyPost()
+    {
+        $body = (object)[
+            'mode' => 'raw',
+            'raw' => $needle = '["lorem ipsum dolor sit amet"]',
+            'options' => (object)[
+                'raw' => (object)[
+                    'language' => 'json',
+                ]
+            ]
+        ];
+
+        $request = (new WgetRequest())
+            ->setVerb('POST')
+            ->setUrl('http://localhost')
+            ->setBody($body);
+
+        $this->assertStringContainsString($needle, (string)$request);
+    }
+}
Author	SHA1	Message	Date
Anthony Axenov	83794a7464	Merge pull request 'v1.4.0' (#12 ) from dev into master Reviewed-on: #12	2023-09-10 07:32:27 +00:00
Anthony Axenov	1dc5f7deaf	Bump version	2023-09-10 15:31:41 +08:00
Anthony Axenov	0b4317f56a	Introducing --var and some improvements in variables interpolation - now you can override any env variable, see README to find out how --var works - improvements around env and vars storage - some tiny ram optimizations in Processor (not sure if it useful nor necessary, actually)	2023-09-10 15:28:09 +08:00
Anthony Axenov	8ab615c062	README misc	2023-09-10 09:17:12 +08:00
Anthony Axenov	da763a5a2f	Bump version	2023-09-10 09:14:03 +08:00
Anthony Axenov	af9406be47	Merge pull request 'v1.3.0' (#11 ) from dev into master Reviewed-on: #11	2023-09-10 01:12:37 +00:00
Anthony Axenov	1345b7eddb	Refactorings - important curl and wget improvements - initial test coverage - setters and getters in Request classes - namespace fixes - some additions in README - docblocks and code-style	2023-09-10 09:03:54 +08:00
Anthony Axenov	3734327357	Merge pull request 'v1.2.4' (#9 ) from dev into master Reviewed-on: #9	2023-08-13 15:44:53 +00:00
Anthony Axenov	af9c360684	Bump version	2023-08-13 23:43:21 +08:00
Anthony Axenov	44f437eaf3	Misc edits in texts and output	2023-08-13 23:42:24 +08:00
Anthony Axenov	1ebdffe2a6	Fixed again non-existent env when interpolating vars	2023-08-13 23:41:54 +08:00
Anthony Axenov	d854732143	Merge pull request 'dev' (#7 ) from dev into master Reviewed-on: #7	2023-08-13 15:12:22 +00:00
Anthony Axenov	9b021296eb	Bump version	2023-08-13 23:11:52 +08:00
Anthony Axenov	d581afa793	Fixed non-existent env when interpolating vars	2023-08-13 23:11:37 +08:00
Anthony Axenov	95ca655eb0	Merge pull request 'v1.2.2' (#5 ) from dev into master Reviewed-on: #5	2023-08-13 03:04:03 +00:00
Anthony Axenov	25887a47d3	Bump version	2023-08-13 11:02:59 +08:00
Anthony Axenov	1f7816c917	When env was no set then dont try to collect vars from it (cherry picked from commit fa8ad15fdd691fb4ea5db431062e89b512a9d526)	2023-08-13 11:02:08 +08:00
Anthony Axenov	fb7b4baa32	Fixed wget file format (cherry picked from commit 0febfd38aa3047555d34f7e125adb3773ee8a2da)	2023-08-13 11:02:07 +08:00
Anthony Axenov	2c4eedbf8b	When collection has no vars then dont try to collect them (cherry picked from commit ee7528186f69e811b1b4db8e69ea2e4ec0ea2613)	2023-08-13 11:02:07 +08:00