[SonataImportBundle] Normalize structure of code

composer.json

@@ -62,7 +62,8 @@
         "nesbot/carbon": "^2.0",
         "doctrine/mongodb-odm-bundle": "*",
         "fidry/cpu-core-counter": "^1.1",
-        "knplabs/doctrine-behaviors": "*"
+        "knplabs/doctrine-behaviors": "*",
+        "symfony/notifier": "^6.4.0"
     },
     "require-dev": {
         "ext-pcntl": "*",
@@ -121,7 +122,6 @@
         "scheb/2fa-email": "^6.0",
         "colinodell/psr-testlogger": "^1.1",
         "cweagans/composer-patches": "^1.7",
-        "symfony/notifier": "^6.4.0",
         "symfony/maker-bundle": "^1.58"
     },
     "replace": {

config/packages/draw_sonata_extra.yaml

@@ -27,6 +27,8 @@ draw_sonata_extra:
     default_field_priorities:
       createdAt: 0
 
+  notifier: true
+
   prevent_delete_extension:
     restrict_to_role: 'ROLE_SUPER_ADMIN'
 

config/services_test.yaml

@@ -1,2 +1,12 @@
 services:
+  _defaults:
+    autowire: true      # Automatically injects dependencies in your services.
+    autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
+
   scheb_two_factor.security.totp_authenticator: '@App\Security\TotpAuthenticatorMock'
+
+  Draw\Bundle\TesterBundle\PHPUnit\Extension\DeleteTemporaryEntity\TemporaryEntityCleanerInterface: '@Draw\Bundle\TesterBundle\PHPUnit\Extension\DeleteTemporaryEntity\BaseTemporaryEntityCleaner'
+
+  Draw\Bundle\TesterBundle\PHPUnit\Extension\DeleteTemporaryEntity\BaseTemporaryEntityCleaner:
+    class: Draw\Bundle\TesterBundle\PHPUnit\Extension\DeleteTemporaryEntity\BaseTemporaryEntityCleaner
+    public: true

packages/application/Tests/Configuration/DoctrineConfigurationRegistryTest.php

@@ -4,7 +4,6 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\UnitOfWork;
-use Doctrine\Persistence\ManagerRegistry;
 use Draw\Component\Application\Configuration\DoctrineConfigurationRegistry;
 use Draw\Component\Application\Configuration\Entity\Config;
 use Draw\Component\Core\Reflection\ReflectionAccessor;
@@ -41,73 +40,7 @@ public static function setUpBeforeClass(): void
 
     protected function setUp(): void
     {
-        $managerRegistry = new class(self::$entityManager) implements ManagerRegistry {
-            public function __construct(private EntityManagerInterface $entityManager)
-            {
-            }
-
-            public function getDefaultConnectionName()
-            {
-                return 'default';
-            }
-
-            public function getConnection($name = null)
-            {
-                return $this->entityManager->getConnection();
-            }
-
-            public function getConnections()
-            {
-                return ['default' => $this->getConnection()];
-            }
-
-            public function getConnectionNames()
-            {
-                return ['default' => 'default'];
-            }
-
-            public function getDefaultManagerName()
-            {
-                return 'default';
-            }
-
-            public function getManager($name = null)
-            {
-                return $this->entityManager;
-            }
-
-            public function getManagers()
-            {
-                return ['default' => $this->entityManager];
-            }
-
-            public function resetManager($name = null)
-            {
-                return $this->entityManager;
-            }
-
-            public function getAliasNamespace($alias)
-            {
-                return $alias;
-            }
-
-            public function getManagerNames()
-            {
-                return ['default' => 'manager.default'];
-            }
-
-            public function getRepository($persistentObject, $persistentManagerName = null)
-            {
-                return $this->entityManager->getRepository($persistentObject);
-            }
-
-            public function getManagerForClass($class)
-            {
-                return $this->entityManager;
-            }
-        };
-
-        $this->object = new DoctrineConfigurationRegistry($managerRegistry);
+        $this->object = new DoctrineConfigurationRegistry(static::createRegistry(self::$entityManager));
     }
 
     public function testConstruct(): void

packages/sonata-extra-bundle/DependencyInjection/Configuration.php

@@ -7,8 +7,6 @@
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Notifier\NotifierInterface;
 
 class Configuration implements ConfigurationInterface
 {
@@ -53,13 +51,8 @@ class_exists(PreObjectDeleteBatchEvent::class)
 
     private function createNotifierNode(): ArrayNodeDefinition
     {
-        $node = new ArrayNodeDefinition('notifier');
-
-        ContainerBuilder::willBeAvailable('symfony/notifier', NotifierInterface::class, [])
-            ? $node->canBeDisabled()
-            : $node->canBeEnabled();
-
-        return $node;
+        return (new ArrayNodeDefinition('notifier'))
+            ->canBeEnabled();
     }
 
     private function createPreventDeleteExtensionNode(): ArrayNodeDefinition

packages/sonata-import-bundle/Admin/ColumnAdmin.php

@@ -2,8 +2,8 @@
 
 namespace Draw\Bundle\SonataImportBundle\Admin;
 
-use Draw\Bundle\SonataImportBundle\Column\MappedToOptionBuilderAggregator;
 use Draw\Bundle\SonataImportBundle\Entity\Column;
+use Draw\Bundle\SonataImportBundle\Import\Importer;
 use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Form\FormMapper;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
@@ -25,7 +25,7 @@
 class ColumnAdmin extends AbstractAdmin
 {
     public function __construct(
-        private MappedToOptionBuilderAggregator $mappedToOptionBuilderAggregator
+        private Importer $importer
     ) {
         parent::__construct();
     }
@@ -64,7 +64,7 @@ protected function configureFormFields(FormMapper $form): void
 
     private function loadMappedToOptions(Column $column): array
     {
-        $options = $this->mappedToOptionBuilderAggregator->getOptions($column);
+        $options = $this->importer->getOptions($column);
 
         $result = [];
         // Iterate over each element in the original array