[12.x] Fix setting request exception truncating doesn't work on HTTP layer when configured inside bootstrap/app.php (#57759)

* [12.x] Fix setting request exception truncating doesn't work on HTTP
layer when configured inside `bootstrap/app.php`

fix #57601

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Illuminate/Http/Client/RequestException.php

@@ -14,7 +14,14 @@ class RequestException extends HttpClientException
     public $response;
 
     /**
-     * The truncation length for the exception message.
+     * The current truncation length for the exception message.
+     *
+     * @var int|false
+     */
+    public $truncateExceptionsAt;
+
+    /**
+     * The global truncation length for the exception message.
      *
      * @var int|false
      */
@@ -24,10 +31,13 @@ class RequestException extends HttpClientException
      * Create a new exception instance.
      *
      * @param  \Illuminate\Http\Client\Response  $response
+     * @param  int|false|null  $truncateExceptionsAt
      */
-    public function __construct(Response $response)
+    public function __construct(Response $response, $truncateExceptionsAt = null)
     {
-        parent::__construct($this->prepareMessage($response), $response->status());
+        parent::__construct("HTTP request returned status code {$response->status()}", $response->status());
+
+        $this->truncateExceptionsAt = $truncateExceptionsAt;
 
         $this->response = $response;
     }
@@ -66,17 +76,18 @@ public static function dontTruncate()
     /**
      * Prepare the exception message.
      *
-     * @param  \Illuminate\Http\Client\Response  $response
-     * @return string
+     * @return void
      */
-    protected function prepareMessage(Response $response)
+    public function report(): void
     {
-        $message = "HTTP request returned status code {$response->status()}";
+        $truncateExceptionsAt = $this->truncateExceptionsAt ?? static::$truncateAt;
 
-        $summary = static::$truncateAt
-            ? Message::bodySummary($response->toPsrResponse(), static::$truncateAt)
-            : Message::toString($response->toPsrResponse());
+        $summary = $truncateExceptionsAt
+            ? Message::bodySummary($this->response->toPsrResponse(), $truncateExceptionsAt)
+            : Message::toString($this->response->toPsrResponse());
 
-        return is_null($summary) ? $message : $message .= ":\n{$summary}\n";
+        if (! is_null($summary)) {
+            $this->message .= ":\n{$summary}\n";
+        }
     }
 }

src/Illuminate/Http/Client/Response.php

@@ -304,19 +304,7 @@ public function toPsrResponse()
     public function toException()
     {
         if ($this->failed()) {
-            $originalTruncateAt = RequestException::$truncateAt;
-
-            try {
-                if ($this->truncateExceptionsAt !== null) {
-                    $this->truncateExceptionsAt === false
-                        ? RequestException::dontTruncate()
-                        : RequestException::truncateAt($this->truncateExceptionsAt);
-                }
-
-                return new RequestException($this);
-            } finally {
-                RequestException::$truncateAt = $originalTruncateAt;
-            }
+            return new RequestException($this, $this->truncateExceptionsAt);
         }
     }
 

tests/Http/HttpClientTest.php

@@ -1301,9 +1301,10 @@ public function testRequestExceptionSummary()
                 'message' => 'The Request can not be completed',
             ],
         ];
+
         $response = new Psr7Response(403, [], json_encode($error));
 
-        throw new RequestException(new Response($response));
+        throw tap(new RequestException(new Response($response)), fn ($exception) => $exception->report());
     }
 
     public function testRequestExceptionTruncatedSummary()
@@ -1319,7 +1320,7 @@ public function testRequestExceptionTruncatedSummary()
         ];
         $response = new Psr7Response(403, [], json_encode($error));
 
-        throw new RequestException(new Response($response));
+        throw tap(new RequestException(new Response($response)), fn ($exception) => $exception->report());
     }
 
     public function testRequestExceptionWithoutTruncatedSummary()
@@ -1337,7 +1338,7 @@ public function testRequestExceptionWithoutTruncatedSummary()
         ];
         $response = new Psr7Response(403, [], json_encode($error));
 
-        throw new RequestException(new Response($response));
+        throw tap(new RequestException(new Response($response)), fn ($exception) => $exception->report());
     }
 
     public function testRequestExceptionWithCustomTruncatedSummary()
@@ -1355,7 +1356,7 @@ public function testRequestExceptionWithCustomTruncatedSummary()
         ];
         $response = new Psr7Response(403, [], json_encode($error));
 
-        throw new RequestException(new Response($response));
+        throw tap(new RequestException(new Response($response)), fn ($exception) => $exception->report());
     }
 
     public function testRequestLevelTruncationLevelOnRequestException()
@@ -1373,6 +1374,8 @@ public function testRequestLevelTruncationLevelOnRequestException()
             $exception = $e;
         }
 
+        $exception->report();
+
         $this->assertEquals("HTTP request returned status code 403:\n[\"e (truncated...)\n", $exception->getMessage());
 
         $this->assertEquals(60, RequestException::$truncateAt);
@@ -1394,6 +1397,8 @@ public function testNoTruncationOnRequestLevel()
             $exception = $e;
         }
 
+        $exception->report();
+
         $this->assertEquals("HTTP request returned status code 403:\nHTTP/1.1 403 Forbidden\r\nContent-Type: application/json\r\n\r\n[\"error\"]\n", $exception->getMessage());
 
         $this->assertEquals(60, RequestException::$truncateAt);
@@ -1414,6 +1419,8 @@ public function testRequestExceptionDoesNotTruncateButRequestDoes()
             $exception = $e;
         }
 
+        $exception->report();
+
         $this->assertEquals("HTTP request returned status code 403:\n[\"e (truncated...)\n", $exception->getMessage());
 
         $this->assertFalse(RequestException::$truncateAt);
@@ -1428,6 +1435,8 @@ public function testAsyncRequestExceptionsRespectRequestTruncation()
 
         $exception = $this->factory->async()->throw()->truncateExceptionsAt(4)->get('http://foo.com/json')->wait();
 
+        $exception->report();
+
         $this->assertInstanceOf(RequestException::class, $exception);
         $this->assertEquals("HTTP request returned status code 403:\n[\"er (truncated...)\n", $exception->getMessage());
         $this->assertFalse(RequestException::$truncateAt);