Skip to content

Commit

Permalink
Merge branch '6.3' into 6.4
Browse files Browse the repository at this point in the history
* 6.3:
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
  • Loading branch information
nicolas-grekas committed Jan 23, 2024
2 parents 1e07027 + a7c57ae commit 425c776
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Command/ServerDumpPlaceholderCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ServerDumpPlaceholderCommand extends Command
{
private ServerDumpCommand $replacedCommand;

public function __construct(DumpServer $server = null, array $descriptors = [])
public function __construct(?DumpServer $server = null, array $descriptors = [])
{
$this->replacedCommand = new ServerDumpCommand((new \ReflectionClass(DumpServer::class))->newInstanceWithoutConstructor(), $descriptors);

Expand Down
4 changes: 2 additions & 2 deletions DebugBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ public function boot()
// The dump data collector is used by default, so dump output is sent to
// the WDT. In a CLI context, if dump is used too soon, the data collector
// will buffer it, and release it at the end of the script.
VarDumper::setHandler(function ($var, string $label = null) use ($container) {
VarDumper::setHandler(function ($var, ?string $label = null) use ($container) {
$dumper = $container->get('data_collector.dump');
$cloner = $container->get('var_dumper.cloner');
$handler = function ($var, string $label = null) use ($dumper, $cloner) {
$handler = function ($var, ?string $label = null) use ($dumper, $cloner) {
$var = $cloner->cloneVar($var);
if (null !== $label) {
$var = $var->withContext(['label' => $label]);
Expand Down

0 comments on commit 425c776

Please sign in to comment.