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
symfony · Jan 23, 2024 · dc9b5ef · dc9b5ef
2 parents 9c0ce8f + b3b29b7
commit dc9b5ef
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/CacheWarmer/ProxyCacheWarmer.php b/CacheWarmer/ProxyCacheWarmer.php
@@ -37,7 +37,7 @@ public function isOptional(): bool
         return false;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $files = [];
         foreach ($this->registry->getManagers() as $em) {

diff --git a/ContainerAwareEventManager.php b/ContainerAwareEventManager.php
@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, array $listeners = []
         $this->listeners = $listeners;
     }
 
-    public function dispatchEvent(string $eventName, EventArgs $eventArgs = null): void
+    public function dispatchEvent(string $eventName, ?EventArgs $eventArgs = null): void
     {
         if (!$this->initializedSubscribers) {
             $this->initializeSubscribers();

diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -39,7 +39,7 @@ public function __construct(
         $this->managers = $registry->getManagerNames();
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
         $this->data = [
             'queries' => $this->collectQueries(),

diff --git a/DependencyInjection/AbstractDoctrineExtension.php b/DependencyInjection/AbstractDoctrineExtension.php
@@ -134,7 +134,7 @@ protected function setMappingDriverConfig(array $mappingConfig, string $mappingN
      *
      * Returns false when autodetection failed, an array of the completed information otherwise.
      */
-    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, string $bundleDir = null): array|false
+    protected function getMappingDriverBundleConfigDefaults(array $bundleConfig, \ReflectionClass $bundle, ContainerBuilder $container, ?string $bundleDir = null): array|false
     {
         $bundleClassDir = \dirname($bundle->getFileName());
         $bundleDir ??= $bundleClassDir;
@@ -386,7 +386,7 @@ abstract protected function getMappingObjectDefaultName(): string;
     /**
      * Relative path from the bundle root to the directory where mapping files reside.
      */
-    abstract protected function getMappingResourceConfigDirectory(string $bundleDir = null): string;
+    abstract protected function getMappingResourceConfigDirectory(?string $bundleDir = null): string;
 
     /**
      * Extension used by the mapping files.

diff --git a/Form/ChoiceList/IdReader.php b/Form/ChoiceList/IdReader.php
@@ -76,7 +76,7 @@ public function isIntId(): bool
      *
      * This method assumes that the object has a single-column ID.
      */
-    public function getIdValue(object $object = null): string
+    public function getIdValue(?object $object = null): string
     {
         if (!$object) {
             return '';

diff --git a/IdGenerator/UuidGenerator.php b/IdGenerator/UuidGenerator.php
@@ -26,7 +26,7 @@ final class UuidGenerator extends AbstractIdGenerator
     private UuidFactory|NameBasedUuidFactory|RandomBasedUuidFactory|TimeBasedUuidFactory $factory;
     private ?string $entityGetter = null;
 
-    public function __construct(UuidFactory $factory = null)
+    public function __construct(?UuidFactory $factory = null)
     {
         $this->protoFactory = $this->factory = $factory ?? new UuidFactory();
     }
@@ -52,7 +52,7 @@ public function generateId(EntityManagerInterface $em, $entity): Uuid
         return $this->factory->create();
     }
 
-    public function nameBased(string $entityGetter, Uuid|string $namespace = null): static
+    public function nameBased(string $entityGetter, Uuid|string|null $namespace = null): static
     {
         $clone = clone $this;
         $clone->factory = $clone->protoFactory->nameBased($namespace);
@@ -70,7 +70,7 @@ public function randomBased(): static
         return $clone;
     }
 
-    public function timeBased(Uuid|string $node = null): static
+    public function timeBased(Uuid|string|null $node = null): static
     {
         $clone = clone $this;
         $clone->factory = $clone->protoFactory->timeBased($node);

diff --git a/Messenger/AbstractDoctrineMiddleware.php b/Messenger/AbstractDoctrineMiddleware.php
@@ -28,7 +28,7 @@ abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
     protected ManagerRegistry $managerRegistry;
     protected ?string $entityManagerName;
 
-    public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)
+    public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null)
     {
         $this->managerRegistry = $managerRegistry;
         $this->entityManagerName = $entityManagerName;

diff --git a/Messenger/DoctrineOpenTransactionLoggerMiddleware.php b/Messenger/DoctrineOpenTransactionLoggerMiddleware.php
@@ -28,7 +28,7 @@ class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
 
     public function __construct(
         ManagerRegistry $managerRegistry,
-        string $entityManagerName = null,
+        ?string $entityManagerName = null,
         private readonly ?LoggerInterface $logger = null,
     ) {
         parent::__construct($managerRegistry, $entityManagerName);

diff --git a/Tests/ArgumentResolver/EntityValueResolverTest.php b/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -388,12 +388,12 @@ public function testAlreadyResolved()
         $this->assertSame([], $resolver->resolve($request, $argument));
     }
 
-    private function createArgument(string $class = null, MapEntity $entity = null, string $name = 'arg', bool $isNullable = false): ArgumentMetadata
+    private function createArgument(?string $class = null, ?MapEntity $entity = null, string $name = 'arg', bool $isNullable = false): ArgumentMetadata
     {
         return new ArgumentMetadata($name, $class ?? \stdClass::class, false, false, null, $isNullable, $entity ? [$entity] : []);
     }
 
-    private function createRegistry(ObjectManager $manager = null): ManagerRegistry&MockObject
+    private function createRegistry(?ObjectManager $manager = null): ManagerRegistry&MockObject
     {
         $registry = $this->getMockBuilder(ManagerRegistry::class)->getMock();
 

diff --git a/Tests/DoctrineTestHelper.php b/Tests/DoctrineTestHelper.php
@@ -33,7 +33,7 @@ final class DoctrineTestHelper
     /**
      * Returns an entity manager for testing.
      */
-    public static function createTestEntityManager(Configuration $config = null): EntityManager
+    public static function createTestEntityManager(?Configuration $config = null): EntityManager
     {
         if (!\extension_loaded('pdo_sqlite')) {
             TestCase::markTestSkipped('Extension pdo_sqlite is required.');

diff --git a/Tests/Form/Type/EntityTypeTest.php b/Tests/Form/Type/EntityTypeTest.php
@@ -766,7 +766,7 @@ public function testOverrideChoicesValuesWithCallable()
             'em' => 'default',
             'class' => self::ITEM_GROUP_CLASS,
             'choice_label' => 'name',
-            'choice_value' => function (GroupableEntity $entity = null) {
+            'choice_value' => function (?GroupableEntity $entity = null) {
                 if (null === $entity) {
                     return '';
                 }

diff --git a/Tests/PropertyInfo/DoctrineExtractorTest.php b/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -108,7 +108,7 @@ public function testTestGetPropertiesWithEmbedded()
     /**
      * @dataProvider typesProvider
      */
-    public function testExtract(string $property, array $type = null)
+    public function testExtract(string $property, ?array $type = null)
     {
         $this->assertEquals($type, $this->createExtractor()->getTypes(DoctrineDummy::class, $property, []));
     }

diff --git a/Tests/Validator/DoctrineLoaderTest.php b/Tests/Validator/DoctrineLoaderTest.php
@@ -178,7 +178,7 @@ public function testFieldMappingsConfiguration()
     /**
      * @dataProvider regexpProvider
      */
-    public function testClassValidator(bool $expected, string $classValidatorRegexp = null)
+    public function testClassValidator(bool $expected, ?string $classValidatorRegexp = null)
     {
         $doctrineLoader = new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), $classValidatorRegexp, false);
 

diff --git a/Validator/Constraints/UniqueEntity.php b/Validator/Constraints/UniqueEntity.php
@@ -42,14 +42,14 @@ class UniqueEntity extends Constraint
      */
     public function __construct(
         array|string $fields,
-        string $message = null,
-        string $service = null,
-        string $em = null,
-        string $entityClass = null,
-        string $repositoryMethod = null,
-        string $errorPath = null,
-        bool|string|array $ignoreNull = null,
-        array $groups = null,
+        ?string $message = null,
+        ?string $service = null,
+        ?string $em = null,
+        ?string $entityClass = null,
+        ?string $repositoryMethod = null,
+        ?string $errorPath = null,
+        bool|string|array|null $ignoreNull = null,
+        ?array $groups = null,
         $payload = null,
         array $options = []
     ) {