use resource tags for aggregates & events

DavidBadura · DavidBadura · commit 40d265694f7e · 2025-12-10T14:30:24.000+01:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/DependencyInjection/AggregateCompilerPass.php b/src/DependencyInjection/AggregateCompilerPass.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcingBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/** @internal */
+final class AggregateCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $aggregates = [];
+        foreach ($container->findTaggedResourceIds('event_sourcing.aggregate') as $id => $tags) {
+            foreach ($tags as $tag) {
+                $aggregates[$tag['name']] = $id;
+            }
+        }
+
+        $container->setParameter('event_sourcing.aggregates', $aggregates);
+    }
+}
diff --git a/src/DependencyInjection/CommandHandlerCompilerPass.php b/src/DependencyInjection/CommandHandlerCompilerPass.php
@@ -7,7 +7,6 @@
 use Patchlevel\EventSourcing\CommandBus\Handler\CreateAggregateHandler;
 use Patchlevel\EventSourcing\CommandBus\Handler\UpdateAggregateHandler;
 use Patchlevel\EventSourcing\CommandBus\HandlerFinder;
-use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootRegistry;
 use Patchlevel\EventSourcing\Repository\RepositoryManager;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -27,10 +26,7 @@ public function process(ContainerBuilder $container): void
 
         $bus = $container->getParameter('patchlevel_event_sourcing.aggregate_handlers.bus');
 
-        /** @var AggregateRootRegistry $aggregateRootRegistry */
-        $aggregateRootRegistry = $container->get(AggregateRootRegistry::class);
-
-        foreach ($aggregateRootRegistry->aggregateClasses() as $aggregateName => $aggregateClass) {
+        foreach ($container->getParameter('event_sourcing.aggregates') as $aggregateName => $aggregateClass) {
             $parameterResolverId = sprintf('.event_sourcing.handler_parameter_resolver.%s', $aggregateName);
 
             foreach (HandlerFinder::findInClass($aggregateClass) as $aggregateHandler) {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -65,8 +65,6 @@
  *              translators: list<string>
  *          }
  *      },
- *      aggregates: list<string>,
- *      events: list<string>,
  *      headers: list<string>,
  *      snapshot_stores: array<string, array{type: string, service: string}>,
  *      migration: array{path: string, namespace: string},
@@ -143,18 +141,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->end()
             ->end()
 
-            ->arrayNode('events')
-                ->beforeNormalization()->castToArray()->end()
-                ->defaultValue([])
-                ->scalarPrototype()->end()
-            ->end()
-
-            ->arrayNode('aggregates')
-                ->beforeNormalization()->castToArray()->end()
-                ->defaultValue([])
-                ->scalarPrototype()->end()
-            ->end()
-
             ->arrayNode('headers')
                 ->beforeNormalization()->castToArray()->end()
                 ->defaultValue([])
diff --git a/src/DependencyInjection/EventCompilerPass.php b/src/DependencyInjection/EventCompilerPass.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcingBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/** @internal */
+final class EventCompilerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        $events = [];
+        foreach ($container->findTaggedResourceIds('event_sourcing.event') as $id => $tags) {
+            foreach ($tags as $tag) {
+                $events[$tag['name']] = $id;
+            }
+        }
+
+        $container->setParameter('event_sourcing.events', $events);
+    }
+}
diff --git a/src/DependencyInjection/HandlerServiceLocatorCompilerPass.php b/src/DependencyInjection/HandlerServiceLocatorCompilerPass.php
@@ -7,7 +7,6 @@
 use Patchlevel\EventSourcing\Attribute\Inject;
 use Patchlevel\EventSourcing\CommandBus\Handler\ServiceNotResolvable;
 use Patchlevel\EventSourcing\CommandBus\HandlerFinder;
-use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootRegistry;
 use Patchlevel\EventSourcingBundle\CommandBus\SymfonyParameterResolver;
 use Psr\Container\ContainerInterface;
 use ReflectionAttribute;
@@ -32,10 +31,7 @@ public function process(ContainerBuilder $container): void
             return;
         }
 
-        /** @var AggregateRootRegistry $aggregateRootRegistry */
-        $aggregateRootRegistry = $container->get(AggregateRootRegistry::class);
-
-        foreach ($aggregateRootRegistry->aggregateClasses() as $aggregateName => $aggregateClass) {
+        foreach ($container->getParameter('event_sourcing.aggregates') as $aggregateName => $aggregateClass) {
             $parameterResolverId = sprintf('.event_sourcing.handler_parameter_resolver.%s', $aggregateName);
             $services = [];
 
diff --git a/src/DependencyInjection/PatchlevelEventSourcingExtension.php b/src/DependencyInjection/PatchlevelEventSourcingExtension.php
@@ -61,9 +61,7 @@
 use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootMetadataAwareMetadataFactory;
 use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootMetadataFactory;
 use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootRegistry;
-use Patchlevel\EventSourcing\Metadata\AggregateRoot\AttributeAggregateRootRegistryFactory;
 use Patchlevel\EventSourcing\Metadata\Event\AttributeEventMetadataFactory;
-use Patchlevel\EventSourcing\Metadata\Event\AttributeEventRegistryFactory;
 use Patchlevel\EventSourcing\Metadata\Event\EventMetadataFactory;
 use Patchlevel\EventSourcing\Metadata\Event\EventRegistry;
 use Patchlevel\EventSourcing\Metadata\Message\AttributeMessageHeaderRegistryFactory;
@@ -153,6 +151,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Parameter;
 use Symfony\Component\DependencyInjection\Reference;
 
 use function class_exists;
@@ -164,8 +163,6 @@ final class PatchlevelEventSourcingExtension extends Extension
     /** @param array<array-key, mixed> $configs */
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $this->removeNonServices($container);
-
         $configuration = new Configuration();
 
         /** @var Config $config */
@@ -185,7 +182,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $this->configureConnection($config, $container);
         $this->configureStore($config, $container);
         $this->configureSnapshots($config, $container);
-        $this->configureAggregates($config, $container);
+        $this->configureAggregates($container);
         $this->configureCommands($container);
         $this->configureProfiler($container);
         $this->configureClock($config, $container);
@@ -202,11 +199,17 @@ public function load(array $configs, ContainerBuilder $container): void
     /** @param Config $config */
     private function configureSerializer(array $config, ContainerBuilder $container): void
     {
-        $container->register(AttributeEventRegistryFactory::class);
+        $container->registerAttributeForAutoconfiguration(
+            Event::class,
+            static function (ChildDefinition $definition, Event $attribute): void {
+                $definition->addResourceTag('event_sourcing.event', ['name' => $attribute->name]);
+            },
+        );
+
+        $container->setParameter('event_sourcing.events', []);
 
         $container->register(EventRegistry::class)
-            ->setFactory([new Reference(AttributeEventRegistryFactory::class), 'create'])
-            ->setArguments([$config['events']]);
+            ->setArguments([new Parameter('event_sourcing.events')]);
 
         $container->register(AttributeEventMetadataFactory::class);
         $container->setAlias(EventMetadataFactory::class, AttributeEventMetadataFactory::class);
@@ -879,17 +882,22 @@ private function configureSnapshots(array $config, ContainerBuilder $container):
         $container->setAlias(SnapshotStore::class, DefaultSnapshotStore::class);
     }
 
-    /** @param Config $config */
-    private function configureAggregates(array $config, ContainerBuilder $container): void
+    private function configureAggregates(ContainerBuilder $container): void
     {
+        $container->registerAttributeForAutoconfiguration(
+            Aggregate::class,
+            static function (ChildDefinition $definition, Aggregate $attribute): void {
+                $definition->addResourceTag('event_sourcing.aggregate', ['name' => $attribute->name]);
+            },
+        );
+
         $container->register(AggregateRootMetadataAwareMetadataFactory::class);
         $container->setAlias(AggregateRootMetadataFactory::class, AggregateRootMetadataAwareMetadataFactory::class);
 
-        $container->register(AttributeAggregateRootRegistryFactory::class);
+        $container->setParameter('event_sourcing.aggregates', []);
 
         $container->register(AggregateRootRegistry::class)
-            ->setFactory([new Reference(AttributeAggregateRootRegistryFactory::class), 'create'])
-            ->setArguments([$config['aggregates']]);
+            ->setArguments([new Parameter('event_sourcing.aggregates')]);
 
         $container->register(DefaultRepositoryManager::class)
             ->setArguments([
@@ -1221,26 +1229,4 @@ private function configureValueResolver(ContainerBuilder $container): void
         $container->register(IdentifierValueResolver::class)
             ->addTag('controller.argument_value_resolver', ['priority' => 200]);
     }
-
-    private function removeNonServices(ContainerBuilder $container): void
-    {
-        $container->registerAttributeForAutoconfiguration(
-            Aggregate::class,
-            static function (ChildDefinition $definition): void {
-                $definition->setAbstract(true)->addTag(
-                    'container.excluded',
-                    ['source' => sprintf('with #[%s] attribute', Aggregate::class)],
-                );
-            },
-        );
-        $container->registerAttributeForAutoconfiguration(
-            Event::class,
-            static function (ChildDefinition $definition): void {
-                $definition->setAbstract(true)->addTag(
-                    'container.excluded',
-                    ['source' => sprintf('with #[%s] attribute', Event::class)],
-                );
-            },
-        );
-    }
 }
diff --git a/src/DependencyInjection/RepositoryCompilerPass.php b/src/DependencyInjection/RepositoryCompilerPass.php
@@ -4,12 +4,10 @@
 
 namespace Patchlevel\EventSourcingBundle\DependencyInjection;
 
-use Patchlevel\EventSourcing\Metadata\AggregateRoot\AggregateRootRegistry;
 use Patchlevel\EventSourcing\Repository\Repository;
 use Patchlevel\EventSourcing\Repository\RepositoryManager;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
@@ -18,20 +16,14 @@ final class RepositoryCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
-        $aggregateRootRegistry = $container->get(AggregateRootRegistry::class, ContainerInterface::NULL_ON_INVALID_REFERENCE);
-
-        if (!$aggregateRootRegistry instanceof AggregateRootRegistry) {
-            return;
-        }
-
-        foreach ($aggregateRootRegistry->aggregateNames() as $aggregateName) {
+        foreach ($container->getParameter('event_sourcing.aggregates') as $aggregateName => $aggregateClass) {
             $aggregateRepositoryName = $aggregateName . 'Repository';
             $aggregateRepositoryId = 'event_sourcing.' . $aggregateName . '.repository';
 
             $definition = new Definition(Repository::class);
             $definition->setPublic(false);
             $definition->setFactory([new Reference(RepositoryManager::class), 'get']);
-            $definition->setArgument(0, $aggregateRootRegistry->aggregateClass($aggregateName));
+            $definition->setArgument(0, $aggregateClass);
 
             $container->setDefinition($aggregateRepositoryId, $definition);
             $container->registerAliasForArgument($aggregateRepositoryId, Repository::class, $aggregateRepositoryName)->setPublic(false);
diff --git a/src/PatchlevelEventSourcingBundle.php b/src/PatchlevelEventSourcingBundle.php
@@ -4,7 +4,9 @@
 
 namespace Patchlevel\EventSourcingBundle;
 
+use Patchlevel\EventSourcingBundle\DependencyInjection\AggregateCompilerPass;
 use Patchlevel\EventSourcingBundle\DependencyInjection\CommandHandlerCompilerPass;
+use Patchlevel\EventSourcingBundle\DependencyInjection\EventCompilerPass;
 use Patchlevel\EventSourcingBundle\DependencyInjection\HandlerServiceLocatorCompilerPass;
 use Patchlevel\EventSourcingBundle\DependencyInjection\QueryHandlerCompilerPass;
 use Patchlevel\EventSourcingBundle\DependencyInjection\RepositoryCompilerPass;
@@ -17,6 +19,8 @@ final class PatchlevelEventSourcingBundle extends Bundle
 {
     public function build(ContainerBuilder $container): void
     {
+        $container->addCompilerPass(new AggregateCompilerPass(), priority: 100);
+        $container->addCompilerPass(new EventCompilerPass(), priority: 100);
         $container->addCompilerPass(new RepositoryCompilerPass());
         $container->addCompilerPass(new SubscriberGuardCompilePass());
         $container->addCompilerPass(new CommandHandlerCompilerPass(), priority: 100);
diff --git a/tests/Unit/PatchlevelEventSourcingBundleTest.php b/tests/Unit/PatchlevelEventSourcingBundleTest.php
