Move the commands to the Encryption namespace

Author: GromNaN

config/command.php

@@ -5,8 +5,8 @@
 use Doctrine\Bundle\MongoDBBundle\Command\ClearMetadataCacheDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\Command\CreateSchemaDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\Command\DropSchemaDoctrineODMCommand;
-use Doctrine\Bundle\MongoDBBundle\Command\EncryptionDiagnosticCommand;
-use Doctrine\Bundle\MongoDBBundle\Command\EncryptionDumpFieldsMapCommand;
+use Doctrine\Bundle\MongoDBBundle\Command\Encryption\DiagnosticCommand;
+use Doctrine\Bundle\MongoDBBundle\Command\Encryption\DumpFieldsMapCommand;
 use Doctrine\Bundle\MongoDBBundle\Command\GenerateHydratorsDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\Command\GenerateProxiesDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\Command\InfoDoctrineODMCommand;
@@ -24,11 +24,11 @@
         ->set('doctrine_mongodb.odm.command.clear_metadata_cache', ClearMetadataCacheDoctrineODMCommand::class)
             ->tag('console.command', ['command' => 'doctrine:mongodb:cache:clear-metadata'])
 
-        ->set('doctrine_mongodb.odm.command.connection_diagnostic', EncryptionDiagnosticCommand::class)
+        ->set('doctrine_mongodb.odm.command.encryption_diagnostic', DiagnosticCommand::class)
             ->tag('console.command', ['command' => 'doctrine:mongodb:encryption:diagnostic'])
             ->args([tagged_locator('doctrine_mongodb.connection_diagnostic', 'name')])
 
-        ->set('doctrine_mongodb.odm.command.dump_encrypted_fields_map', EncryptionDumpFieldsMapCommand::class)
+        ->set('doctrine_mongodb.odm.command.encryption_dump_fields_map', DumpFieldsMapCommand::class)
             ->tag('console.command', ['command' => 'doctrine:mongodb:encryption:dump-fields-map'])
             ->args([tagged_locator('doctrine_mongodb.odm.document_manager', 'name')])
 

src/Command/EncryptionDiagnosticCommand.php renamed to src/Command/Encryption/DiagnosticCommand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Bundle\MongoDBBundle\Command;
+namespace Doctrine\Bundle\MongoDBBundle\Command\Encryption;
 
 use Doctrine\Bundle\MongoDBBundle\DataCollector\ConnectionDiagnostic;
 use Doctrine\Bundle\MongoDBBundle\DataCollector\EncryptionDiagnostic;
@@ -25,7 +25,7 @@
     name: 'doctrine:mongodb:encryption:diagnostic',
     description: 'Diagnose MongoDB configuration and server capabilities for each connection.',
 )]
-final class EncryptionDiagnosticCommand extends Command
+final class DiagnosticCommand extends Command
 {
     /** @param ServiceProviderInterface<ConnectionDiagnostic> $diagnostics */
     public function __construct(

src/Command/EncryptionDumpFieldsMapCommand.php renamed to src/Command/Encryption/DumpFieldsMapCommand.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Bundle\MongoDBBundle\Command;
+namespace Doctrine\Bundle\MongoDBBundle\Command\Encryption;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\ClassMetadata;
@@ -32,7 +32,7 @@
     name: 'doctrine:mongodb:encryption:dump-fields-map',
     description: 'Dumps the encrypted fields map for all documents in the configured connections.',
 )]
-final class EncryptionDumpFieldsMapCommand extends Command
+final class DumpFieldsMapCommand extends Command
 {
     /** @param ServiceCollectionInterface<DocumentManager> $documentManagers */
     public function __construct(private readonly ServiceCollectionInterface $documentManagers)

tests/Command/ConnectionDiagnosticCommandTest.php renamed to tests/Command/Encryption/DiagnosticCommandTest.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Doctrine\Bundle\MongoDBBundle\Tests\Command;
+namespace Doctrine\Bundle\MongoDBBundle\Tests\Command\Encryption;
 
+use Doctrine\Bundle\MongoDBBundle\Tests\Command\CommandTestKernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
-final class ConnectionDiagnosticCommandTest extends KernelTestCase
+final class DiagnosticCommandTest extends KernelTestCase
 {
     public function testExecute(): void
     {