Merge pull request 'v1.4.1' (#13) from dev into master

Reviewed-on: #13

src/Converters/Abstract/AbstractConverter.php

@@ -132,19 +132,19 @@ abstract class AbstractConverter implements ConverterContract
     {
         $request_class = static::REQUEST_CLASS;
 
-        /** @var RequestContract $result */
+        /** @var RequestContract $request */
-        $result = new $request_class();
+        $request = new $request_class();
-        $result->setName($item->name);
+        $request->setName($item->name);
-        $result->setHttpVersion(1.1); //TODO http version?
+        $request->setHttpVersion(1.1); //TODO http version?
-        $result->setDescription($item->request?->description ?? null);
+        $request->setDescription($item->request?->description ?? null);
-        $result->setVerb($item->request->method);
+        $request->setVerb($item->request->method);
-        $result->setUrl($item->request->url->raw);
+        $request->setUrl($item->request->url->raw);
-        $result->setHeaders($item->request->header);
+        $request->setHeaders($item->request->header);
-        $result->setAuth($item->request?->auth ?? $this->collection?->auth ?? null);
+        $request->setAuth($item->request?->auth ?? $this->collection?->auth ?? null);
         if ($item->request->method !== 'GET' && !empty($item->request->body)) {
-            $result->setBody($item->request->body);
+            $request->setBody($item->request->body);
         }
-        return $result;
+        return $request;
     }
 
     /**

src/Converters/Abstract/AbstractRequest.php

@@ -219,11 +219,12 @@ abstract class AbstractRequest implements Stringable, RequestContract
     {
         $this->setBodymode($body->mode);
         if ($body->mode === 'formdata') {
-            $this->setHeader('Content-Type', 'multipart/form-data')
+            $this->setHeader('Content-Type', 'multipart/form-data')->setFormdataBody($body);
-                ->setFormdataBody($body);
+        } elseif ($body->mode === 'raw') {
-        } elseif (!empty($body->options) && $body->options->{$this->bodymode}->language === 'json') {
+            $this->setBodyAsIs($body);
-            $this->setHeader('Content-Type', 'application/json')
+            if (!empty($body->options) && $body->options->{$this->bodymode}->language === 'json') {
-                ->setJsonBody($body);
+                $this->setHeader('Content-Type', 'application/json');
+            }
         }
         return $this;
     }
@@ -251,7 +252,7 @@ abstract class AbstractRequest implements Stringable, RequestContract
      * @param object $body
      * @return $this
      */
-    protected function setJsonBody(object $body): static
+    protected function setBodyAsIs(object $body): static
     {
         $this->body = $body->{$this->getBodymode()};
         return $this;

src/Processor.php

@@ -21,7 +21,7 @@ class Processor
     /**
      * Converter version
      */
-    public const VERSION = '1.4.0';
+    public const VERSION = '1.4.1';
 
     /**
      * @var string[] Paths to collection files

tests/AbstractRequestTest.php

@@ -215,7 +215,7 @@ class AbstractRequestTest extends TestCase
      * @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::setBodyAsIs()
      * @covers PmConverter\Converters\Abstract\AbstractRequest::getBody()
      * @return void
      */