Better way to create payload (#14)

phanxipang · Jun 23, 2023 · 049c498 · 049c498
1 parent 16642f9
commit 049c498
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 19 deletions.
diff --git a/src/Body/AsJson.php b/src/Body/AsJson.php
@@ -4,7 +4,15 @@
 
 namespace Jenky\Atlas\Body;
 
+use Jenky\Atlas\Contracts\PayloadInterface;
+
 trait AsJson
 {
-    protected $bodyFormat = JsonPayload::class;
+    /**
+     * Create new JSON request body.
+     */
+    protected function definePayload(): PayloadInterface
+    {
+        return new JsonPayload(is_array($this->defaultBody()) ? $this->defaultBody() : []);
+    }
 }
diff --git a/src/Body/AsMultipart.php b/src/Body/AsMultipart.php
@@ -4,7 +4,15 @@
 
 namespace Jenky\Atlas\Body;
 
+use Jenky\Atlas\Contracts\PayloadInterface;
+
 trait AsMultipart
 {
-    protected $bodyFormat = MultipartPayload::class;
+    /**
+     * Create new multipart request body.
+     */
+    protected function definePayload(): PayloadInterface
+    {
+        return new MultipartPayload(is_array($this->defaultBody()) ? $this->defaultBody() : []);
+    }
 }
diff --git a/src/Body/AsText.php b/src/Body/AsText.php
@@ -4,7 +4,15 @@
 
 namespace Jenky\Atlas\Body;
 
+use Jenky\Atlas\Contracts\PayloadInterface;
+
 trait AsText
 {
-    protected $bodyFormat = RawPayload::class;
+    /**
+     * Create new text request body.
+     */
+    protected function definePayload(): PayloadInterface
+    {
+        return new RawPayload($this->defaultBody() ?: '');
+    }
 }
diff --git a/src/Request.php b/src/Request.php
@@ -4,7 +4,6 @@
 
 namespace Jenky\Atlas;
 
-use InvalidArgumentException;
 use Jenky\Atlas\Body\FormPayload;
 use Jenky\Atlas\Contracts\DecoderInterface;
 use Jenky\Atlas\Contracts\PayloadInterface;
@@ -60,20 +59,6 @@ protected function defaultBody()
         return null;
     }
 
-    /**
-     * Create a body payload from body format.
-     */
-    protected function definePayload(): PayloadInterface
-    {
-        $payload = property_exists($this, 'bodyFormat') ? $this->bodyFormat : FormPayload::class;
-
-        if (! is_a($payload, PayloadInterface::class, true)) {
-            throw new InvalidArgumentException('Payload class must be instance of '.PayloadInterface::class);
-        }
-
-        return new $payload(is_array($this->defaultBody()) ? $this->defaultBody() : []);
-    }
-
     /**
      * Get request HTTP method.
      */
@@ -112,12 +97,24 @@ public function headers(): Map
     public function body(): PayloadInterface
     {
         if (! $this->body instanceof PayloadInterface) {
-            $this->body = $this->definePayload();
+            $this->body = $this->createPayload();
         }
 
         return $this->body;
     }
 
+    /**
+     * Create a corresponding payload for request body.
+     */
+    private function createPayload(): PayloadInterface
+    {
+        if (method_exists($this, 'definePayload')) {
+            return $this->definePayload();
+        }
+
+        return new FormPayload(is_array($this->defaultBody()) ? $this->defaultBody() : []);
+    }
+
     /**
      * Get the response decoder.
      */