diff --git a/src/Connection/ConnectionLimitingPool.php b/src/Connection/ConnectionLimitingPool.php index bf11eb9f..22a1bde4 100644 --- a/src/Connection/ConnectionLimitingPool.php +++ b/src/Connection/ConnectionLimitingPool.php @@ -116,14 +116,14 @@ public function getStream(Request $request, Cancellation $cancellation): Stream return HttpStream::fromStream( $stream, - function (Request $request, Cancellation $cancellationToken) use ( + function (Request $request, Cancellation $cancellation) use ( $poolRef, $connection, $stream, $uri ): Response { try { - $response = $stream->request($request, $cancellationToken); + $response = $stream->request($request, $cancellation); } catch (\Throwable $e) { $this->onReadyConnection($connection, $uri); throw $e; diff --git a/src/Connection/Http1Connection.php b/src/Connection/Http1Connection.php index 17eee07f..95568d20 100644 --- a/src/Connection/Http1Connection.php +++ b/src/Connection/Http1Connection.php @@ -229,8 +229,8 @@ private function request(Request $request, Cancellation $cancellation, Stream $s $request->setProtocolVersions([$protocolVersion]); if ($request->getTransferTimeout() > 0) { - $timeoutToken = new TimeoutCancellation($request->getTransferTimeout()); - $combinedCancellation = new CompositeCancellation($cancellation, $timeoutToken); + $timeoutCancellation = new TimeoutCancellation($request->getTransferTimeout()); + $combinedCancellation = new CompositeCancellation($cancellation, $timeoutCancellation); } else { $combinedCancellation = $cancellation; } diff --git a/src/Connection/StreamLimitingPool.php b/src/Connection/StreamLimitingPool.php index e49d7e68..ba1611ff 100644 --- a/src/Connection/StreamLimitingPool.php +++ b/src/Connection/StreamLimitingPool.php @@ -62,12 +62,12 @@ public function getStream(Request $request, Cancellation $cancellation): Stream return HttpStream::fromStream( $stream, - static function (Request $request, Cancellation $cancellationToken) use ( + static function (Request $request, Cancellation $cancellation) use ( $stream, $lock ): Response { try { - $response = $stream->request($request, $cancellationToken); + $response = $stream->request($request, $cancellation); } catch (\Throwable $e) { $lock->release(); throw $e; diff --git a/src/Interceptor/FollowRedirects.php b/src/Interceptor/FollowRedirects.php index d06b731b..e40edc65 100644 --- a/src/Interceptor/FollowRedirects.php +++ b/src/Interceptor/FollowRedirects.php @@ -137,7 +137,7 @@ private function followRedirects( Request $clonedRequest, Response $response, DelegateHttpClient $client, - Cancellation $cancellationToken + Cancellation $cancellation ): Response { $maxRedirects = $this->maxRedirects; $requestNr = 2; @@ -150,7 +150,7 @@ private function followRedirects( $clonedRequest = $this->cloneRequest($request); - $redirectResponse = $client->request($request, $cancellationToken); + $redirectResponse = $client->request($request, $cancellation); $redirectResponse->setPreviousResponse($response); $response = $redirectResponse;