Skip to content

Commit 176cca3

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 6.4: Fix implicitly-required parameters 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 [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 290b022 + e526d81 commit 176cca3

File tree

54 files changed

+110
-110
lines changed

Some content is hidden

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

54 files changed

+110
-110
lines changed

‎CacheWarmer/AbstractPhpFileCacheWarmer.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function isOptional(): bool
3434
return true;
3535
}
3636

37-
public function warmUp(string $cacheDir, string $buildDir = null): array
37+
public function warmUp(string $cacheDir, ?string $buildDir = null): array
3838
{
3939
$arrayAdapter = new ArrayAdapter();
4040

@@ -77,5 +77,5 @@ final protected function ignoreAutoloadException(string $class, \Exception $exce
7777
/**
7878
* @return bool false if there is nothing to warm-up
7979
*/
80-
abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string $buildDir = null): bool;
80+
abstract protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool;
8181
}

‎CacheWarmer/CachePoolClearerCacheWarmer.php

+1-1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ 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;
3838
}
3939

40-
public function warmUp(string $cacheDir, string $buildDir = null): array
40+
public function warmUp(string $cacheDir, ?string $buildDir = null): array
4141
{
4242
if (!$buildDir) {
4343
return [];

‎CacheWarmer/RouterCacheWarmer.php

+1-1
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

‎CacheWarmer/SerializerCacheWarmer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct(array $loaders, string $phpArrayFile)
3838
$this->loaders = $loaders;
3939
}
4040

41-
protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string $buildDir = null): bool
41+
protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
4242
{
4343
if (!$this->loaders) {
4444
return true;

‎CacheWarmer/TranslationsCacheWarmer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct(ContainerInterface $container)
3333
$this->container = $container;
3434
}
3535

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

‎CacheWarmer/ValidatorCacheWarmer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function __construct(ValidatorBuilder $validatorBuilder, string $phpArray
3838
$this->validatorBuilder = $validatorBuilder;
3939
}
4040

41-
protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, string $buildDir = null): bool
41+
protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter, ?string $buildDir = null): bool
4242
{
4343
$loaders = $this->validatorBuilder->getLoaders();
4444
$metadataFactory = new LazyLoadingMetadataFactory(new LoaderChain($loaders), $arrayAdapter);

‎Command/CacheClearCommand.php

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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;

‎Command/SecretsGenerateKeysCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class SecretsGenerateKeysCommand extends Command
3333
private AbstractVault $vault;
3434
private ?AbstractVault $localVault;
3535

36-
public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
36+
public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
3737
{
3838
$this->vault = $vault;
3939
$this->localVault = $localVault;

‎Command/SecretsListCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ final class SecretsListCommand extends Command
3434
private AbstractVault $vault;
3535
private ?AbstractVault $localVault;
3636

37-
public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
37+
public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
3838
{
3939
$this->vault = $vault;
4040
$this->localVault = $localVault;

‎Command/SecretsRemoveCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final class SecretsRemoveCommand extends Command
3535
private AbstractVault $vault;
3636
private ?AbstractVault $localVault;
3737

38-
public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
38+
public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
3939
{
4040
$this->vault = $vault;
4141
$this->localVault = $localVault;

‎Command/SecretsSetCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ final class SecretsSetCommand extends Command
3636
private AbstractVault $vault;
3737
private ?AbstractVault $localVault;
3838

39-
public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
39+
public function __construct(AbstractVault $vault, ?AbstractVault $localVault = null)
4040
{
4141
$this->vault = $vault;
4242
$this->localVault = $localVault;

‎Command/TranslationDebugCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class TranslationDebugCommand extends Command
5959
private array $codePaths;
6060
private array $enabledLocales;
6161

62-
public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
62+
public function __construct(TranslatorInterface $translator, TranslationReaderInterface $reader, ExtractorInterface $extractor, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
6363
{
6464
parent::__construct();
6565

‎Command/TranslationUpdateCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class TranslationUpdateCommand extends Command
6060
private array $codePaths;
6161
private array $enabledLocales;
6262

63-
public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, string $defaultTransPath = null, string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
63+
public function __construct(TranslationWriterInterface $writer, TranslationReaderInterface $reader, ExtractorInterface $extractor, string $defaultLocale, ?string $defaultTransPath = null, ?string $defaultViewsPath = null, array $transPaths = [], array $codePaths = [], array $enabledLocales = [])
6464
{
6565
parent::__construct();
6666

‎Console/Application.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public function get(string $name): Command
149149
return parent::get($name);
150150
}
151151

152-
public function all(string $namespace = null): array
152+
public function all(?string $namespace = null): array
153153
{
154154
$this->registerCommands();
155155

‎Console/Descriptor/Descriptor.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ abstract protected function describeContainerTags(ContainerBuilder $container, a
9696
*
9797
* @param Definition|Alias|object $service
9898
*/
99-
abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void;
99+
abstract protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void;
100100

101101
/**
102102
* Describes container services.
@@ -108,9 +108,9 @@ abstract protected function describeContainerServices(ContainerBuilder $containe
108108

109109
abstract protected function describeContainerDeprecations(ContainerBuilder $container, array $options = []): void;
110110

111-
abstract protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void;
111+
abstract protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void;
112112

113-
abstract protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void;
113+
abstract protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void;
114114

115115
abstract protected function describeContainerParameter(mixed $parameter, ?array $deprecation, array $options = []): void;
116116

@@ -278,7 +278,7 @@ protected function getReverseAliases(RouteCollection $routes): array
278278
return $reverseAliases;
279279
}
280280

281-
public static function getClassDescription(string $class, string &$resolvedClass = null): string
281+
public static function getClassDescription(string $class, ?string &$resolvedClass = null): string
282282
{
283283
$resolvedClass = $class;
284284
try {

‎Console/Descriptor/JsonDescriptor.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
7070
$this->writeData($data, $options);
7171
}
7272

73-
protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
73+
protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
7474
{
7575
if (!isset($options['id'])) {
7676
throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -121,12 +121,12 @@ protected function describeContainerServices(ContainerBuilder $container, array
121121
$this->writeData($data, $options);
122122
}
123123

124-
protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
124+
protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
125125
{
126126
$this->writeData($this->getContainerDefinitionData($definition, isset($options['omit_tags']) && $options['omit_tags'], isset($options['show_arguments']) && $options['show_arguments'], $container, $options['id'] ?? null), $options);
127127
}
128128

129-
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
129+
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
130130
{
131131
if (!$container) {
132132
$this->writeData($this->getContainerAliasData($alias), $options);
@@ -245,7 +245,7 @@ protected function sortParameters(ParameterBag $parameters): array
245245
return $sortedParameters;
246246
}
247247

248-
private function getContainerDefinitionData(Definition $definition, bool $omitTags = false, bool $showArguments = false, ContainerBuilder $container = null, string $id = null): array
248+
private function getContainerDefinitionData(Definition $definition, bool $omitTags = false, bool $showArguments = false, ?ContainerBuilder $container = null, ?string $id = null): array
249249
{
250250
$data = [
251251
'class' => (string) $definition->getClass(),
@@ -418,7 +418,7 @@ private function getCallableData(mixed $callable): array
418418
throw new \InvalidArgumentException('Callable is not describable.');
419419
}
420420

421-
private function describeValue($value, bool $omitTags, bool $showArguments, ContainerBuilder $container = null, string $id = null): mixed
421+
private function describeValue($value, bool $omitTags, bool $showArguments, ?ContainerBuilder $container = null, ?string $id = null): mixed
422422
{
423423
if (\is_array($value)) {
424424
$data = [];

‎Console/Descriptor/MarkdownDescriptor.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
9898
}
9999
}
100100

101-
protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
101+
protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
102102
{
103103
if (!isset($options['id'])) {
104104
throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -206,7 +206,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
206206
}
207207
}
208208

209-
protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
209+
protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
210210
{
211211
$output = '';
212212

@@ -276,7 +276,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
276276
$this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
277277
}
278278

279-
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
279+
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
280280
{
281281
$output = '- Service: `'.$alias.'`'
282282
."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');

‎Console/Descriptor/TextDescriptor.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class TextDescriptor extends Descriptor
4040
{
4141
private ?FileLinkFormatter $fileLinkFormatter;
4242

43-
public function __construct(FileLinkFormatter $fileLinkFormatter = null)
43+
public function __construct(?FileLinkFormatter $fileLinkFormatter = null)
4444
{
4545
$this->fileLinkFormatter = $fileLinkFormatter;
4646
}
@@ -159,7 +159,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
159159
}
160160
}
161161

162-
protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
162+
protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
163163
{
164164
if (!isset($options['id'])) {
165165
throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -281,7 +281,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
281281
$options['output']->table($tableHeaders, $tableRows);
282282
}
283283

284-
protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
284+
protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
285285
{
286286
if (isset($options['id'])) {
287287
$options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
@@ -420,7 +420,7 @@ protected function describeContainerDeprecations(ContainerBuilder $container, ar
420420
$options['output']->listing($formattedLogs);
421421
}
422422

423-
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
423+
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
424424
{
425425
if ($alias->isPublic() && !$alias->isPrivate()) {
426426
$options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
@@ -579,7 +579,7 @@ private function formatRouterConfig(array $config): string
579579
return trim($configAsString);
580580
}
581581

582-
private function formatControllerLink(mixed $controller, string $anchorText, callable $getContainer = null): string
582+
private function formatControllerLink(mixed $controller, string $anchorText, ?callable $getContainer = null): string
583583
{
584584
if (null === $this->fileLinkFormatter) {
585585
return $anchorText;

0 commit comments

Comments
 (0)