From f501d804967dc51a80dd4ce5c7f0ded150f4fc46 Mon Sep 17 00:00:00 2001
From: mamazu <14860264+mamazu@users.noreply.github.com>
Date: Wed, 29 Apr 2026 17:08:34 +0200
Subject: [PATCH 1/3] Disabling automapping and adding explicit entity config

---
 src/DependencyInjection/TaskExtension.php | 24 ++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/DependencyInjection/TaskExtension.php b/src/DependencyInjection/TaskExtension.php
index 1421b80..0e0c932 100644
--- a/src/DependencyInjection/TaskExtension.php
+++ b/src/DependencyInjection/TaskExtension.php
@@ -22,12 +22,34 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Task\Event\Events;
 use Task\TaskBundle\EventListener\DoctrineTaskExecutionListener;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 
 /**
  * Container extension for php-task library.
  */
-class TaskExtension extends Extension
+class TaskExtension extends Extension implements PrependExtensionInterface
 {
+    public function prepend(ContainerBuilder $container)
+    {
+        if ($container->hasExtension('doctrine')) {
+            $container->prependExtensionConfig(
+                'doctrine',
+                [
+                    'orm' => [
+                        'mappings' => [
+                            'TaskBundle' => [
+                                'type' => 'xml',
+                                'dir' => __DIR__ . '/../Resources/config/doctrine',
+                                'prefix' => 'Task\TaskBundle\Entity',
+                                'alias' => 'TaskBundle',
+                            ],
+                        ],
+                    ],
+                ]
+            );
+        }
+    }
+
     /**
      * {@inheritdoc}
      */

From 51db440613114c985f3c703a16246fe53213d2b0 Mon Sep 17 00:00:00 2001
From: mamazu <14860264+mamazu@users.noreply.github.com>
Date: Thu, 30 Apr 2026 10:26:00 +0200
Subject: [PATCH 2/3] Disable automapping

---
 tests/app/config/config.doctrine.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/app/config/config.doctrine.yml b/tests/app/config/config.doctrine.yml
index 6c79f2b..5f286a8 100644
--- a/tests/app/config/config.doctrine.yml
+++ b/tests/app/config/config.doctrine.yml
@@ -14,7 +14,7 @@ task:
 doctrine:
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
-        auto_mapping: true
+        auto_mapping: false
     dbal:
         driver: pdo_sqlite
         host: localhost

From a738f6be8f6274bd90e6e5ef3b80a80995ff268e Mon Sep 17 00:00:00 2001
From: Alexander Schranz <alexander@sulu.io>
Date: Tue, 19 May 2026 15:10:55 +0200
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Alexander Schranz <alexander@sulu.io>
---
 src/DependencyInjection/TaskExtension.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/DependencyInjection/TaskExtension.php b/src/DependencyInjection/TaskExtension.php
index 0e0c932..8f42697 100644
--- a/src/DependencyInjection/TaskExtension.php
+++ b/src/DependencyInjection/TaskExtension.php
@@ -31,7 +31,13 @@ class TaskExtension extends Extension implements PrependExtensionInterface
 {
     public function prepend(ContainerBuilder $container)
     {
-        if ($container->hasExtension('doctrine')) {
+        $configs = $container->getExtensionConfig($this->getAlias());
+        $configuration = $this->getConfiguration($configs, $container);
+        $resolvingBag = $container->getParameterBag();
+        $configs = $resolvingBag->resolveValue($configs);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        if ($container->hasExtension('doctrine') && 'doctrine' === $config['storage']) {
             $container->prependExtensionConfig(
                 'doctrine',
                 [