formatting

laravel · Jun 4, 2021 · 96518b9 · 96518b9
1 parent 571d705
commit 96518b9
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/src/Illuminate/Http/Client/PendingRequest.php b/src/Illuminate/Http/Client/PendingRequest.php
@@ -137,7 +137,7 @@ class PendingRequest
      *
      * @var \Illuminate\Http\Client\Request|null
      */
-    protected $request = null;
+    protected $request;
 
     /**
      * Create a new HTTP Client instance.
@@ -156,11 +156,11 @@ public function __construct(Factory $factory = null)
             'http_errors' => false,
         ];
 
-        $this->beforeSendingCallbacks = collect([function (Request $request, array $options, PendingRequest $instance) {
-            $instance->request = $request;
-            $instance->cookies = $options['cookies'];
+        $this->beforeSendingCallbacks = collect([function (Request $request, array $options, PendingRequest $pendingRequest) {
+            $pendingRequest->request = $request;
+            $pendingRequest->cookies = $options['cookies'];
 
-            $instance->dispatchRequestSendingEvent();
+            $pendingRequest->dispatchRequestSendingEvent();
         }]);
     }
 
@@ -986,11 +986,8 @@ protected function dispatchRequestSendingEvent()
      */
     protected function dispatchResponseReceivedEvent(Response $response)
     {
-        if (! $dispatcher = optional($this->factory)->getDispatcher()) {
-            return;
-        }
-
-        if (! $this->request) {
+        if (! ($dispatcher = optional($this->factory)->getDispatcher()) ||
+            ! $this->request) {
             return;
         }