[8.x] Avoid deprecated guzzle code (#37349)

* Avoid deprecated guzzle code * Fixed typo * Fixed typo
laravel · May 12, 2021 · 976751b · allowing · May 14, 2021 · 976751b
1 parent 4ffb75c
commit 976751b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Illuminate/Http/Client/Factory.php b/src/Illuminate/Http/Client/Factory.php
@@ -3,7 +3,6 @@
 namespace Illuminate\Http\Client;
 
 use Closure;
-use function GuzzleHttp\Promise\promise_for;
 use GuzzleHttp\Psr7\Response as Psr7Response;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
@@ -109,7 +108,11 @@ public static function response($body = null, $status = 200, $headers = [])
             $headers['Content-Type'] = 'application/json';
         }
 
-        return promise_for(new Psr7Response($status, $headers, $body));
+        $response = new Psr7Response($status, $headers, $body);
+
+        return class_exists(GuzzleHttp\Promise\Create::class)
+            ? \GuzzleHttp\Promise\Create::promiseFor($response)
+            : \GuzzleHttp\Promise\promise_for($response);
     }
 
     /**

diff --git a/src/Illuminate/Http/Client/RequestException.php b/src/Illuminate/Http/Client/RequestException.php
@@ -34,7 +34,9 @@ protected function prepareMessage(Response $response)
     {
         $message = "HTTP request returned status code {$response->status()}";
 
-        $summary = \GuzzleHttp\Psr7\get_message_body_summary($response->toPsrResponse());
+        $summary = class_exists(\GuzzleHttp\Psr7\Message::class)
+            ? \GuzzleHttp\Psr7\Message::bodySummary($response->toPsrResponse())
+            : \GuzzleHttp\Psr7\get_message_body_summary($response->toPsrResponse());
 
         return is_null($summary) ? $message : $message .= ":\n{$summary}\n";
     }