Skip to content

Commit 261aa28

Browse files
Merge branch '6.4' into 7.0
* 6.4: (47 commits) Sync .github/expected-missing-return-types.diff [FrameworkBundle] Add void return-type to ErrorLoggerCompilerPass [DoctrineBridge] Fix cross-versions compat [HttpKernel] Handle nullable callback of StreamedResponse [Mailer] Capitalize sender header for Mailgun [FrameworkBundle] Configure `logger` as error logger if the Monolog Bundle is not registered DX: PHP CS Fixer - drop explicit nullable_type_declaration_for_default_null_value config, as it's part of ruleset anyway DX: PHP CS Fixer - drop explicit no_superfluous_phpdoc_tags config, as it's part of ruleset already [DI] Simplify using DI attributes with `ServiceLocator/Iterator`'s [FrameworkBundle] Fix registering workflow.registry Revert "Add keyword `dev` to leverage composer hint" [Validator] Add missing Ukrainian translations #51960 [Validator] Add missing translations for Indonesian (id) [Validator] Add missing translations for Vietnamese (VI) Add missing Validator translations - Croatian (hr) [HttpFoundation]  Improve PHPDoc of Cache attribute [Validator] Add missing Spanish (es) translations #51956 [Serializer] Add `XmlEncoder::CDATA_WRAPPING` context option [Finder] Add early directory prunning filter support Add missing dutch translations ...
2 parents 4ab6c5d + 978b737 commit 261aa28

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Request.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ class Request
158158

159159
protected static ?\Closure $requestFactory = null;
160160

161-
private string $preferredFormat;
161+
private ?string $preferredFormat = null;
162+
162163
private bool $isHostValid = true;
163164
private bool $isForwardedValid = true;
164165
private bool $isSafeContentPreferred;

StreamedResponse.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,12 @@ public function setCallback(callable $callback): static
5757
return $this;
5858
}
5959

60-
public function getCallback(): \Closure
60+
public function getCallback(): ?\Closure
6161
{
62+
if (!isset($this->callback)) {
63+
return null;
64+
}
65+
6266
return ($this->callback)(...);
6367
}
6468

0 commit comments

Comments
 (0)