Skip to content

Commit 3d2ae12

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.3
* 5.4: 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 23f67d6 + 8980568 commit 3d2ae12

Some content is hidden

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

48 files changed

+98
-98
lines changed

‎CacheWarmer/AnnotationsCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
3232
/**
3333
* @param string $phpArrayFile The PHP file where annotations are cached
3434
*/
35-
public function __construct(Reader $annotationReader, string $phpArrayFile, string $excludeRegexp = null, bool $debug = false)
35+
public function __construct(Reader $annotationReader, string $phpArrayFile, ?string $excludeRegexp = null, bool $debug = false)
3636
{
3737
parent::__construct($phpArrayFile);
3838
$this->annotationReader = $annotationReader;

‎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;

‎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
@@ -36,7 +36,7 @@ class DebugAutowiringCommand extends ContainerDebugCommand
3636
private bool $supportsHref;
3737
private ?FileLinkFormatter $fileLinkFormatter;
3838

39-
public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null)
39+
public function __construct(?string $name = null, ?FileLinkFormatter $fileLinkFormatter = null)
4040
{
4141
$this->supportsHref = method_exists(OutputFormatterStyle::class, 'setHref');
4242
$this->fileLinkFormatter = $fileLinkFormatter;

‎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;

‎Command/SecretsGenerateKeysCommand.php

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function get(string $name): Command
121121
return $command;
122122
}
123123

124-
public function all(string $namespace = null): array
124+
public function all(?string $namespace = null): array
125125
{
126126
$this->registerCommands();
127127

‎Console/Descriptor/Descriptor.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ abstract protected function describeContainerTags(ContainerBuilder $container, a
9494
*
9595
* @param Definition|Alias|object $service
9696
*/
97-
abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void;
97+
abstract protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void;
9898

9999
/**
100100
* Describes container services.
@@ -106,9 +106,9 @@ abstract protected function describeContainerServices(ContainerBuilder $containe
106106

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

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

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

113113
abstract protected function describeContainerParameter(mixed $parameter, array $options = []): void;
114114

@@ -263,7 +263,7 @@ protected function sortByPriority(array $tag): array
263263
return $tag;
264264
}
265265

266-
public static function getClassDescription(string $class, string &$resolvedClass = null): string
266+
public static function getClassDescription(string $class, ?string &$resolvedClass = null): string
267267
{
268268
$resolvedClass = $class;
269269
try {

‎Console/Descriptor/JsonDescriptor.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
6767
$this->writeData($data, $options);
6868
}
6969

70-
protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
70+
protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
7171
{
7272
if (!isset($options['id'])) {
7373
throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -118,12 +118,12 @@ protected function describeContainerServices(ContainerBuilder $container, array
118118
$this->writeData($data, $options);
119119
}
120120

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

126-
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
126+
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
127127
{
128128
if (!$container) {
129129
$this->writeData($this->getContainerAliasData($alias), $options);
@@ -220,7 +220,7 @@ protected function getRouteData(Route $route): array
220220
return $data;
221221
}
222222

223-
private function getContainerDefinitionData(Definition $definition, bool $omitTags = false, bool $showArguments = false, ContainerBuilder $container = null, string $id = null): array
223+
private function getContainerDefinitionData(Definition $definition, bool $omitTags = false, bool $showArguments = false, ?ContainerBuilder $container = null, ?string $id = null): array
224224
{
225225
$data = [
226226
'class' => (string) $definition->getClass(),
@@ -393,7 +393,7 @@ private function getCallableData(mixed $callable): array
393393
throw new \InvalidArgumentException('Callable is not describable.');
394394
}
395395

396-
private function describeValue($value, bool $omitTags, bool $showArguments, ContainerBuilder $container = null, string $id = null): mixed
396+
private function describeValue($value, bool $omitTags, bool $showArguments, ?ContainerBuilder $container = null, ?string $id = null): mixed
397397
{
398398
if (\is_array($value)) {
399399
$data = [];

‎Console/Descriptor/MarkdownDescriptor.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
8888
}
8989
}
9090

91-
protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
91+
protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
9292
{
9393
if (!isset($options['id'])) {
9494
throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -196,7 +196,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
196196
}
197197
}
198198

199-
protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
199+
protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
200200
{
201201
$output = '';
202202

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

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

‎Console/Descriptor/TextDescriptor.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class TextDescriptor extends Descriptor
3939
{
4040
private ?FileLinkFormatter $fileLinkFormatter;
4141

42-
public function __construct(FileLinkFormatter $fileLinkFormatter = null)
42+
public function __construct(?FileLinkFormatter $fileLinkFormatter = null)
4343
{
4444
$this->fileLinkFormatter = $fileLinkFormatter;
4545
}
@@ -141,7 +141,7 @@ protected function describeContainerTags(ContainerBuilder $container, array $opt
141141
}
142142
}
143143

144-
protected function describeContainerService(object $service, array $options = [], ContainerBuilder $container = null): void
144+
protected function describeContainerService(object $service, array $options = [], ?ContainerBuilder $container = null): void
145145
{
146146
if (!isset($options['id'])) {
147147
throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -263,7 +263,7 @@ protected function describeContainerServices(ContainerBuilder $container, array
263263
$options['output']->table($tableHeaders, $tableRows);
264264
}
265265

266-
protected function describeContainerDefinition(Definition $definition, array $options = [], ContainerBuilder $container = null): void
266+
protected function describeContainerDefinition(Definition $definition, array $options = [], ?ContainerBuilder $container = null): void
267267
{
268268
if (isset($options['id'])) {
269269
$options['output']->title(sprintf('Information for Service "<info>%s</info>"', $options['id']));
@@ -402,7 +402,7 @@ protected function describeContainerDeprecations(ContainerBuilder $container, ar
402402
$options['output']->listing($formattedLogs);
403403
}
404404

405-
protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $container = null): void
405+
protected function describeContainerAlias(Alias $alias, array $options = [], ?ContainerBuilder $container = null): void
406406
{
407407
if ($alias->isPublic() && !$alias->isPrivate()) {
408408
$options['output']->comment(sprintf('This service is a <info>public</info> alias for the service <info>%s</info>', (string) $alias));
@@ -554,7 +554,7 @@ private function formatRouterConfig(array $config): string
554554
return trim($configAsString);
555555
}
556556

557-
private function formatControllerLink(mixed $controller, string $anchorText, callable $getContainer = null): string
557+
private function formatControllerLink(mixed $controller, string $anchorText, ?callable $getContainer = null): string
558558
{
559559
if (null === $this->fileLinkFormatter) {
560560
return $anchorText;

0 commit comments

Comments
 (0)