Skip to content

Commit

Permalink
Merge branch '6.2' into 6.3
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed May 12, 2023
2 parents 4e2744b + 8eef8ec commit f7d3ff5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion BinaryFileResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public function sendContent(): static
while ('' !== $data) {
$read = fwrite($out, $data);
if (false === $read || connection_aborted()) {
break;
break 2;
}
if (0 < $length) {
$length -= $read;
Expand Down
2 changes: 1 addition & 1 deletion HeaderBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function __toString(): string
*
* @param string|null $key The name of the headers to return or null to get them all
*
* @return ($key is null ? array<string, array<int, string|null>> : array<int, string|null>)
* @return ($key is null ? array<string, list<string|null>> : list<string|null>)
*/
public function all(string $key = null): array
{
Expand Down

0 comments on commit f7d3ff5

Please sign in to comment.