support psr clock

DavidBadura · DavidBadura · commit a0bb501cf88c · 2022-12-16T23:47:26.000+01:00
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -67,6 +67,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->addDefaultsIfNotSet()
                 ->children()
                     ->scalarNode('freeze')->defaultNull()->end()
+                    ->booleanNode('psr')->defaultFalse()->end()
                 ->end()
             ->end()
 
diff --git a/src/DependencyInjection/PatchlevelEventSourcingExtension.php b/src/DependencyInjection/PatchlevelEventSourcingExtension.php
@@ -96,6 +96,7 @@
 use Patchlevel\EventSourcing\WatchServer\WatchServerClient;
 use Patchlevel\EventSourcingBundle\DataCollector\EventSourcingCollector;
 use Patchlevel\EventSourcingBundle\DataCollector\MessageListener;
+use Psr\Clock\ClockInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -117,7 +118,7 @@
  *     events: list<string>,
  *     snapshot_stores: array<string, array{type: string, service: string}>,
  *     migration: array{path: string, namespace: string},
- *     clock: array{freeze: ?string}
+ *     clock: array{freeze: ?string, psr: bool}
  * }
  */
 final class PatchlevelEventSourcingExtension extends Extension
@@ -352,7 +353,7 @@ private function configureUpcaster(ContainerBuilder $container): void
     private function configureMessageDecorator(ContainerBuilder $container): void
     {
         $container->register(RecordedOnDecorator::class)
-            ->setArguments([new Reference(Clock::class)])
+            ->setArguments([new Reference('event_sourcing.clock')])
             ->addTag('event_sourcing.message_decorator');
 
         $container->registerForAutoconfiguration(MessageDecorator::class)
@@ -643,17 +644,23 @@ private function configureProfiler(ContainerBuilder $container): void
      */
     private function configureClock(array $config, ContainerBuilder $container): void
     {
+        if ($config['clock']['psr']) {
+            $container->setAlias('event_sourcing.clock', ClockInterface::class);
+
+            return;
+        }
+
         if ($config['clock']['freeze'] === null) {
             $container->register(SystemClock::class);
             $container->setAlias(Clock::class, SystemClock::class);
+        } else {
+            $container->register(FrozenClock::class)
+                ->setArguments([new DateTimeImmutable($config['clock']['freeze'])]);
 
-            return;
+            $container->setAlias(Clock::class, FrozenClock::class);
         }
 
-        $container->register(FrozenClock::class)
-            ->setArguments([new DateTimeImmutable($config['clock']['freeze'])]);
-
-        $container->setAlias(Clock::class, FrozenClock::class);
+        $container->setAlias('event_sourcing.clock', Clock::class);
     }
 
     /**
diff --git a/tests/Unit/PatchlevelEventSourcingBundleTest.php b/tests/Unit/PatchlevelEventSourcingBundleTest.php
@@ -58,6 +58,7 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Cache\CacheItemPoolInterface;
+use Psr\Clock\ClockInterface;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
@@ -573,6 +574,25 @@ public function testMigrations()
         self::assertInstanceOf(StatusCommand::class, $container->get('event_sourcing.command.migration_status'));
     }
 
+    public function testDefaultClock()
+    {
+        $container = new ContainerBuilder();
+
+        $this->compileContainer(
+            $container,
+            [
+                'patchlevel_event_sourcing' => [
+                    'connection' => [
+                        'service' => 'doctrine.dbal.eventstore_connection',
+                    ],
+                ],
+            ]
+        );
+
+        self::assertInstanceOf(SystemClock::class, $container->get(Clock::class));
+        self::assertInstanceOf(SystemClock::class, $container->get('event_sourcing.clock'));
+    }
+
     public function testFrozenClock()
     {
         $container = new ContainerBuilder();
@@ -594,9 +614,34 @@ public function testFrozenClock()
         $clock = $container->get(Clock::class);
 
         self::assertInstanceOf(FrozenClock::class, $clock);
+        self::assertInstanceOf(FrozenClock::class, $container->get('event_sourcing.clock'));
         self::assertSame('2020-01-01 22:00:00', $clock->now()->format('Y-m-d H:i:s'));
     }
 
+    public function testPsrClock()
+    {
+        $psrClock = $this->prophesize(ClockInterface::class)->reveal();
+
+        $container = new ContainerBuilder();
+        $container->set(ClockInterface::class, $psrClock);
+
+        $this->compileContainer(
+            $container,
+            [
+                'patchlevel_event_sourcing' => [
+                    'connection' => [
+                        'service' => 'doctrine.dbal.eventstore_connection',
+                    ],
+                    'clock' => [
+                        'psr' => true,
+                    ],
+                ],
+            ]
+        );
+
+        self::assertInstanceOf(ClockInterface::class, $container->get('event_sourcing.clock'));
+    }
+
     public function testProjectionist()
     {
         $container = new ContainerBuilder();
