tweak PR

Author: taylorotwell

src/Illuminate/Http/Client/PendingRequest.php

@@ -35,18 +35,18 @@ class PendingRequest
     protected $bodyFormat;
 
     /**
-     * The pending files for the request.
+     * The raw body for the request.
      *
-     * @var array
+     * @var string
      */
-    protected $pendingFiles = [];
+    protected $pendingBody;
 
     /**
-     * The binary for the request.
+     * The pending files for the request.
      *
      * @var array
      */
-    protected $pendingBinary;
+    protected $pendingFiles = [];
 
     /**
      * The request cookies.
@@ -131,6 +131,24 @@ public function baseUrl(string $url)
         return $this;
     }
 
+    /**
+     * Attach a raw body to the request.
+     *
+     * @param  resource|string  $content
+     * @param  string  $contentType
+     * @return $this
+     */
+    public function withBody($content, $contentType)
+    {
+        $this->bodyFormat('body');
+
+        $this->pendingBody = $content;
+
+        $this->contentType($contentType);
+
+        return $this;
+    }
+
     /**
      * Indicate the request contains JSON.
      *
@@ -184,34 +202,6 @@ public function asMultipart()
         return $this->bodyFormat('multipart');
     }
 
-    /**
-     * Attach a binary to the request.
-     *
-     * @param  string $content
-     * @param  string $contentType
-     * @return $this
-     */
-    public function binary($content, $contentType)
-    {
-        $this->asBinary();
-
-        $this->pendingBinary = $content;
-
-        $this->contentType($contentType);
-
-        return $this;
-    }
-
-    /**
-     * Indicate the request contains form parameters.
-     *
-     * @return $this
-     */
-    public function asBinary()
-    {
-        return $this->bodyFormat('body');
-    }
-
     /**
      * Specify the body format of the request.
      *
@@ -509,10 +499,8 @@ public function send(string $method, string $url, array $options = [])
         if (isset($options[$this->bodyFormat])) {
             if ($this->bodyFormat === 'multipart') {
                 $options[$this->bodyFormat] = $this->parseMultipartBodyFormat($options[$this->bodyFormat]);
-            }
-
-            if ($this->bodyFormat === 'body') {
-                $options[$this->bodyFormat] = $this->pendingBinary;
+            } elseif ($this->bodyFormat === 'body') {
+                $options[$this->bodyFormat] = $this->pendingBody;
             }
 
             if (is_array($options[$this->bodyFormat])) {
@@ -522,7 +510,7 @@ public function send(string $method, string $url, array $options = [])
             }
         }
 
-        $this->pendingFiles = [];
+        [$this->pendingBody, $this->pendingFiles] = [null, []];
 
         return retry($this->tries ?? 1, function () use ($method, $url, $options) {
             try {