Skip to content

Commit ae0a783

Browse files
nicolas-grekasnicolas-grekas
committed
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 48f1efb + a44829e commit ae0a783

File tree

1,400 files changed

+2307
-2303
lines changed

Some content is hidden

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

1,400 files changed

+2307
-2303
lines changed

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
2+
f4118e110a46de3ffb799e7d79bf15128d1646ea
3+
9519b54417c09c49496a4a6be238e63be9a73465

‎.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
'remove_inheritdoc' => true,
3535
'allow_unused_params' => true, // for future-ready params, to be replaced with https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7377
3636
],
37+
'nullable_type_declaration_for_default_null_value' => true,
3738
'header_comment' => ['header' => $fileHeaderComment],
3839
'modernize_strpos' => true,
3940
'get_class_to_class_keyword' => true,

‎src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function isOptional(): bool
3737
return false;
3838
}
3939

40-
public function warmUp(string $cacheDir, string $buildDir = null): array
40+
public function warmUp(string $cacheDir, ?string $buildDir = null): array
4141
{
4242
$files = [];
4343
foreach ($this->registry->getManagers() as $em) {

‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, array $listeners = []
4444
$this->listeners = $listeners;
4545
}
4646

47-
public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
47+
public function dispatchEvent($eventName, ?EventArgs $eventArgs = null): void
4848
{
4949
if (!$this->initializedSubscribers) {
5050
$this->initializeSubscribers();

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function addLogger(string $name, DebugStack $logger)
6666
/**
6767
* @return void
6868
*/
69-
public function collect(Request $request, Response $response, \Throwable $exception = null)
69+
public function collect(Request $request, Response $response, ?\Throwable $exception = null)
7070
{
7171
$this->data = [
7272
'queries' => $this->collectQueries(),

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
141141
*
142142
* Returns false when autodetection failed, an array of the completed information otherwise.
143143
*/
144-
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
144+
protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, ?string $bundleDir = null): array|false
145145
{
146146
$bundleClassDir = \dirname($bundle->getFileName());
147147
$bundleDir ??= $bundleClassDir;
@@ -447,7 +447,7 @@ abstract protected function getMappingObjectDefaultName(): string;
447447
/**
448448
* Relative path from the bundle root to the directory where mapping files reside.
449449
*/
450-
abstract protected function getMappingResourceConfigDirectory(string $bundleDir = null): string;
450+
abstract protected function getMappingResourceConfigDirectory(?string $bundleDir = null): string;
451451

452452
/**
453453
* Extension used by the mapping files.

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function isIntId(): bool
7676
*
7777
* This method assumes that the object has a single-column ID.
7878
*/
79-
public function getIdValue(object $object = null): string
79+
public function getIdValue(?object $object = null): string
8080
{
8181
if (!$object) {
8282
return '';

‎src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final class UuidGenerator extends AbstractIdGenerator
2626
private UuidFactory|NameBasedUuidFactory|RandomBasedUuidFactory|TimeBasedUuidFactory $factory;
2727
private ?string $entityGetter = null;
2828

29-
public function __construct(UuidFactory $factory = null)
29+
public function __construct(?UuidFactory $factory = null)
3030
{
3131
$this->protoFactory = $this->factory = $factory ?? new UuidFactory();
3232
}
@@ -52,7 +52,7 @@ public function generateId(EntityManagerInterface $em, $entity): Uuid
5252
return $this->factory->create();
5353
}
5454

55-
public function nameBased(string $entityGetter, Uuid|string $namespace = null): static
55+
public function nameBased(string $entityGetter, Uuid|string|null $namespace = null): static
5656
{
5757
$clone = clone $this;
5858
$clone->factory = $clone->protoFactory->nameBased($namespace);
@@ -70,7 +70,7 @@ public function randomBased(): static
7070
return $clone;
7171
}
7272

73-
public function timeBased(Uuid|string $node = null): static
73+
public function timeBased(Uuid|string|null $node = null): static
7474
{
7575
$clone = clone $this;
7676
$clone->factory = $clone->protoFactory->timeBased($node);

‎src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ class DbalLogger implements SQLLogger
3030
protected $logger;
3131
protected $stopwatch;
3232

33-
public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)
33+
public function __construct(?LoggerInterface $logger = null, ?Stopwatch $stopwatch = null)
3434
{
3535
$this->logger = $logger;
3636
$this->stopwatch = $stopwatch;
3737
}
3838

39-
public function startQuery($sql, array $params = null, array $types = null): void
39+
public function startQuery($sql, ?array $params = null, ?array $types = null): void
4040
{
4141
$this->stopwatch?->start('doctrine', 'doctrine');
4242

‎src/Symfony/Bridge/Doctrine/Messenger/AbstractDoctrineMiddleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
2828
protected ManagerRegistry $managerRegistry;
2929
protected ?string $entityManagerName;
3030

31-
public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
31+
public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null)
3232
{
3333
$this->managerRegistry = $managerRegistry;
3434
$this->entityManagerName = $entityManagerName;

0 commit comments

Comments
 (0)