Skip to content

Commit e526d81

Browse files
Merge branch '6.3' into 6.4
* 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
2 parents f9482da + 3d2ae12 commit e526d81

File tree

51 files changed

+104
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+104
-104
lines changed

CacheWarmer/CachePoolClearerCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(Psr6CacheClearer $poolClearer, array $pools = [])
3737
$this->pools = $pools;
3838
}
3939

40-
public function warmUp(string $cacheDir, string $buildDir = null): array
40+
public function warmUp(string $cacheDir, ?string $buildDir = null): array
4141
{
4242
foreach ($this->pools as $pool) {
4343
if ($this->poolClearer->hasPool($pool)) {

CacheWarmer/ConfigBuilderCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ConfigBuilderCacheWarmer implements CacheWarmerInterface
3131
private KernelInterface $kernel;
3232
private ?LoggerInterface $logger;
3333

34-
public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)
34+
public function __construct(KernelInterface $kernel, ?LoggerInterface $logger = null)
3535
{
3636
$this->kernel = $kernel;
3737
$this->logger = $logger;

CacheWarmer/RouterCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(ContainerInterface $container)
3434
$this->container = $container;
3535
}
3636

37-
public function warmUp(string $cacheDir, string $buildDir = null): array
37+
public function warmUp(string $cacheDir, ?string $buildDir = null): array
3838
{
3939
$router = $this->container->get('router');
4040

Command/CacheClearCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CacheClearCommand extends Command
4040
private CacheClearerInterface $cacheClearer;
4141
private Filesystem $filesystem;
4242

43-
public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null)
43+
public function __construct(CacheClearerInterface $cacheClearer, ?Filesystem $filesystem = null)
4444
{
4545
parent::__construct();
4646

Command/CachePoolClearCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ final class CachePoolClearCommand extends Command
3838
/**
3939
* @param string[]|null $poolNames
4040
*/
41-
public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null)
41+
public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
4242
{
4343
parent::__construct();
4444

Command/CachePoolDeleteCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class CachePoolDeleteCommand extends Command
3535
/**
3636
* @param string[]|null $poolNames
3737
*/
38-
public function __construct(Psr6CacheClearer $poolClearer, array $poolNames = null)
38+
public function __construct(Psr6CacheClearer $poolClearer, ?array $poolNames = null)
3939
{
4040
parent::__construct();
4141

Command/DebugAutowiringCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DebugAutowiringCommand extends ContainerDebugCommand
3535
{
3636
private ?FileLinkFormatter $fileLinkFormatter;
3737

38-
public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null)
38+
public function __construct(?string $name = null, ?FileLinkFormatter $fileLinkFormatter = null)
3939
{
4040
$this->fileLinkFormatter = $fileLinkFormatter;
4141
parent::__construct($name);

Command/RouterDebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class RouterDebugCommand extends Command
4242
private RouterInterface $router;
4343
private ?FileLinkFormatter $fileLinkFormatter;
4444

45-
public function __construct(RouterInterface $router, FileLinkFormatter $fileLinkFormatter = null)
45+
public function __construct(RouterInterface $router, ?FileLinkFormatter $fileLinkFormatter = null)
4646
{
4747
parent::__construct();
4848

Command/SecretsDecryptToLocalCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ final class SecretsDecryptToLocalCommand extends Command
3131
private AbstractVault $vault;
3232
private ?AbstractVault $localVault;
3333

34-
public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
34+
public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
3535
{
3636
$this->vault = $vault;
3737
$this->localVault = $localVault;

Command/SecretsEncryptFromLocalCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class SecretsEncryptFromLocalCommand extends Command
3030
private AbstractVault $vault;
3131
private ?AbstractVault $localVault;
3232

33-
public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
33+
public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
3434
{
3535
$this->vault = $vault;
3636
$this->localVault = $localVault;

0 commit comments

Comments
 (0)