Fix

Author: DanielBadura

composer.json

@@ -19,11 +19,12 @@
   ],
   "require": {
     "php": "~8.2.0 || ~8.3.0",
-    "patchlevel/event-sourcing": "^3.8.0",
+    "patchlevel/event-sourcing": "^3.9.0",
     "symfony/cache": "^6.4.0|^7.0.0",
     "symfony/config": "^6.4.0|^7.0.0",
     "symfony/console": "^6.4.1|^7.0.1",
     "symfony/dependency-injection": "^6.4.1|^7.0.1",
+    "symfony/event-dispatcher": "^6.4.1|^7.0.1",
     "symfony/finder": "^6.4.0|^7.0.0",
     "symfony/http-kernel": "^6.4.1|^7.0.1",
     "symfony/messenger": "^6.4.0|^7.0.0"

composer.lock

@@ -113,6 +113,7 @@
 use Patchlevel\EventSourcingBundle\EventBus\SymfonyEventBus;
 use Patchlevel\EventSourcingBundle\RequestListener\AutoSetupListener;
 use Patchlevel\EventSourcingBundle\RequestListener\SubscriptionRebuildAfterFileChangeListener;
+use Patchlevel\EventSourcingBundle\Subscription\ResetServicesListener;
 use Patchlevel\EventSourcingBundle\Subscription\StaticInMemorySubscriptionStoreFactory;
 use Patchlevel\EventSourcingBundle\ValueResolver\AggregateRootIdValueResolver;
 use Patchlevel\Hydrator\Cryptography\Cipher\Cipher;
@@ -126,6 +127,7 @@
 use Patchlevel\Hydrator\Metadata\AttributeMetadataFactory;
 use Patchlevel\Hydrator\Metadata\MetadataFactory;
 use Patchlevel\Hydrator\MetadataHydrator;
+use Patchlevel\Worker\Event\WorkerRunningEvent;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -375,6 +377,15 @@ static function (ChildDefinition $definition): void {
 
         $container->setAlias(SubscriptionEngine::class, DefaultSubscriptionEngine::class);
 
+        $container->register(ResetServicesListener::class)
+            ->setArguments([
+                new Reference('services_resetter'),
+            ])
+            ->addTag('kernel.event_listener', [
+                'event' => WorkerRunningEvent::class,
+                'method' => 'onWorkerRunningEvent',
+            ]);
+
         if ($config['subscription']['throw_on_error']['enabled']) {
             $container->register(ThrowOnErrorSubscriptionEngine::class)
                 ->setDecoratedService(SubscriptionEngine::class)
@@ -773,13 +784,15 @@ private function configureCommands(ContainerBuilder $container): void
         $container->register(SubscriptionBootCommand::class)
             ->setArguments([
                 new Reference(SubscriptionEngine::class),
+                new Reference('event_dispatcher', ContainerInterface::NULL_ON_INVALID_REFERENCE),
             ])
             ->addTag('console.command');
 
         $container->register(SubscriptionRunCommand::class)
             ->setArguments([
                 new Reference(SubscriptionEngine::class),
                 new Reference(Store::class),
+                new Reference('event_dispatcher', ContainerInterface::NULL_ON_INVALID_REFERENCE),
             ])
             ->addTag('console.command');
 

src/DependencyInjection/PatchlevelEventSourcingExtension.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchlevel\EventSourcingBundle\Subscription;
+
+use Patchlevel\Worker\Event\WorkerRunningEvent;
+use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
+
+final readonly class ResetServicesListener
+{
+    public function __construct(private ServicesResetter $servicesResetter)
+    {
+    }
+
+    public function onWorkerRunningEvent(WorkerRunningEvent $event): void
+    {
+        $this->servicesResetter->reset();
+    }
+}

src/Subscription/ResetServicesListener.php

@@ -73,6 +73,7 @@
 use Patchlevel\EventSourcingBundle\DependencyInjection\PatchlevelEventSourcingExtension;
 use Patchlevel\EventSourcingBundle\EventBus\SymfonyEventBus;
 use Patchlevel\EventSourcingBundle\PatchlevelEventSourcingBundle;
+use Patchlevel\EventSourcingBundle\Subscription\ResetServicesListener;
 use Patchlevel\EventSourcingBundle\Tests\Fixtures\CreateProfile;
 use Patchlevel\EventSourcingBundle\Tests\Fixtures\CustomHeader;
 use Patchlevel\EventSourcingBundle\Tests\Fixtures\DummyArgumentResolver;
@@ -99,6 +100,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\HttpKernel\DependencyInjection\ServicesResetter;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 final class PatchlevelEventSourcingBundleTest extends TestCase
@@ -1183,6 +1185,7 @@ public function testFullBuild(): void
         self::assertInstanceOf(RepositoryManager::class, $container->get(RepositoryManager::class));
         self::assertInstanceOf(EventRegistry::class, $container->get(EventRegistry::class));
         self::assertInstanceOf(DoctrineSubscriptionStore::class, $container->get(SubscriptionStore::class));
+        self::assertInstanceOf(ResetServicesListener::class, $container->get(ResetServicesListener::class));
     }
 
     public function testNamedRepository(): void
@@ -1221,6 +1224,7 @@ private function compileContainer(ContainerBuilder $container, array $config): v
         $container->set('event.bus', $this->prophesize(MessageBusInterface::class)->reveal());
         $container->set('cache.default', $this->prophesize(CacheItemPoolInterface::class)->reveal());
         $container->set('event_dispatcher', $this->prophesize(EventDispatcherInterface::class)->reveal());
+        $container->set('services_resetter', $this->prophesize(ServicesResetter::class)->reveal());
         $container->set(LoggerInterface::class, $this->prophesize(LoggerInterface::class)->reveal());
 
         $extension = new PatchlevelEventSourcingExtension();