Use typed properties

APM/CommandLoggerRegistry.php

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

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: ')
     {

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)
     {

CacheWarmer/HydratorCacheWarmer.php

@@ -31,8 +31,7 @@
  */
 class HydratorCacheWarmer implements CacheWarmerInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {

CacheWarmer/PersistentCollectionCacheWarmer.php

@@ -32,8 +32,7 @@
  */
 class PersistentCollectionCacheWarmer implements CacheWarmerInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {

CacheWarmer/ProxyCacheWarmer.php

@@ -33,8 +33,7 @@
  */
 class ProxyCacheWarmer implements CacheWarmerInterface
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     public function __construct(ContainerInterface $container)
     {

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)
     {

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)
     {

DataCollector/CommandDataCollector.php

@@ -21,8 +21,7 @@
 
 class CommandDataCollector extends DataCollector
 {
-    /** @var CommandLogger */
-    private $commandLogger;
+    private CommandLogger $commandLogger;
 
     public function __construct(CommandLogger $commandLogger)
     {

Form/ChoiceList/MongoDBQueryBuilderLoader.php

@@ -22,10 +22,8 @@ class MongoDBQueryBuilderLoader implements EntityLoaderInterface
      * entities
      *
      * This property should only be accessed through queryBuilder.
-     *
-     * @var Builder
      */
-    private $queryBuilder;
+    private Builder $queryBuilder;
 
     /**
      * Construct an ORM Query Builder Loader

Form/DoctrineMongoDBTypeGuesser.php

@@ -30,8 +30,8 @@ class DoctrineMongoDBTypeGuesser implements FormTypeGuesserInterface
     /** @var ManagerRegistry */
     protected $registry;
 
-    /** @var array */
-    private $cache = [];
+    /** @var array<class-string, array{ClassMetadata, string}|null> */
+    private array $cache = [];
 
     public function __construct(ManagerRegistry $registry)
     {

Loader/SymfonyFixturesLoader.php

@@ -21,10 +21,10 @@
 final class SymfonyFixturesLoader extends ContainerAwareLoader implements SymfonyFixturesLoaderInterface
 {
     /** @var FixtureInterface[] */
-    private $loadedFixtures = [];
+    private array $loadedFixtures = [];
 
     /** @var array<string, array<string, bool>> */
-    private $groupsFixtureMapping = [];
+    private array $groupsFixtureMapping = [];
 
     /**
      * @internal

ManagerConfigurator.php

@@ -14,7 +14,7 @@
 class ManagerConfigurator
 {
     /** @var array */
-    private $enabledFilters = [];
+    private array $enabledFilters = [];
 
     /**
      * Construct.

Repository/ContainerRepositoryFactory.php

@@ -25,10 +25,9 @@
 final class ContainerRepositoryFactory implements RepositoryFactory
 {
     /** @var array<string, ObjectRepository> */
-    private $managedRepositories = [];
+    private array $managedRepositories = [];
 
-    /** @var ContainerInterface|null */
-    private $container;
+    private ContainerInterface $container;
 
     /** @param ContainerInterface $container A service locator containing the repositories */
     public function __construct(ContainerInterface $container)
@@ -50,7 +49,7 @@ public function getRepository(DocumentManager $documentManager, string $document
 
         if ($customRepositoryName !== null) {
             // fetch from the container
-            if ($this->container && $this->container->has($customRepositoryName)) {
+            if ($this->container->has($customRepositoryName)) {
                 /** @var ObjectRepository<T> $repository */
                 $repository = $this->container->get($customRepositoryName);
 

Tests/APM/StopwatchCommandLoggerTest.php

@@ -10,16 +10,11 @@
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Symfony\Component\Stopwatch\Stopwatch;
 
-use function method_exists;
-
 class StopwatchCommandLoggerTest extends TestCase
 {
-    /** @var StopwatchCommandLogger */
-    private $commandLogger;
-    /** @var Stopwatch */
-    private $stopwatch;
-    /** @var DocumentManager */
-    private $dm;
+    private StopwatchCommandLogger $commandLogger;
+    private Stopwatch $stopwatch;
+    private DocumentManager $dm;
 
     protected function setUp(): void
     {
@@ -57,13 +52,7 @@ public function testItLogsStopwatchEvents(): void
         self::assertCount(3, $events);
 
         foreach ($events as $eventName => $stopwatchEvent) {
-            // @todo replace with assertMatchesRegularExpression() when PHP 7.2 is dropped
-            if (method_exists($this, 'assertMatchesRegularExpression')) {
-                self::assertMatchesRegularExpression('/mongodb_\d+/', $eventName);
-            } else {
-                self::assertRegExp('/mongodb_\d+/', $eventName);
-            }
-
+            self::assertMatchesRegularExpression('/mongodb_\d+/', $eventName);
             self::assertGreaterThan(0, $stopwatchEvent->getDuration());
             self::assertSame('doctrine_mongodb', $stopwatchEvent->getCategory());
         }

Tests/CacheWarmer/HydratorCacheWarmerTest.php

@@ -11,19 +11,16 @@
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
-use function method_exists;
 use function sys_get_temp_dir;
 use function unlink;
 
 use const DIRECTORY_SEPARATOR;
 
 class HydratorCacheWarmerTest extends TestCase
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
-    /** @var HydratorCacheWarmer */
-    private $warmer;
+    private HydratorCacheWarmer $warmer;
 
     protected function setUp(): void
     {
@@ -65,24 +62,12 @@ public function testWarmerNotExecuted(int $autoGenerate): void
 
         try {
             $this->warmer->warmUp('meh');
-            // Replace by "assertFileDoesNotExist" when PHPUnit 9 is minimum
-            $this->assertFileDoesNotExistWithBC($hydratorFilename);
+            $this->assertFileDoesNotExist($hydratorFilename);
         } finally {
             @unlink($hydratorFilename);
         }
     }
 
-    private function assertFileDoesNotExistWithBC(string $filename): void
-    {
-        if (! method_exists($this, 'assertFileDoesNotExist')) {
-            $this->assertFileNotExists($filename);
-
-            return;
-        }
-
-        $this->assertFileDoesNotExist($filename);
-    }
-
     /** @return array<array{int}> */
     public function provideWarmerNotExecuted(): array
     {

Tests/CacheWarmer/PersistentCollectionCacheWarmerTest.php

@@ -17,14 +17,12 @@
 
 class PersistentCollectionCacheWarmerTest extends TestCase
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
     /** @var PersistentCollectionGenerator&MockObject  */
-    private $generatorMock;
+    private PersistentCollectionGenerator $generatorMock;
 
-    /** @var PersistentCollectionCacheWarmer */
-    private $warmer;
+    private PersistentCollectionCacheWarmer $warmer;
 
     protected function setUp(): void
     {

Tests/CacheWarmer/ProxyCacheWarmerTest.php

@@ -18,14 +18,12 @@
 
 class ProxyCacheWarmerTest extends TestCase
 {
-    /** @var ContainerInterface */
-    private $container;
+    private ContainerInterface $container;
 
-    /** @var ProxyFactory|MockObject */
-    private $proxyMock;
+    /** @var ProxyFactory&MockObject */
+    private ProxyFactory $proxyMock;
 
-    /** @var ProxyCacheWarmer */
-    private $warmer;
+    private ProxyCacheWarmer $warmer;
 
     protected function setUp(): void
     {

Tests/Command/LoadDataFixturesDoctrineODMCommandTest.php

@@ -11,8 +11,7 @@
 
 class LoadDataFixturesDoctrineODMCommandTest extends KernelTestCase
 {
-    /** @var LoadDataFixturesDoctrineODMCommand */
-    private $command;
+    private LoadDataFixturesDoctrineODMCommand $command;
 
     protected function setUp(): void
     {

Tests/ContainerTest.php

@@ -15,11 +15,9 @@
 
 class ContainerTest extends TestCase
 {
-    /** @var ContainerBuilder */
-    private $container;
+    private ContainerBuilder $container;
 
-    /** @var DoctrineMongoDBExtension */
-    private $extension;
+    private DoctrineMongoDBExtension $extension;
 
     protected function setUp(): void
     {

Tests/DataCollector/CommandDataCollectorTest.php

@@ -14,10 +14,8 @@
 
 class CommandDataCollectorTest extends TestCase
 {
-    /** @var CommandLogger */
-    private $commandLogger;
-    /** @var DocumentManager */
-    private $dm;
+    private CommandLogger $commandLogger;
+    private DocumentManager $dm;
 
     protected function setUp(): void
     {

Tests/DependencyInjection/Fixtures/Bundles/RepositoryServiceBundle/Document/TestCustomClassRepoDocument.php

@@ -14,8 +14,6 @@ class TestCustomClassRepoDocument
 {
     /**
      * @ODM\Id
-     *
-     * @var string
      */
-    private $id;
+    private string $id;
 }

Tests/DependencyInjection/Fixtures/Bundles/RepositoryServiceBundle/Document/TestCustomServiceRepoDocument.php

@@ -14,8 +14,6 @@ class TestCustomServiceRepoDocument
 {
     /**
      * @ODM\Id
-     *
-     * @var string
      */
-    private $id;
+    private string $id;
 }

Tests/DependencyInjection/Fixtures/Bundles/RepositoryServiceBundle/Document/TestCustomServiceRepoFile.php

@@ -12,8 +12,6 @@ class TestCustomServiceRepoFile
 {
     /**
      * @ODM\Id
-     *
-     * @var string
      */
-    private $id;
+    private string $id;
 }

Tests/DependencyInjection/Fixtures/Bundles/RepositoryServiceBundle/Document/TestDefaultRepoDocument.php

@@ -13,8 +13,6 @@ class TestDefaultRepoDocument
 {
     /**
      * @ODM\Id
-     *
-     * @var string
      */
-    private $id;
+    private string $id;
 }

Tests/DependencyInjection/Fixtures/Bundles/RepositoryServiceBundle/Document/TestDefaultRepoFile.php

@@ -11,8 +11,6 @@ class TestDefaultRepoFile
 {
     /**
      * @ODM\Id
-     *
-     * @var string
      */
-    private $id;
+    private string $id;
 }

Tests/DependencyInjection/Fixtures/TestKernel.php

@@ -18,8 +18,7 @@
 
 class TestKernel extends Kernel
 {
-    /** @var string|null */
-    private $projectDir;
+    private ?string $projectDir = null;
 
     public function __construct(bool $debug = true)
     {

Tests/FixtureIntegrationTest.php

@@ -284,8 +284,7 @@ class IntegrationTestKernel extends Kernel
     /** @var callable */
     private $servicesCallback;
 
-    /** @var string */
-    private $randomKey;
+    private string $randomKey;
 
     public function __construct(string $environment, bool $debug)
     {