From c2f4c9c7fc5505ff8cd42a6c869eaedb39bca1ab Mon Sep 17 00:00:00 2001 From: Pierre Rineau Date: Mon, 27 May 2024 10:41:03 +0200 Subject: [PATCH] issue #155 - move standalone console tool into Bridge/Standalone subfolder --- bin/db-tools.php | 2 +- docs/content/configuration.md | 2 +- src/{Helper/Cli => Bridge/Standalone}/Bootstrap.php | 2 +- src/{Helper/Cli => Bridge/Standalone}/Context.php | 2 +- .../Cli => Bridge/Standalone}/StandaloneConfiguration.php | 2 +- src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php | 2 +- .../Anonymization/Anonymizer/AnonymizerRegistryTest.php | 6 +++--- .../DependencyInjection/DbToolsConfigurationTest.php | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) rename src/{Helper/Cli => Bridge/Standalone}/Bootstrap.php (99%) rename src/{Helper/Cli => Bridge/Standalone}/Context.php (95%) rename src/{Helper/Cli => Bridge/Standalone}/StandaloneConfiguration.php (97%) diff --git a/bin/db-tools.php b/bin/db-tools.php index ae253975..7c46cbcd 100644 --- a/bin/db-tools.php +++ b/bin/db-tools.php @@ -4,7 +4,7 @@ namespace MakinaCorpus\DbToolsBundle; -use MakinaCorpus\DbToolsBundle\Helper\Cli\Bootstrap; +use MakinaCorpus\DbToolsBundle\Bridge\Standalone\Bootstrap; (static function (): void { $autoloadFiles = [ diff --git a/docs/content/configuration.md b/docs/content/configuration.md index 637af9a0..c844ad26 100644 --- a/docs/content/configuration.md +++ b/docs/content/configuration.md @@ -8,7 +8,7 @@ A complete example of this file can be found in the bundle sources in: `vendor/m ::: For detailed information about configuration options, please see the -[configuration reference](../configuration/reference). +[configuration reference](configuration/reference). ## Backup configuration diff --git a/src/Helper/Cli/Bootstrap.php b/src/Bridge/Standalone/Bootstrap.php similarity index 99% rename from src/Helper/Cli/Bootstrap.php rename to src/Bridge/Standalone/Bootstrap.php index 002502ae..64c21b39 100644 --- a/src/Helper/Cli/Bootstrap.php +++ b/src/Bridge/Standalone/Bootstrap.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MakinaCorpus\DbToolsBundle\Helper\Cli; +namespace MakinaCorpus\DbToolsBundle\Bridge\Standalone; use Composer\InstalledVersions; use MakinaCorpus\DbToolsBundle\Anonymization\AnonymizatorFactory; diff --git a/src/Helper/Cli/Context.php b/src/Bridge/Standalone/Context.php similarity index 95% rename from src/Helper/Cli/Context.php rename to src/Bridge/Standalone/Context.php index c0276060..b02b177d 100644 --- a/src/Helper/Cli/Context.php +++ b/src/Bridge/Standalone/Context.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MakinaCorpus\DbToolsBundle\Helper\Cli; +namespace MakinaCorpus\DbToolsBundle\Bridge\Standalone; use MakinaCorpus\DbToolsBundle\Anonymization\AnonymizatorFactory; use MakinaCorpus\DbToolsBundle\Anonymization\Anonymizer\AnonymizerRegistry; diff --git a/src/Helper/Cli/StandaloneConfiguration.php b/src/Bridge/Standalone/StandaloneConfiguration.php similarity index 97% rename from src/Helper/Cli/StandaloneConfiguration.php rename to src/Bridge/Standalone/StandaloneConfiguration.php index 82cae956..cc07cd0c 100644 --- a/src/Helper/Cli/StandaloneConfiguration.php +++ b/src/Bridge/Standalone/StandaloneConfiguration.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MakinaCorpus\DbToolsBundle\Helper\Cli; +namespace MakinaCorpus\DbToolsBundle\Bridge\Standalone; use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\DbToolsConfiguration; use Symfony\Component\Config\Definition\Builder\TreeBuilder; diff --git a/src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php b/src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php index e8afb4b0..31ca20db 100644 --- a/src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php +++ b/src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php @@ -56,7 +56,7 @@ public function load(array $configs, ContainerBuilder $container): void if (\is_dir($defaultDirectory)) { $anonymizerPaths[] = '%kernel.project_dir%/src/Anonymizer'; } - $anonymizerPaths[] = \realpath(\dirname(__DIR__)) . '/Anonymization/Anonymizer'; + $anonymizerPaths[] = \realpath(\dirname(__DIR__, 3)) . '/Anonymization/Anonymizer'; $container->setParameter('db_tools.anonymization.anonymizer.paths', $anonymizerPaths); diff --git a/tests/Unit/Anonymization/Anonymizer/AnonymizerRegistryTest.php b/tests/Unit/Anonymization/Anonymizer/AnonymizerRegistryTest.php index abe516c9..00720226 100644 --- a/tests/Unit/Anonymization/Anonymizer/AnonymizerRegistryTest.php +++ b/tests/Unit/Anonymization/Anonymizer/AnonymizerRegistryTest.php @@ -14,7 +14,7 @@ public function testAnonymizerRegistryWithTestPack(): void { $projectDir = $this->prepareDumbProjectDir(); - $dbToolsBundleSrcPath = \dirname(\dirname(\dirname(\dirname(__DIR__)))) . '/src/'; + $dbToolsBundleSrcPath = \dirname(__DIR__, 4) . '/src/'; $anonymizerRegistry = new AnonymizerRegistry( $projectDir, @@ -37,7 +37,7 @@ public function testAnonymizerRegistryWithoutTestPack(): void { $projectDir = $this->prepareDumbProjectDir(false); - $dbToolsBundleSrcPath = \dirname(\dirname(\dirname(\dirname(__DIR__)))) . '/src/'; + $dbToolsBundleSrcPath = \dirname(__DIR__, 4) . '/src/'; $anonymizerRegistry = new AnonymizerRegistry( $projectDir, @@ -60,7 +60,7 @@ private function prepareDumbProjectDir(bool $withTestVendor = true): string $filesystem->mkdir($projectDir . '/vendor'); if ($withTestVendor) { - $filesystem->mirror(\dirname(\dirname(\dirname(__DIR__))) . '/Resources/vendor', $projectDir . '/vendor'); + $filesystem->mirror(\dirname(__DIR__, 3) . '/Resources/vendor', $projectDir . '/vendor'); } return $projectDir; diff --git a/tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsConfigurationTest.php b/tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsConfigurationTest.php index 2608a5dd..0d37e4ea 100644 --- a/tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsConfigurationTest.php +++ b/tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsConfigurationTest.php @@ -25,7 +25,7 @@ private function processYamlConfiguration(string $yamlFilename): array public function testConfigurationMinimal(): array { $result = $this->processYamlConfiguration( - __DIR__ . '/../../Resources/config/packages/db_tools_min.yaml' + \dirname(__DIR__, 4) . '/Resources/config/packages/db_tools_min.yaml' ); self::assertSame( @@ -61,7 +61,7 @@ public function testConfigurationMinimal(): array public function testConfigurationAlternative1(): array { $result = $this->processYamlConfiguration( - __DIR__ . '/../../Resources/config/packages/db_tools_alt1.yaml' + \dirname(__DIR__, 4) . '/Resources/config/packages/db_tools_alt1.yaml' ); self::assertSame( @@ -112,7 +112,7 @@ public function testConfigurationAlternative1(): array public function testConfigurationAlternative2(): array { $result = $this->processYamlConfiguration( - __DIR__ . '/../../Resources/config/packages/db_tools_alt2.yaml' + \dirname(__DIR__, 4) . '/Resources/config/packages/db_tools_alt2.yaml' ); self::assertSame(