Skip to content

Commit f7d3ff5

Browse files
Merge branch '6.2' into 6.3
* 6.2: [Serializer] Handle datetime deserialization in U format [HttpFoundation] Fix file streaming after connection aborted Update HeaderBag::all PhpDoc [Messenger] Add `IS_REPEATABLE` flag to `AsMessageHandler` attribute Allow resources in Query::setParam Fix param type annotation [HttpClient] Fix setting duplicate-name headers when redirecting with AmpHttpClient
2 parents 4e2744b + 8eef8ec commit f7d3ff5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

BinaryFileResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ public function sendContent(): static
319319
while ('' !== $data) {
320320
$read = fwrite($out, $data);
321321
if (false === $read || connection_aborted()) {
322-
break;
322+
break 2;
323323
}
324324
if (0 < $length) {
325325
$length -= $read;

HeaderBag.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __toString(): string
6363
*
6464
* @param string|null $key The name of the headers to return or null to get them all
6565
*
66-
* @return ($key is null ? array<string, array<int, string|null>> : array<int, string|null>)
66+
* @return ($key is null ? array<string, list<string|null>> : list<string|null>)
6767
*/
6868
public function all(string $key = null): array
6969
{

0 commit comments

Comments
 (0)