revert send changes, move to Response@toException

Author: cosmastech

src/Illuminate/Http/Client/PendingRequest.php

@@ -905,74 +905,59 @@ public function send(string $method, string $url, array $options = [])
         }
 
         $shouldRetry = null;
-        $originalTruncateAt = null;
 
-        try {
-            if ($this->truncateAt !== null) {
-                $originalTruncateAt = LaravelRequestException::$truncateAt;
-                $this->truncateAt === false ? LaravelRequestException::dontTruncate() : LaravelRequestException::truncateAt($this->truncateAt);
-            }
-            return retry($this->tries ?? 1, function ($attempt) use ($method, $url, $options, &$shouldRetry) {
-                try {
-                    return tap($this->newResponse($this->sendRequest($method, $url, $options)),
-                        function ($response) use ($attempt, &$shouldRetry) {
-                            $this->populateResponse($response);
-
-                            $this->dispatchResponseReceivedEvent($response);
-
-                            if (!$response->successful()) {
-                                try {
-                                    $shouldRetry = $this->retryWhenCallback ? call_user_func($this->retryWhenCallback,
-                                        $response->toException(), $this,
-                                        $this->request->toPsrRequest()->getMethod()) : true;
-                                } catch (Exception $exception) {
-                                    $shouldRetry = false;
-
-                                    throw $exception;
-                                }
-
-                                if ($this->throwCallback &&
-                                    ($this->throwIfCallback === null ||
-                                        call_user_func($this->throwIfCallback, $response))) {
-                                    $response->throw($this->throwCallback);
-                                }
-
-                                $potentialTries = is_array($this->tries)
-                                    ? count($this->tries) + 1
-                                    : $this->tries;
-
-                                if ($attempt < $potentialTries && $shouldRetry) {
-                                    $response->throw();
-                                }
-
-                                if ($potentialTries > 1 && $this->retryThrow) {
-                                    $response->throw();
-                                }
-                            }
-                        });
-                } catch (ConnectException $e) {
-                    $exception = new ConnectionException($e->getMessage(), 0, $e);
-                    $request = new Request($e->getRequest());
+        return retry($this->tries ?? 1, function ($attempt) use ($method, $url, $options, &$shouldRetry) {
+            try {
+                return tap($this->newResponse($this->sendRequest($method, $url, $options)), function ($response) use ($attempt, &$shouldRetry) {
+                    $this->populateResponse($response);
 
-                    $this->factory?->recordRequestResponsePair($request, null);
+                    $this->dispatchResponseReceivedEvent($response);
 
-                    $this->dispatchConnectionFailedEvent($request, $exception);
+                    if (! $response->successful()) {
+                        try {
+                            $shouldRetry = $this->retryWhenCallback ? call_user_func($this->retryWhenCallback, $response->toException(), $this, $this->request->toPsrRequest()->getMethod()) : true;
+                        } catch (Exception $exception) {
+                            $shouldRetry = false;
 
-                    throw $exception;
-                }
-            }, $this->retryDelay ?? 100, function ($exception) use (&$shouldRetry) {
-                $result = $shouldRetry ?? ($this->retryWhenCallback ? call_user_func($this->retryWhenCallback,
-                    $exception, $this, $this->request?->toPsrRequest()->getMethod()) : true);
+                            throw $exception;
+                        }
 
-                $shouldRetry = null;
+                        if ($this->throwCallback &&
+                            ($this->throwIfCallback === null ||
+                              call_user_func($this->throwIfCallback, $response))) {
+                            $response->throw($this->throwCallback);
+                        }
 
-                return $result;
-            });
-        } finally {
-            if ($originalTruncateAt !== null) {
-                $originalTruncateAt === false ? LaravelRequestException::dontTruncate() : LaravelRequestException::truncateAt($originalTruncateAt);
+                        $potentialTries = is_array($this->tries)
+                            ? count($this->tries) + 1
+                            : $this->tries;
+
+                        if ($attempt < $potentialTries && $shouldRetry) {
+                            $response->throw();
+                        }
+
+                        if ($potentialTries > 1 && $this->retryThrow) {
+                            $response->throw();
+                        }
+                    }
+                });
+            } catch (ConnectException $e) {
+                $exception = new ConnectionException($e->getMessage(), 0, $e);
+                $request = new Request($e->getRequest());
+
+                $this->factory?->recordRequestResponsePair($request, null);
+
+                $this->dispatchConnectionFailedEvent($request, $exception);
+
+                throw $exception;
             }
-        }
+        }, $this->retryDelay ?? 100, function ($exception) use (&$shouldRetry) {
+            $result = $shouldRetry ?? ($this->retryWhenCallback ? call_user_func($this->retryWhenCallback, $exception, $this, $this->request?->toPsrRequest()->getMethod()) : true);
+
+            $shouldRetry = null;
+
+            return $result;
+        });
     }
 
     /**
@@ -1445,7 +1430,12 @@ public function mergeOptions(...$options)
      */
     protected function newResponse($response)
     {
-        return new Response($response);
+        return tap(new Response($response), function (Response $laravelResponse) {
+            if ($this->truncateAt === null) {
+                return;
+            }
+            $this->truncateAt === false ? $laravelResponse->dontTruncate() : $laravelResponse->truncateAt($this->truncateAt);
+        });
     }
 
     /**
@@ -1588,7 +1578,7 @@ public function truncateAt(int $length)
     }
 
     /**
-     * Do not truncate a RequestException.
+     * Do not truncate a RequestException if thrown.
      *
      * @return $this
      */

src/Illuminate/Http/Client/Response.php

@@ -47,6 +47,11 @@ class Response implements ArrayAccess, Stringable
      */
     public $transferStats;
 
+    /**
+     * @var int<1, max>|false|null
+     */
+    protected $truncateAt = null;
+
     /**
      * Create a new response instance.
      *
@@ -289,6 +294,31 @@ public function toPsrResponse()
         return $this->response;
     }
 
+    /**
+     * When a RequestException is thrown, truncate to this length.
+     *
+     * @param  int<1, max>  $length
+     * @return $this
+     */
+    public function truncateAt(int $length)
+    {
+        $this->truncateAt = $length;
+
+        return $this;
+    }
+
+    /**
+     * Do not truncate a RequestException if thrown.
+     *
+     * @return $this
+     */
+    public function dontTruncate()
+    {
+        $this->truncateAt = false;
+
+        return $this;
+    }
+
     /**
      * Create an exception if a server or client error occurred.
      *
@@ -297,7 +327,16 @@ public function toPsrResponse()
     public function toException()
     {
         if ($this->failed()) {
-            return new RequestException($this);
+            $originalTruncateAt = RequestException::$truncateAt;
+            try {
+                if ($this->truncateAt !== null) {
+                    $this->truncateAt === false ? RequestException::dontTruncate() : RequestException::truncateAt($this->truncateAt);
+                }
+
+                return new RequestException($this);
+            } finally {
+                RequestException::$truncateAt = $originalTruncateAt;
+            }
         }
     }