Fixed middlewares override (#341)

DamienHarper · Dec 8, 2022 · d40333d · d40333d
1 parent 798f1bb
commit d40333d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 118 deletions.
diff --git a/src/DependencyInjection/Compiler/DoctrineProviderConfigurationCompilerPass.php b/src/DependencyInjection/Compiler/DoctrineProviderConfigurationCompilerPass.php
@@ -100,11 +100,13 @@ private function configureDHMiddleware(ContainerBuilder $container, string $enti
         if (!$container->hasDefinition($configurationName)) {
             return;
         }
-        $configuration = $container->getDefinition($configurationName);
-        $DHMiddlewareDef = $container->setDefinition(
-            $connectionName.'.dh_middleware',
-            new ChildDefinition('doctrine.dbal.dh_middleware')
-        );
-        $configuration->addMethodCall('setMiddlewares', [[$DHMiddlewareDef]]);
+
+        $container
+            ->setDefinition(
+                $connectionName.'.dh_middleware',
+                new ChildDefinition('doctrine.dbal.dh_middleware')
+            )
+            ->addTag('doctrine.middleware')
+        ;
     }
 }
diff --git a/tests/App/config/packages/doctrine.yaml b/tests/App/config/packages/doctrine.yaml
@@ -29,7 +29,7 @@ doctrine:
                 mappings:
                     App:
                         is_bundle: false
-                        type: annotation
+                        type: attribute
                         dir: '%kernel.project_dir%/../../vendor/damienharper/auditor/tests/Provider/Doctrine/Fixtures/Entity/Standard/Blog'
                         prefix: 'DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog'
                         alias: App

diff --git a/tests/DependencyInjection/Compiler/DoctrineMiddlewareCompilerPassTest.php b/tests/DependencyInjection/Compiler/DoctrineMiddlewareCompilerPassTest.php
diff --git a/tests/Fixtures/Resources/config/doctrine.yaml b/tests/Fixtures/Resources/config/doctrine.yaml
@@ -29,7 +29,7 @@ doctrine:
                 mappings:
                     App:
                         is_bundle: false
-                        type: annotation
+                        type: attribute
                         dir: '%kernel.project_dir%/vendor/damienharper/auditor/tests/Provider/Doctrine/Fixtures/Entity/Standard/Blog'
                         prefix: 'DH\Auditor\Tests\Provider\Doctrine\Fixtures\Entity\Standard\Blog'
                         alias: App