[9.x] Http client: dispatch "response received" event for every retry…

… attempt (#41793)

* Add failing test

* Dispatch event for every retry response

src/Illuminate/Http/Client/PendingRequest.php

@@ -714,6 +714,8 @@ public function send(string $method, string $url, array $options = [])
                 return tap(new Response($this->sendRequest($method, $url, $options)), function ($response) use ($attempt, &$shouldRetry) {
                     $this->populateResponse($response);
 
+                    $this->dispatchResponseReceivedEvent($response);
+
                     if (! $response->successful()) {
                         $shouldRetry = $this->retryWhenCallback ? call_user_func($this->retryWhenCallback, $response->toException()) : true;
 
@@ -725,8 +727,6 @@ public function send(string $method, string $url, array $options = [])
                             $response->throw();
                         }
                     }
-
-                    $this->dispatchResponseReceivedEvent($response);
                 });
             } catch (ConnectException $e) {
                 $this->dispatchConnectionFailedEvent();

tests/Http/HttpClientTest.php

@@ -1132,6 +1132,24 @@ public function testTheRequestSendingAndResponseReceivedEventsAreFiredWhenAReque
         });
     }
 
+    public function testTheRequestSendingAndResponseReceivedEventsAreFiredForEveryRetry()
+    {
+        $events = m::mock(Dispatcher::class);
+        $events->shouldReceive('dispatch')->times(2)->with(m::type(RequestSending::class));
+        $events->shouldReceive('dispatch')->times(2)->with(m::type(ResponseReceived::class));
+
+        $factory = new Factory($events);
+        $factory->fake([
+            '*' => $factory->response(['error'], 403),
+        ]);
+
+        $response = $factory->retry(2, 1000, null, false)->get('http://foo.com/get');
+
+        $this->assertTrue($response->failed());
+
+        $factory->assertSentCount(2);
+    }
+
     public function testTheTransferStatsAreCalledSafelyWhenFakingTheRequest()
     {
         $this->factory->fake(['https://example.com' => ['world' => 'Hello world']]);