Skip to content

Commit 0fc3d3a

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: (43 commits) [AssetMapper] Fix entrypoint scripts are not preloaded Fix typo in method resolvePackages Make FormPerformanceTestCase compatible with PHPUnit 10 Avoid calling getInvocationCount() [AssetMapper] Always downloading vendor files [Security] Fix resetting traceable listeners [HttpClient] Fix type error with http_version 1.1 [DependencyInjection] Add tests for `AutowireLocator`/`AutowireIterator` [DependencyInjection] Add `#[AutowireIterator]` attribute and improve `#[AutowireLocator]` Update documentation link Fix typo that causes unit test to fail Fix CS [AssetMapper] Add audit command [Mailer] Use idn encoded address otherwise Brevo throws an error [Messenger] Resend failed retries back to failure transport [FrameworkBundle] Fix call to invalid method in NotificationAssertionsTrait [Validator] Add missing italian translations [Notifier] Fix failing testcase Fix order array sum normalizedData and nestedData Add test for 0 and '0' in PeriodicalTrigger Fix '0' case error and remove duplicate code ...
2 parents 6f05960 + bea1307 commit 0fc3d3a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

AmpHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function request(string $method, string $url, array $options = []): Respo
122122
if ($options['http_version']) {
123123
$request->setProtocolVersions(match ((float) $options['http_version']) {
124124
1.0 => ['1.0'],
125-
1.1 => $request->setProtocolVersions(['1.1', '1.0']),
125+
1.1 => ['1.1', '1.0'],
126126
default => ['2', '1.1', '1.0'],
127127
});
128128
}

Response/MockResponse.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MockResponse implements ResponseInterface, StreamableInterface
2828
use CommonResponseTrait;
2929
use TransportResponseTrait;
3030

31-
private string|iterable $body;
31+
private string|iterable|null $body;
3232
private array $requestOptions = [];
3333
private string $requestUrl;
3434
private string $requestMethod;
@@ -98,7 +98,7 @@ public function cancel(): void
9898
$this->info['canceled'] = true;
9999
$this->info['error'] = 'Response has been canceled.';
100100
try {
101-
unset($this->body);
101+
$this->body = null;
102102
} catch (TransportException $e) {
103103
// ignore errors when canceling
104104
}
@@ -172,7 +172,7 @@ protected static function perform(ClientState $multi, array &$responses): void
172172
foreach ($responses as $response) {
173173
$id = $response->id;
174174

175-
if (!isset($response->body)) {
175+
if (null === $response->body) {
176176
// Canceled response
177177
$response->body = [];
178178
} elseif ([] === $response->body) {

0 commit comments

Comments
 (0)