Merge branch '4.6.x' into 4.5.x-merge-up-into-4.6.x_9JgLVdSd

* 4.6.x: Drop support of unmaintained versions of Symfony (#771) Fix CS (#772) Use PHP 7.4 for phpcs (#768) Use PHPUnit 9 methods Add property types Use PHP 7.4 syntax Wire the EntityArgumentResolver Add missing void types Allow doctrine/annotations 2 Update to psalm 5 Drop support of PHP < 7.4
doctrine · Jul 20, 2023 · 017ca26 · 017ca26
2 parents 78849b4 + ba28758
commit 017ca26
Show file tree

Hide file tree

Showing 80 changed files with 413 additions and 582 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -22,36 +22,29 @@ jobs:
         os:
           - "ubuntu-20.04"
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
           - "8.2"
         stability:
           - "stable"
         symfony-version:
-          - "4.4.x"
           - "5.4.x"
-          - "6.0.x"
+          - "6.2.x"
         driver-version:
           - "stable"
         dependencies:
           - "highest"
         include:
           - dependencies: "lowest"
             os: "ubuntu-20.04"
-            php-version: "7.2"
+            php-version: "7.4"
             driver-version: "1.5.0"
             stability: "stable"
-            symfony-version: "4.4.*"
+            symfony-version: "5.4.*"
         exclude:
-          - php-version: "7.2"
-            symfony-version: "6.0.x"
-          - php-version: "7.3"
-            symfony-version: "6.0.x"
           - php-version: "7.4"
-            symfony-version: "6.0.x"
+            symfony-version: "6.2.x"
 
     services:
       mongodb:

diff --git a/APM/CommandLoggerRegistry.php b/APM/CommandLoggerRegistry.php
@@ -11,7 +11,7 @@
 final class CommandLoggerRegistry
 {
     /** @var CommandLoggerInterface[] */
-    private $commandLoggers = [];
+    private array $commandLoggers = [];
 
     public function __construct(iterable $commandLoggers)
     {

diff --git a/APM/PSRCommandLogger.php b/APM/PSRCommandLogger.php
@@ -16,14 +16,11 @@
 
 final class PSRCommandLogger implements CommandLoggerInterface
 {
-    /** @var bool */
-    private $registered = false;
+    private bool $registered = false;
 
-    /** @var LoggerInterface|null */
-    private $logger;
+    private ?LoggerInterface $logger;
 
-    /** @var string */
-    private $prefix;
+    private string $prefix;
 
     public function __construct(?LoggerInterface $logger, string $prefix = 'MongoDB command: ')
     {

diff --git a/APM/StopwatchCommandLogger.php b/APM/StopwatchCommandLogger.php
@@ -16,11 +16,9 @@
 
 final class StopwatchCommandLogger implements CommandLoggerInterface
 {
-    /** @var bool */
-    private $registered = false;
+    private bool $registered = false;
 
-    /** @var Stopwatch|null */
-    private $stopwatch;
+    private ?Stopwatch $stopwatch;
 
     public function __construct(?Stopwatch $stopwatch)
     {

diff --git a/CacheWarmer/HydratorCacheWarmer.php b/CacheWarmer/HydratorCacheWarmer.php
@@ -31,8 +31,7 @@
  */
 class HydratorCacheWarmer implements CacheWarmerInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {
@@ -49,12 +48,8 @@ public function isOptional()
         return false;
     }
 
-    /**
-     * @param string $cacheDir
-     *
-     * @return string[]
-     */
-    public function warmUp($cacheDir)
+    /** @return string[] */
+    public function warmUp(string $cacheDir)
     {
         // we need the directory no matter the hydrator cache generation strategy.
         $hydratorCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.hydrator_dir');

diff --git a/CacheWarmer/PersistentCollectionCacheWarmer.php b/CacheWarmer/PersistentCollectionCacheWarmer.php
@@ -6,7 +6,6 @@
 
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
 use Doctrine\Persistence\ManagerRegistry;
 use RuntimeException;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -33,8 +32,7 @@
  */
 class PersistentCollectionCacheWarmer implements CacheWarmerInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {
@@ -51,12 +49,8 @@ public function isOptional()
         return false;
     }
 
-    /**
-     * @param string $cacheDir
-     *
-     * @return string[]
-     */
-    public function warmUp($cacheDir)
+    /** @return string[] */
+    public function warmUp(string $cacheDir)
     {
         // we need the directory no matter the hydrator cache generation strategy.
         $collCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.persistent_collection_dir');
@@ -81,7 +75,6 @@ public function warmUp($cacheDir)
             $collectionGenerator = $dm->getConfiguration()->getPersistentCollectionGenerator();
             $classes             = $dm->getMetadataFactory()->getAllMetadata();
             foreach ($classes as $metadata) {
-                assert($metadata instanceof ClassMetadata);
                 foreach ($metadata->getAssociationNames() as $fieldName) {
                     $mapping = $metadata->getFieldMapping($fieldName);
                     if (empty($mapping['collectionClass']) || in_array($mapping['collectionClass'], $generated)) {

diff --git a/CacheWarmer/ProxyCacheWarmer.php b/CacheWarmer/ProxyCacheWarmer.php
@@ -33,8 +33,7 @@
  */
 class ProxyCacheWarmer implements CacheWarmerInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {
@@ -51,12 +50,8 @@ public function isOptional()
         return false;
     }
 
-    /**
-     * @param string $cacheDir
-     *
-     * @return string[]
-     */
-    public function warmUp($cacheDir)
+    /** @return string[] */
+    public function warmUp(string $cacheDir)
     {
         // we need the directory no matter the proxy cache generation strategy.
         $proxyCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.proxy_dir');
@@ -86,8 +81,6 @@ public function warmUp($cacheDir)
     /** @return ClassMetadata[] */
     private function getClassesForProxyGeneration(DocumentManager $dm)
     {
-        return array_filter($dm->getMetadataFactory()->getAllMetadata(), static function (ClassMetadata $metadata) {
-            return ! $metadata->isEmbeddedDocument && ! $metadata->isMappedSuperclass;
-        });
+        return array_filter($dm->getMetadataFactory()->getAllMetadata(), static fn (ClassMetadata $metadata) => ! $metadata->isEmbeddedDocument && ! $metadata->isMappedSuperclass);
     }
 }
diff --git a/Command/ClearMetadataCacheDoctrineODMCommand.php b/Command/ClearMetadataCacheDoctrineODMCommand.php
@@ -14,6 +14,7 @@
  */
 class ClearMetadataCacheDoctrineODMCommand extends MetadataCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/CreateSchemaDoctrineODMCommand.php b/Command/CreateSchemaDoctrineODMCommand.php
@@ -15,6 +15,7 @@
  */
 class CreateSchemaDoctrineODMCommand extends CreateCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/DoctrineODMCommand.php b/Command/DoctrineODMCommand.php
@@ -33,8 +33,7 @@ abstract class DoctrineODMCommand extends Command
     /** @var ContainerInterface|null */
     protected $container;
 
-    /** @var ManagerRegistry|null */
-    private $managerRegistry;
+    private ?ManagerRegistry $managerRegistry;
 
     public function __construct(?ManagerRegistry $registry = null)
     {

diff --git a/Command/DropSchemaDoctrineODMCommand.php b/Command/DropSchemaDoctrineODMCommand.php
@@ -15,6 +15,7 @@
  */
 class DropSchemaDoctrineODMCommand extends DropCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/GenerateHydratorsDoctrineODMCommand.php b/Command/GenerateHydratorsDoctrineODMCommand.php
@@ -14,6 +14,7 @@
  */
 class GenerateHydratorsDoctrineODMCommand extends GenerateHydratorsCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/GenerateProxiesDoctrineODMCommand.php b/Command/GenerateProxiesDoctrineODMCommand.php
@@ -14,6 +14,7 @@
  */
 class GenerateProxiesDoctrineODMCommand extends GenerateProxiesCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/InfoDoctrineODMCommand.php b/Command/InfoDoctrineODMCommand.php
@@ -20,6 +20,7 @@
  */
 class InfoDoctrineODMCommand extends DoctrineODMCommand
 {
+    /** @return void */
     protected function configure()
     {
         $this
@@ -42,9 +43,7 @@ protected function configure()
     /** @return int */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $documentManagerName = $input->getOption('dm') ?
-            $input->getOption('dm') :
-            $this->getManagerRegistry()->getDefaultManagerName();
+        $documentManagerName = $input->hasOption('dm') ? $input->getOption('dm') : $this->getManagerRegistry()->getDefaultManagerName();
 
         $documentManager = $this->getManagerRegistry()->getManager($documentManagerName);
         assert($documentManager instanceof DocumentManager);

diff --git a/Command/LoadDataFixturesDoctrineODMCommand.php b/Command/LoadDataFixturesDoctrineODMCommand.php
@@ -27,8 +27,7 @@
  */
 class LoadDataFixturesDoctrineODMCommand extends DoctrineODMCommand
 {
-    /** @var SymfonyFixturesLoaderInterface  */
-    private $fixturesLoader;
+    private ?SymfonyFixturesLoaderInterface $fixturesLoader;
 
     public function __construct(?ManagerRegistry $registry = null, ?KernelInterface $kernel = null, ?SymfonyFixturesLoaderInterface $fixturesLoader = null)
     {
@@ -43,6 +42,7 @@ public function isEnabled()
         return parent::isEnabled() && class_exists(Loader::class);
     }
 
+    /** @return void */
     protected function configure()
     {
         $this

diff --git a/Command/QueryDoctrineODMCommand.php b/Command/QueryDoctrineODMCommand.php
@@ -14,6 +14,7 @@
  */
 class QueryDoctrineODMCommand extends QueryCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/ShardDoctrineODMCommand.php b/Command/ShardDoctrineODMCommand.php
@@ -15,6 +15,7 @@
  */
 class ShardDoctrineODMCommand extends ShardCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/Command/TailCursorDoctrineODMCommand.php b/Command/TailCursorDoctrineODMCommand.php
@@ -30,6 +30,7 @@ class TailCursorDoctrineODMCommand extends Command implements ContainerAwareInte
 {
     use ContainerAwareTrait;
 
+    /** @return void */
     protected function configure()
     {
         $this

diff --git a/Command/UpdateSchemaDoctrineODMCommand.php b/Command/UpdateSchemaDoctrineODMCommand.php
@@ -15,6 +15,7 @@
  */
 class UpdateSchemaDoctrineODMCommand extends UpdateCommand
 {
+    /** @return void */
     protected function configure()
     {
         parent::configure();

diff --git a/DataCollector/CommandDataCollector.php b/DataCollector/CommandDataCollector.php
@@ -21,8 +21,7 @@
 
 class CommandDataCollector extends DataCollector
 {
-    /** @var CommandLogger */
-    private $commandLogger;
+    private CommandLogger $commandLogger;
 
     public function __construct(CommandLogger $commandLogger)
     {
@@ -43,14 +42,12 @@ static function (Command $command): array {
                         'durationMicros' => $command->getDurationMicros(),
                     ];
                 },
-                $this->commandLogger->getAll()
+                $this->commandLogger->getAll(),
             ),
             'time' => array_reduce(
                 $this->commandLogger->getAll(),
-                static function (int $total, Command $command): int {
-                    return $total + $command->getDurationMicros();
-                },
-                0
+                static fn (int $total, Command $command): int => $total + $command->getDurationMicros(),
+                0,
             ),
         ];
     }

diff --git a/DependencyInjection/Compiler/CacheCompatibilityPass.php b/DependencyInjection/Compiler/CacheCompatibilityPass.php
@@ -73,7 +73,7 @@ private function createCompatibilityLayerDefinition(ContainerBuilder $container,
                 'doctrine/mongodb-odm-bundle',
                 '4.4',
                 'Configuring doctrine/cache is deprecated. Please update the cache service "%s" to use a PSR-6 cache.',
-                $definitionId
+                $definitionId,
             );
         }
 
@@ -90,7 +90,7 @@ private function wrapIfNecessary(ContainerBuilder $container, ?string $aliasId,
             return;
         }
 
-        $aliasId = $aliasId ?? $definitionId;
+        $aliasId ??= $definitionId;
 
         $compatibilityLayerId = $definitionId . '.compatibility_layer';
         $container->setDefinition($compatibilityLayerId, $compatibilityLayer);

diff --git a/DependencyInjection/Compiler/CreateHydratorDirectoryPass.php b/DependencyInjection/Compiler/CreateHydratorDirectoryPass.php
@@ -16,6 +16,7 @@
 
 class CreateHydratorDirectoryPass implements CompilerPassInterface
 {
+    /** @return void */
     public function process(ContainerBuilder $container)
     {
         if (! $container->hasParameter('doctrine_mongodb.odm.hydrator_dir')) {
@@ -32,12 +33,12 @@ public function process(ContainerBuilder $container)
         if (! is_dir($hydratorCacheDir)) {
             if (@mkdir($hydratorCacheDir, 0775, true) === false && ! is_dir($hydratorCacheDir)) {
                 throw new RuntimeException(
-                    sprintf('Unable to create the Doctrine Hydrator directory (%s)', dirname($hydratorCacheDir))
+                    sprintf('Unable to create the Doctrine Hydrator directory (%s)', dirname($hydratorCacheDir)),
                 );
             }
         } elseif (! is_writable($hydratorCacheDir)) {
             throw new RuntimeException(
-                sprintf('Unable to write in the Doctrine Hydrator directory (%s)', $hydratorCacheDir)
+                sprintf('Unable to write in the Doctrine Hydrator directory (%s)', $hydratorCacheDir),
             );
         }
     }

diff --git a/DependencyInjection/Compiler/CreateProxyDirectoryPass.php b/DependencyInjection/Compiler/CreateProxyDirectoryPass.php
@@ -16,6 +16,7 @@
 
 class CreateProxyDirectoryPass implements CompilerPassInterface
 {
+    /** @return void */
     public function process(ContainerBuilder $container)
     {
         if (! $container->hasParameter('doctrine_mongodb.odm.proxy_dir')) {
@@ -32,12 +33,12 @@ public function process(ContainerBuilder $container)
         if (! is_dir($proxyCacheDir)) {
             if (@mkdir($proxyCacheDir, 0775, true) === false && ! is_dir($proxyCacheDir)) {
                 throw new RuntimeException(
-                    sprintf('Unable to create the Doctrine Proxy directory (%s)', dirname($proxyCacheDir))
+                    sprintf('Unable to create the Doctrine Proxy directory (%s)', dirname($proxyCacheDir)),
                 );
             }
         } elseif (! is_writable($proxyCacheDir)) {
             throw new RuntimeException(
-                sprintf('Unable to write in the Doctrine Proxy directory (%s)', $proxyCacheDir)
+                sprintf('Unable to write in the Doctrine Proxy directory (%s)', $proxyCacheDir),
             );
         }
     }