Replace Doctrine subscriber by listener

sources/Bundle/FeatureTogglesExtension.php

@@ -2,6 +2,7 @@
 
 namespace Trompette\FeatureToggles\Bundle;
 
+use Doctrine\ORM\Tools\ToolEvents;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
@@ -15,7 +16,7 @@
 use Trompette\FeatureToggles\FeatureDefinition;
 use Trompette\FeatureToggles\FeatureRegistry;
 use Trompette\FeatureToggles\OnOffStrategy\OnOff;
-use Trompette\FeatureToggles\ORM\SchemaSubscriber;
+use Trompette\FeatureToggles\ORM\SchemaConfigurationListener;
 use Trompette\FeatureToggles\PercentageStrategy\Percentage;
 use Trompette\FeatureToggles\ToggleRouter;
 use Trompette\FeatureToggles\ToggleRouterInterface;
@@ -31,7 +32,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->defineTogglingStrategies($config['doctrine_dbal_connection'], $container);
         $this->defineToggleRouter($container);
         $this->defineConsoleCommands($container);
-        $this->defineDoctrineEventSubscriber($container);
+        $this->defineDoctrineEventListener($container);
     }
 
     /**
@@ -118,14 +119,16 @@ private function defineConsoleCommands(ContainerBuilder $container): void
         ;
     }
 
-    private function defineDoctrineEventSubscriber(ContainerBuilder $container): void
+    private function defineDoctrineEventListener(ContainerBuilder $container): void
     {
-        $container
-            ->register(SchemaSubscriber::class, SchemaSubscriber::class)
-            ->addArgument(new Reference(OnOffStrategyConfigurationRepository::class))
-            ->addArgument(new Reference(WhitelistStrategyConfigurationRepository::class))
-            ->addArgument(new Reference(PercentageStrategyConfigurationRepository::class))
-            ->addTag('doctrine.event_subscriber')
-        ;
+        if (class_exists(ToolEvents::class)) {
+            $container
+                ->register(SchemaConfigurationListener::class, SchemaConfigurationListener::class)
+                ->addArgument(new Reference(OnOffStrategyConfigurationRepository::class))
+                ->addArgument(new Reference(WhitelistStrategyConfigurationRepository::class))
+                ->addArgument(new Reference(PercentageStrategyConfigurationRepository::class))
+                ->addTag('doctrine.event_listener', ['event' => ToolEvents::postGenerateSchema])
+            ;
+        }
     }
 }

sources/ORM/SchemaSubscriber.php → sources/ORM/SchemaConfigurationListener.php

@@ -2,12 +2,10 @@
 
 namespace Trompette\FeatureToggles\ORM;
 
-use Doctrine\Common\EventSubscriber;
 use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs;
-use Doctrine\ORM\Tools\ToolEvents;
 use Trompette\FeatureToggles\DBAL\SchemaConfigurator;
 
-final class SchemaSubscriber implements EventSubscriber
+final class SchemaConfigurationListener
 {
     /**
      * @var SchemaConfigurator[]
@@ -28,10 +26,4 @@ public function postGenerateSchema(GenerateSchemaEventArgs $eventArgs): void
             $configurator->configureSchema($schema, $connection);
         }
     }
-
-    public function getSubscribedEvents(): array
-    {
-        // subscribe to event only if Doctrine ORM is installed
-        return class_exists(ToolEvents::class) ? [ToolEvents::postGenerateSchema] : [];
-    }
 }

tests/ORM/SchemaSubscriberTest.php → tests/ORM/SchemaConfigurationListenerTest.php

@@ -2,6 +2,7 @@
 
 namespace Test\Trompette\FeatureToggles\ORM;
 
+use Doctrine\Common\EventManager;
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\ORM\EntityManagerInterface;
@@ -10,9 +11,9 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Trompette\FeatureToggles\DBAL\SchemaConfigurator;
-use Trompette\FeatureToggles\ORM\SchemaSubscriber;
+use Trompette\FeatureToggles\ORM\SchemaConfigurationListener;
 
-class SchemaSubscriberTest extends TestCase
+class SchemaConfigurationListenerTest extends TestCase
 {
     use ProphecyTrait;
 
@@ -21,15 +22,18 @@ public function testSchemaIsConfiguredAfterGeneration(): void
         $schema = new Schema();
         $connection = DriverManager::getConnection(['url' => 'sqlite:///:memory:']);
 
-        $configurator = $this->prophesize(SchemaConfigurator::class);
-        $configurator->configureSchema($schema, $connection)->shouldBeCalled();
-
-        $connection->getEventManager()->addEventSubscriber(new SchemaSubscriber($configurator->reveal()));
-
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $entityManager->getConnection()->willReturn($connection);
 
-        $connection->getEventManager()->dispatchEvent(
+        $configurator = $this->prophesize(SchemaConfigurator::class);
+        $configurator->configureSchema($schema, $connection)->shouldBeCalled();
+
+        $eventManager = new EventManager();
+        $eventManager->addEventListener(
+            ToolEvents::postGenerateSchema,
+            new SchemaConfigurationListener($configurator->reveal())
+        );
+        $eventManager->dispatchEvent(
             ToolEvents::postGenerateSchema,
             new GenerateSchemaEventArgs($entityManager->reveal(), $schema)
         );