feat: Symfony 7 support

kbond · kbond · commit c96939316b25 · 2023-12-09T11:04:04.000+01:00
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -30,6 +30,7 @@ jobs:
         symfony-version:
           - "5.4.*"
           - "6.4.*"
+          - "7.0.x"
         driver-version:
           - "stable"
         dependencies:
@@ -41,6 +42,9 @@ jobs:
             driver-version: "1.5.0"
             stability: "stable"
             symfony-version: "5.4.*"
+        exclude:
+          - php-version: "8.1"
+            symfony-version: "7.0.x"
 
     services:
       mongodb:
diff --git a/CacheWarmer/HydratorCacheWarmer.php b/CacheWarmer/HydratorCacheWarmer.php
@@ -40,13 +40,13 @@ public function __construct(private ContainerInterface $container)
      *
      * @return false
      */
-    public function isOptional()
+    public function isOptional(): bool
     {
         return false;
     }
 
     /** @return string[] */
-    public function warmUp(string $cacheDir, ?string $buildDir = null)
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         // 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
@@ -41,13 +41,13 @@ public function __construct(private ContainerInterface $container)
      *
      * @return false
      */
-    public function isOptional()
+    public function isOptional(): bool
     {
         return false;
     }
 
     /** @return string[] */
-    public function warmUp(string $cacheDir, ?string $buildDir = null)
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         // we need the directory no matter the hydrator cache generation strategy.
         $collCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.persistent_collection_dir');
diff --git a/CacheWarmer/ProxyCacheWarmer.php b/CacheWarmer/ProxyCacheWarmer.php
@@ -42,13 +42,13 @@ public function __construct(private ContainerInterface $container)
      *
      * @return false
      */
-    public function isOptional()
+    public function isOptional(): bool
     {
         return false;
     }
 
     /** @return string[] */
-    public function warmUp(string $cacheDir, ?string $buildDir = null)
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         // we need the directory no matter the proxy cache generation strategy.
         $proxyCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.proxy_dir');
diff --git a/Command/ClearMetadataCacheDoctrineODMCommand.php b/Command/ClearMetadataCacheDoctrineODMCommand.php
@@ -11,11 +11,12 @@
 
 /**
  * Command to clear the metadata cache of the various cache drivers.
+ *
+ * @internal since 4.7
  */
 class ClearMetadataCacheDoctrineODMCommand extends MetadataCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -35,8 +36,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/CreateSchemaDoctrineODMCommand.php b/Command/CreateSchemaDoctrineODMCommand.php
@@ -12,11 +12,12 @@
 /**
  * Command to create the database schema for a set of classes based on their
  * mappings.
+ *
+ * @internal since 4.7
  */
 class CreateSchemaDoctrineODMCommand extends CreateCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -35,8 +36,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/DropSchemaDoctrineODMCommand.php b/Command/DropSchemaDoctrineODMCommand.php
@@ -12,11 +12,12 @@
 /**
  * Command to drop the database schema for a set of classes based on their
  * mappings.
+ *
+ * @internal since 4.7
  */
 class DropSchemaDoctrineODMCommand extends DropCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -35,8 +36,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/GenerateHydratorsDoctrineODMCommand.php b/Command/GenerateHydratorsDoctrineODMCommand.php
@@ -11,11 +11,12 @@
 
 /**
  * Generate the Doctrine ORM document hydrators to your cache directory.
+ *
+ * @internal since 4.7
  */
 class GenerateHydratorsDoctrineODMCommand extends GenerateHydratorsCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -34,8 +35,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/GenerateProxiesDoctrineODMCommand.php b/Command/GenerateProxiesDoctrineODMCommand.php
@@ -11,11 +11,12 @@
 
 /**
  * Generate the Doctrine ORM document proxies to your cache directory.
+ *
+ * @internal since 4.7
  */
 class GenerateProxiesDoctrineODMCommand extends GenerateProxiesCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -34,8 +35,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/InfoDoctrineODMCommand.php b/Command/InfoDoctrineODMCommand.php
@@ -17,11 +17,12 @@
 
 /**
  * Show information about mapped documents
+ *
+ * @internal since 4.7
  */
 class InfoDoctrineODMCommand extends DoctrineODMCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('doctrine:mongodb:mapping:info')
@@ -40,8 +41,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $documentManagerName = $input->hasOption('dm') ? $input->getOption('dm') : $this->getManagerRegistry()->getDefaultManagerName();
 
diff --git a/Command/LoadDataFixturesDoctrineODMCommand.php b/Command/LoadDataFixturesDoctrineODMCommand.php
@@ -24,6 +24,8 @@
 
 /**
  * Load data fixtures from bundles.
+ *
+ * @internal since 4.7
  */
 class LoadDataFixturesDoctrineODMCommand extends DoctrineODMCommand
 {
@@ -32,14 +34,12 @@ public function __construct(?ManagerRegistry $registry = null, ?KernelInterface
         parent::__construct($registry);
     }
 
-    /** @return bool */
-    public function isEnabled()
+    public function isEnabled(): bool
     {
         return parent::isEnabled() && class_exists(Loader::class);
     }
 
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('doctrine:mongodb:fixtures:load')
@@ -69,8 +69,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $dm = $this->getManagerRegistry()->getManager($input->getOption('dm'));
         $ui = new SymfonyStyle($input, $output);
diff --git a/Command/QueryDoctrineODMCommand.php b/Command/QueryDoctrineODMCommand.php
@@ -11,11 +11,12 @@
 
 /**
  * Execute a Doctrine MongoDB ODM query and output the results.
+ *
+ * @internal since 4.7
  */
 class QueryDoctrineODMCommand extends QueryCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -24,8 +25,7 @@ protected function configure()
             ->addOption('dm', null, InputOption::VALUE_OPTIONAL, 'The document manager to use for this command.');
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/ShardDoctrineODMCommand.php b/Command/ShardDoctrineODMCommand.php
@@ -12,11 +12,12 @@
 /**
  * Command to shard database collections for a set of classes based on their
  * mappings.
+ *
+ * @internal since 4.7
  */
 class ShardDoctrineODMCommand extends ShardCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -35,8 +36,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/Command/TailCursorDoctrineODMCommand.php b/Command/TailCursorDoctrineODMCommand.php
@@ -30,8 +30,7 @@ class TailCursorDoctrineODMCommand extends Command implements ContainerAwareInte
     /** @var ContainerInterface|null */
     protected $container;
 
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setName('doctrine:mongodb:tail-cursor')
@@ -43,8 +42,7 @@ protected function configure()
             ->addOption('sleep-time', null, InputOption::VALUE_REQUIRED, 'The number of seconds to wait between two checks.', '10');
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         trigger_deprecation(
             'doctrine/mongodb-odm-bundle',
diff --git a/Command/UpdateSchemaDoctrineODMCommand.php b/Command/UpdateSchemaDoctrineODMCommand.php
@@ -12,11 +12,12 @@
 /**
  * Command to update the database schema for a set of classes based on their
  * mappings.
+ *
+ * @internal since 4.7
  */
 class UpdateSchemaDoctrineODMCommand extends UpdateCommand
 {
-    /** @return void */
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -35,8 +36,7 @@ protected function configure()
         );
     }
 
-    /** @return int */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));
 
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -24,10 +24,8 @@ class Configuration implements ConfigurationInterface
 {
     /**
      * Generates the configuration tree builder.
-     *
-     * @return TreeBuilder
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('doctrine_mongodb');
         $rootNode    = $treeBuilder->getRootNode();
diff --git a/Form/DoctrineMongoDBExtension.php b/Form/DoctrineMongoDBExtension.php
@@ -23,15 +23,14 @@ public function __construct(ManagerRegistry $registry)
     }
 
     /** @return FormTypeInterface[] */
-    protected function loadTypes()
+    protected function loadTypes(): array
     {
         return [
             new Type\DocumentType($this->registry),
         ];
     }
 
-    /** @return FormTypeGuesserInterface|null */
-    protected function loadTypeGuesser()
+    protected function loadTypeGuesser(): ?FormTypeGuesserInterface
     {
         return new DoctrineMongoDBTypeGuesser($this->registry);
     }
diff --git a/Form/DoctrineMongoDBTypeGuesser.php b/Form/DoctrineMongoDBTypeGuesser.php
diff --git a/Form/Type/DocumentType.php b/Form/Type/DocumentType.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ public function __construct(private ContainerInterface $container)`
`40`	`40`	`*`
`41`	`41`	`* @return false`
`42`	`42`	`*/`
`43`		`- public function isOptional()`
	`43`	`+ public function isOptional(): bool`
`44`	`44`	`{`
`45`	`45`	`return false;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/** @return string[] */`
`49`		`- public function warmUp(string $cacheDir, ?string $buildDir = null)`
	`49`	`+ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`50`	`50`	`{`
`51`	`51`	`// we need the directory no matter the hydrator cache generation strategy.`
`52`	`52`	`$hydratorCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.hydrator_dir');`
Original file line number	Diff line number	Diff line change
`@@ -41,13 +41,13 @@ public function __construct(private ContainerInterface $container)`
`41`	`41`	`*`
`42`	`42`	`* @return false`
`43`	`43`	`*/`
`44`		`- public function isOptional()`
	`44`	`+ public function isOptional(): bool`
`45`	`45`	`{`
`46`	`46`	`return false;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/** @return string[] */`
`50`		`- public function warmUp(string $cacheDir, ?string $buildDir = null)`
	`50`	`+ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`51`	`51`	`{`
`52`	`52`	`// we need the directory no matter the hydrator cache generation strategy.`
`53`	`53`	`$collCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.persistent_collection_dir');`
Original file line number	Diff line number	Diff line change
`@@ -42,13 +42,13 @@ public function __construct(private ContainerInterface $container)`
`42`	`42`	`*`
`43`	`43`	`* @return false`
`44`	`44`	`*/`
`45`		`- public function isOptional()`
	`45`	`+ public function isOptional(): bool`
`46`	`46`	`{`
`47`	`47`	`return false;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/** @return string[] */`
`51`		`- public function warmUp(string $cacheDir, ?string $buildDir = null)`
	`51`	`+ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`52`	`52`	`{`
`53`	`53`	`// we need the directory no matter the proxy cache generation strategy.`
`54`	`54`	`$proxyCacheDir = (string) $this->container->getParameter('doctrine_mongodb.odm.proxy_dir');`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,12 @@`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Command to clear the metadata cache of the various cache drivers.`
	`14`	`+ *`
	`15`	`+ * @internal since 4.7`
`14`	`16`	`*/`
`15`	`17`	`class ClearMetadataCacheDoctrineODMCommand extends MetadataCommand`
`16`	`18`	`{`
`17`		`- /** @return void */`
`18`		`- protected function configure()`
	`19`	`+ protected function configure(): void`
`19`	`20`	`{`
`20`	`21`	`parent::configure();`
`21`	`22`
`@@ -35,8 +36,7 @@ protected function configure()`
`35`	`36`	`);`
`36`	`37`	`}`
`37`	`38`
`38`		`- /** @return int */`
`39`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`39`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`40`	`40`	`{`
`41`	`41`	`DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,12 @@`
`12`	`12`	`/**`
`13`	`13`	`* Command to create the database schema for a set of classes based on their`
`14`	`14`	`* mappings.`
	`15`	`+ *`
	`16`	`+ * @internal since 4.7`
`15`	`17`	`*/`
`16`	`18`	`class CreateSchemaDoctrineODMCommand extends CreateCommand`
`17`	`19`	`{`
`18`		`- /** @return void */`
`19`		`- protected function configure()`
	`20`	`+ protected function configure(): void`
`20`	`21`	`{`
`21`	`22`	`parent::configure();`
`22`	`23`
`@@ -35,8 +36,7 @@ protected function configure()`
`35`	`36`	`);`
`36`	`37`	`}`
`37`	`38`
`38`		`- /** @return int */`
`39`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`39`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`40`	`40`	`{`
`41`	`41`	`DoctrineODMCommand::setApplicationDocumentManager($this->getApplication(), $input->getOption('dm'));`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,12 @@`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* Show information about mapped documents`
	`20`	`+ *`
	`21`	`+ * @internal since 4.7`
`20`	`22`	`*/`
`21`	`23`	`class InfoDoctrineODMCommand extends DoctrineODMCommand`
`22`	`24`	`{`
`23`		`- /** @return void */`
`24`		`- protected function configure()`
	`25`	`+ protected function configure(): void`
`25`	`26`	`{`
`26`	`27`	`$this`
`27`	`28`	`->setName('doctrine:mongodb:mapping:info')`
`@@ -40,8 +41,7 @@ protected function configure()`
`40`	`41`	`);`
`41`	`42`	`}`
`42`	`43`
`43`		`- /** @return int */`
`44`		`- protected function execute(InputInterface $input, OutputInterface $output)`
	`44`	`+ protected function execute(InputInterface $input, OutputInterface $output): int`
`45`	`45`	`{`
`46`	`46`	`$documentManagerName = $input->hasOption('dm') ? $input->getOption('dm') : $this->getManagerRegistry()->getDefaultManagerName();`
`47`	`47`