issue #155 - move Symfony integration into Bridge/Symfony subfolder

src/Bridge/Symfony/DbToolsBundle.php

@@ -0,0 +1,31 @@
+<?php
+
+declare (strict_types=1);
+
+namespace MakinaCorpus\DbToolsBundle\Bridge\Symfony;
+
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\Compiler\DbToolsPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\DbToolsExtension;
+
+class DbToolsBundle extends Bundle
+{
+    #[\Override]
+    public function build(ContainerBuilder $container): void
+    {
+        $container->addCompilerPass(new DbToolsPass());
+    }
+
+    /**
+     * Override is required for backward compatibility.
+     *
+     * Remove this method when MakinaCorpus\DbToolsBundle\DbToolsBundle legacy
+     * class will be removed.
+     */
+    #[\Override]
+    protected function getContainerExtensionClass(): string
+    {
+        return DbToolsExtension::class;
+    }
+}

src/DependencyInjection/Compiler/DbToolsPass.php → src/Bridge/Symfony/DependencyInjection/Compiler/DbToolsPass.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace MakinaCorpus\DbToolsBundle\DependencyInjection\Compiler;
+namespace MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\Compiler;
 
 use MakinaCorpus\DbToolsBundle\Anonymization\Config\Loader\AttributesLoader;
 use MakinaCorpus\DbToolsBundle\Anonymization\Config\Loader\YamlLoader;
-use MakinaCorpus\DbToolsBundle\DependencyInjection\DbToolsConfiguration;
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\DbToolsConfiguration;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/DependencyInjection/DbToolsConfiguration.php → src/Bridge/Symfony/DependencyInjection/DbToolsConfiguration.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MakinaCorpus\DbToolsBundle\DependencyInjection;
+namespace MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection;
 
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -45,6 +45,7 @@ public function getConfigTreeBuilder(): TreeBuilder
             throw throw new \InvalidArgumentException(\sprintf("Expected an int or valid date interval string value, got '%s'", \get_debug_type($v)));
         };
 
+        // @phpstan-ignore-next-line
         $treeBuilder
             ->getRootNode()
                 ->children()

src/DependencyInjection/DbToolsExtension.php → src/Bridge/Symfony/DependencyInjection/DbToolsExtension.php

@@ -2,17 +2,17 @@
 
 declare(strict_types=1);
 
-namespace MakinaCorpus\DbToolsBundle\DependencyInjection;
+namespace MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection;
 
 use MakinaCorpus\DbToolsBundle\Storage\FilenameStrategyInterface;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 final class DbToolsExtension extends Extension
 {
@@ -22,7 +22,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
 
-        $loader = new YamlFileLoader($container, new FileLocator(\dirname(__DIR__).'/../config'));
+        $loader = new YamlFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
         $loader->load('services.yaml');
 
         if (isset($config['storage_directory'])) {

src/DbToolsBundle.php

@@ -4,15 +4,27 @@
 
 namespace MakinaCorpus\DbToolsBundle;
 
-use MakinaCorpus\DbToolsBundle\DependencyInjection\Compiler\DbToolsPass;
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DbToolsBundle as TheRealBundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class DbToolsBundle extends Bundle
+/**
+ * @deprecated
+ *   This class is deprecated and will be remove in next major.
+ * @see \MakinaCorpus\DbToolsBundle\Bridge\Symfony\DbToolsBundle
+ */
+class DbToolsBundle extends TheRealBundle
 {
     #[\Override]
     public function build(ContainerBuilder $container): void
     {
-        $container->addCompilerPass(new DbToolsPass());
+        \trigger_deprecation(
+            'makinacorpus/db-tools-bundle',
+            '2.0.0',
+            "Class %s is deprecated and will be removed in next major version, please use %s instead.",
+            __CLASS__,
+            TheRealBundle::class,
+        );
+
+        parent::build($container);
     }
 }

src/Helper/Cli/StandaloneConfiguration.php

@@ -4,7 +4,7 @@
 
 namespace MakinaCorpus\DbToolsBundle\Helper\Cli;
 
-use MakinaCorpus\DbToolsBundle\DependencyInjection\DbToolsConfiguration;
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\DbToolsConfiguration;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 
 class StandaloneConfiguration extends DbToolsConfiguration

tests/Unit/DependencyInjection/DbToolsConfigurationTest.php → tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsConfigurationTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace MakinaCorpus\DbToolsBundle\Tests\Unit\DependencyInjection;
+namespace MakinaCorpus\DbToolsBundle\Tests\Unit\Bridge\Symfony\DependencyInjection;
 
-use MakinaCorpus\DbToolsBundle\DependencyInjection\DbToolsConfiguration;
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\DbToolsConfiguration;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Yaml\Yaml;

tests/Unit/DependencyInjection/DbToolsExtensionTest.php → tests/Unit/Bridge/Symfony/DependencyInjection/DbToolsExtensionTest.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace MakinaCorpus\DbToolsBundle\Tests\Unit\DependencyInjection;
+namespace MakinaCorpus\DbToolsBundle\Tests\Unit\Bridge\Symfony\DependencyInjection;
 
-use MakinaCorpus\DbToolsBundle\DependencyInjection\DbToolsExtension;
+use MakinaCorpus\DbToolsBundle\Bridge\Symfony\DependencyInjection\DbToolsExtension;
 use PHPUnit\Framework\Attributes\DependsExternal;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;