Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit d4d908b47915 · 2024-01-23T15:35:58.000+01:00
* 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
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($eventName, EventArgs $eventArgs = null): void
+    public function dispatchEvent($eventName, ?EventArgs $eventArgs = null): void
     {
         if (!$this->initializedSubscribers) {
             $this->initializeSubscribers();
diff --git a/DataCollector/DoctrineDataCollector.php b/DataCollector/DoctrineDataCollector.php
@@ -58,7 +58,7 @@ public function addLogger(string $name, DebugStack $logger)
     /**
      * @return void
      */
-    public function collect(Request $request, Response $response, \Throwable $exception = null)
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null)
     {
         $this->data = [
             'queries' => $this->collectQueries(),
diff --git a/DependencyInjection/AbstractDoctrineExtension.php b/DependencyInjection/AbstractDoctrineExtension.php
@@ -141,7 +141,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;
@@ -451,7 +451,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/DoctrineChoiceLoader.php b/Form/ChoiceList/DoctrineChoiceLoader.php
@@ -36,7 +36,7 @@ class DoctrineChoiceLoader extends AbstractChoiceLoader
      *
      * @param string $class The class name of the loaded objects
      */
-    public function __construct(ObjectManager $manager, string $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)
+    public function __construct(ObjectManager $manager, string $class, ?IdReader $idReader = null, ?EntityLoaderInterface $objectLoader = null)
     {
         $classMetadata = $manager->getClassMetadata($class);
 
diff --git a/Form/ChoiceList/IdReader.php b/Form/ChoiceList/IdReader.php
@@ -74,7 +74,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/UlidGenerator.php b/IdGenerator/UlidGenerator.php
@@ -21,7 +21,7 @@ final class UlidGenerator extends AbstractIdGenerator
 {
     private ?UlidFactory $factory;
 
-    public function __construct(UlidFactory $factory = null)
+    public function __construct(?UlidFactory $factory = null)
     {
         $this->factory = $factory;
     }
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/Logger/DbalLogger.php b/Logger/DbalLogger.php
@@ -26,13 +26,13 @@ class DbalLogger implements SQLLogger
     protected $logger;
     protected $stopwatch;
 
-    public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)
+    public function __construct(?LoggerInterface $logger = null, ?Stopwatch $stopwatch = null)
     {
         $this->logger = $logger;
         $this->stopwatch = $stopwatch;
     }
 
-    public function startQuery($sql, array $params = null, array $types = null): void
+    public function startQuery($sql, ?array $params = null, ?array $types = null): void
     {
         $this->stopwatch?->start('doctrine', 'doctrine');
 
diff --git a/Messenger/AbstractDoctrineMiddleware.php b/Messenger/AbstractDoctrineMiddleware.php
@@ -28,7 +28,7 @@ abstract class AbstractDoctrineMiddleware implements MiddlewareInterface
     protected $managerRegistry;
     protected $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
@@ -29,7 +29,7 @@ class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware
     /** @var bool */
     private $isHandling = false;
 
-    public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null)
+    public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null, ?LoggerInterface $logger = null)
     {
         parent::__construct($managerRegistry, $entityManagerName);
 
diff --git a/Security/User/EntityUserProvider.php b/Security/User/EntityUserProvider.php
@@ -39,7 +39,7 @@ class EntityUserProvider implements UserProviderInterface, PasswordUpgraderInter
     private string $class;
     private ?string $property;
 
-    public function __construct(ManagerRegistry $registry, string $classOrAlias, string $property = null, string $managerName = null)
+    public function __construct(ManagerRegistry $registry, string $classOrAlias, ?string $property = null, ?string $managerName = null)
     {
         $this->registry = $registry;
         $this->managerName = $managerName;
diff --git a/Test/DoctrineTestHelper.php b/Test/DoctrineTestHelper.php
@@ -0,0 +1,135 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Doctrine\Test;
+
+use Doctrine\Common\Annotations\AnnotationReader;
+use Doctrine\Common\EventManager;
+use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
+use Doctrine\ORM\Configuration;
+use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
+use Doctrine\ORM\Mapping\Driver\AttributeDriver;
+use Doctrine\ORM\Mapping\Driver\XmlDriver;
+use Doctrine\ORM\ORMSetup;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\Mapping\Driver\SymfonyFileLocator;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\VarExporter\LazyGhostTrait;
+
+/**
+ * Provides utility functions needed in tests.
+ *
+ * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @deprecated since Symfony 5.3
+ */
+class DoctrineTestHelper
+{
+    /**
+     * Returns an entity manager for testing.
+     *
+     * @return EntityManager
+     */
+    public static function createTestEntityManager(?Configuration $config = null)
+    {
+        if (!\extension_loaded('pdo_sqlite')) {
+            TestCase::markTestSkipped('Extension pdo_sqlite is required.');
+        }
+
+        if (__CLASS__ === static::class) {
+            trigger_deprecation('symfony/doctrine-bridge', '5.3', '"%s" is deprecated and will be removed in 6.0.', __CLASS__);
+        }
+
+        if (null === $config) {
+            $config = self::createTestConfiguration();
+        }
+
+        $params = [
+            'driver' => 'pdo_sqlite',
+            'memory' => true,
+        ];
+
+        if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
+            return EntityManager::create($params, $config);
+        }
+
+        $eventManager = new EventManager();
+
+        return new EntityManager(DriverManager::getConnection($params, $config, $eventManager), $config, $eventManager);
+    }
+
+    /**
+     * @return Configuration
+     */
+    public static function createTestConfiguration()
+    {
+        if (__CLASS__ === static::class) {
+            trigger_deprecation('symfony/doctrine-bridge', '5.3', '"%s" is deprecated and will be removed in 6.0.', __CLASS__);
+        }
+
+        $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
+        $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
+        $config->setAutoGenerateProxyClasses(true);
+        $config->setProxyDir(sys_get_temp_dir());
+        $config->setProxyNamespace('SymfonyTests\Doctrine');
+        if (\PHP_VERSION_ID >= 80000 && class_exists(AttributeDriver::class)) {
+            $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
+        } else {
+            $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), null, true));
+        }
+        if (class_exists(DefaultSchemaManagerFactory::class)) {
+            $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
+        }
+
+        if (\PHP_VERSION_ID >= 80100 && method_exists(Configuration::class, 'setLazyGhostObjectEnabled') && trait_exists(LazyGhostTrait::class)) {
+            $config->setLazyGhostObjectEnabled(true);
+        }
+
+        return $config;
+    }
+
+    /**
+     * @return Configuration
+     */
+    public static function createTestConfigurationWithXmlLoader()
+    {
+        if (__CLASS__ === static::class) {
+            trigger_deprecation('symfony/doctrine-bridge', '5.3', '"%s" is deprecated and will be removed in 6.0.', __CLASS__);
+        }
+
+        $config = static::createTestConfiguration();
+
+        $driverChain = new MappingDriverChain();
+        $driverChain->addDriver(
+            new XmlDriver(
+                new SymfonyFileLocator(
+                    [__DIR__.'/../Tests/Resources/orm' => 'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'], '.orm.xml'
+                ),
+                '.orm.xml',
+                true
+            ),
+            'Symfony\\Bridge\\Doctrine\\Tests\\Fixtures'
+        );
+
+        $config->setMetadataDriverImpl($driverChain);
+
+        return $config;
+    }
+
+    /**
+     * This class cannot be instantiated.
+     */
+    private function __construct()
+    {
+    }
+}
diff --git a/Tests/ArgumentResolver/EntityValueResolverTest.php b/Tests/ArgumentResolver/EntityValueResolverTest.php
@@ -387,12 +387,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
@@ -35,7 +35,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
@@ -781,7 +781,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
@@ -118,7 +118,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
@@ -200,7 +200,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
@@ -50,14 +50,14 @@ class UniqueEntity extends Constraint
      */
     public function __construct(
         $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 = []
     ) {
diff --git a/Validator/DoctrineLoader.php b/Validator/DoctrineLoader.php
@@ -36,7 +36,7 @@ final class DoctrineLoader implements LoaderInterface
     private EntityManagerInterface $entityManager;
     private ?string $classValidatorRegexp;
 
-    public function __construct(EntityManagerInterface $entityManager, string $classValidatorRegexp = null)
+    public function __construct(EntityManagerInterface $entityManager, ?string $classValidatorRegexp = null)
     {
         $this->entityManager = $entityManager;
         $this->classValidatorRegexp = $classValidatorRegexp;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(ContainerInterface $container, array $listeners = []`
`44`	`44`	`$this->listeners = $listeners;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function dispatchEvent($eventName, EventArgs $eventArgs = null): void`
	`47`	`+ public function dispatchEvent($eventName, ?EventArgs $eventArgs = null): void`
`48`	`48`	`{`
`49`	`49`	`if (!$this->initializedSubscribers) {`
`50`	`50`	`$this->initializeSubscribers();`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function addLogger(string $name, DebugStack $logger)`
`58`	`58`	`/**`
`59`	`59`	`* @return void`
`60`	`60`	`*/`
`61`		`- public function collect(Request $request, Response $response, \Throwable $exception = null)`
	`61`	`+ public function collect(Request $request, Response $response, ?\Throwable $exception = null)`
`62`	`62`	`{`
`63`	`63`	`$this->data = [`
`64`	`64`	`'queries' => $this->collectQueries(),`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class DoctrineChoiceLoader extends AbstractChoiceLoader`
`36`	`36`	`*`
`37`	`37`	`* @param string $class The class name of the loaded objects`
`38`	`38`	`*/`
`39`		`- public function __construct(ObjectManager $manager, string $class, IdReader $idReader = null, EntityLoaderInterface $objectLoader = null)`
	`39`	`+ public function __construct(ObjectManager $manager, string $class, ?IdReader $idReader = null, ?EntityLoaderInterface $objectLoader = null)`
`40`	`40`	`{`
`41`	`41`	`$classMetadata = $manager->getClassMetadata($class);`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function isIntId(): bool`
`74`	`74`	`*`
`75`	`75`	`* This method assumes that the object has a single-column ID.`
`76`	`76`	`*/`
`77`		`- public function getIdValue(object $object = null): string`
	`77`	`+ public function getIdValue(?object $object = null): string`
`78`	`78`	`{`
`79`	`79`	`if (!$object) {`
`80`	`80`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ final class UlidGenerator extends AbstractIdGenerator`
`21`	`21`	`{`
`22`	`22`	`private ?UlidFactory $factory;`
`23`	`23`
`24`		`- public function __construct(UlidFactory $factory = null)`
	`24`	`+ public function __construct(?UlidFactory $factory = null)`
`25`	`25`	`{`
`26`	`26`	`$this->factory = $factory;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ final class UuidGenerator extends AbstractIdGenerator`
`26`	`26`	`private UuidFactory\|NameBasedUuidFactory\|RandomBasedUuidFactory\|TimeBasedUuidFactory $factory;`
`27`	`27`	`private ?string $entityGetter = null;`
`28`	`28`
`29`		`- public function __construct(UuidFactory $factory = null)`
	`29`	`+ public function __construct(?UuidFactory $factory = null)`
`30`	`30`	`{`
`31`	`31`	`$this->protoFactory = $this->factory = $factory ?? new UuidFactory();`
`32`	`32`	`}`
`@@ -52,7 +52,7 @@ public function generateId(EntityManagerInterface $em, $entity): Uuid`
`52`	`52`	`return $this->factory->create();`
`53`	`53`	`}`
`54`	`54`
`55`		`- public function nameBased(string $entityGetter, Uuid\|string $namespace = null): static`
	`55`	`+ public function nameBased(string $entityGetter, Uuid\|string\|null $namespace = null): static`
`56`	`56`	`{`
`57`	`57`	`$clone = clone $this;`
`58`	`58`	`$clone->factory = $clone->protoFactory->nameBased($namespace);`
`@@ -70,7 +70,7 @@ public function randomBased(): static`
`70`	`70`	`return $clone;`
`71`	`71`	`}`
`72`	`72`
`73`		`- public function timeBased(Uuid\|string $node = null): static`
	`73`	`+ public function timeBased(Uuid\|string\|null $node = null): static`
`74`	`74`	`{`
`75`	`75`	`$clone = clone $this;`
`76`	`76`	`$clone->factory = $clone->protoFactory->timeBased($node);`
Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ class DbalLogger implements SQLLogger`
`26`	`26`	`protected $logger;`
`27`	`27`	`protected $stopwatch;`
`28`	`28`
`29`		`- public function __construct(LoggerInterface $logger = null, Stopwatch $stopwatch = null)`
	`29`	`+ public function __construct(?LoggerInterface $logger = null, ?Stopwatch $stopwatch = null)`
`30`	`30`	`{`
`31`	`31`	`$this->logger = $logger;`
`32`	`32`	`$this->stopwatch = $stopwatch;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function startQuery($sql, array $params = null, array $types = null): void`
	`35`	`+ public function startQuery($sql, ?array $params = null, ?array $types = null): void`
`36`	`36`	`{`
`37`	`37`	`$this->stopwatch?->start('doctrine', 'doctrine');`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ abstract class AbstractDoctrineMiddleware implements MiddlewareInterface`
`28`	`28`	`protected $managerRegistry;`
`29`	`29`	`protected $entityManagerName;`
`30`	`30`
`31`		`- public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null)`
	`31`	`+ public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null)`
`32`	`32`	`{`
`33`	`33`	`$this->managerRegistry = $managerRegistry;`
`34`	`34`	`$this->entityManagerName = $entityManagerName;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class DoctrineOpenTransactionLoggerMiddleware extends AbstractDoctrineMiddleware`
`29`	`29`	`/** @var bool */`
`30`	`30`	`private $isHandling = false;`
`31`	`31`
`32`		`- public function __construct(ManagerRegistry $managerRegistry, string $entityManagerName = null, LoggerInterface $logger = null)`
	`32`	`+ public function __construct(ManagerRegistry $managerRegistry, ?string $entityManagerName = null, ?LoggerInterface $logger = null)`
`33`	`33`	`{`
`34`	`34`	`parent::__construct($managerRegistry, $entityManagerName);`
`35`	`35`