fixes

Author: dgafka

packages/Ecotone/src/Test/StaticPsrClock.php

@@ -14,17 +14,19 @@
  */
 final class StaticPsrClock implements ClockInterface, SleepInterface
 {
-    private DateTimeImmutable $currentTime;
+    private ?DateTimeImmutable $frozenTime = null;
     private bool $hasBeenChanged = false;
 
     public function __construct(?string $now = null)
     {
-        $this->currentTime = $now === null ? new DateTimeImmutable() : new DateTimeImmutable($now);
+        if ($now !== null) {
+            $this->frozenTime = new DateTimeImmutable($now);
+        }
     }
 
     public function now(): DateTimeImmutable
     {
-        return $this->currentTime;
+        return $this->frozenTime ?? new DateTimeImmutable();
     }
 
     public function sleep(Duration $duration): void
@@ -33,7 +35,8 @@ public function sleep(Duration $duration): void
             return;
         }
 
-        $this->currentTime = $this->currentTime->modify("+{$duration->inMicroseconds()} microseconds");
+        $this->frozenTime = $this->now()->modify("+{$duration->inMicroseconds()} microseconds");
+        $this->hasBeenChanged = true;
     }
 
     public function hasBeenChanged(): bool
@@ -43,7 +46,7 @@ public function hasBeenChanged(): bool
 
     public function setCurrentTime(DateTimeImmutable $time): void
     {
-        $this->currentTime = $time;
+        $this->frozenTime = $time;
         $this->hasBeenChanged = true;
     }
 }

packages/Ecotone/tests/Messaging/Integration/Scheduling/DelayedMessageAgainstGlobalClockTest.php

@@ -163,4 +163,35 @@ public function test_change_time_throws_exception_when_moving_backwards_after_fi
 
         $ecotoneTestSupport->changeTime(new \DateTimeImmutable('2025-08-11 16:30:00'));
     }
+
+    public function test_time_advances_before_change_time_is_called(): void
+    {
+        $clock = new StaticPsrClock();
+
+        $time1 = $clock->now();
+        usleep(1000);
+        $time2 = $clock->now();
+
+        $this->assertGreaterThan($time1, $time2);
+    }
+
+    public function test_time_freezes_after_change_time_with_duration(): void
+    {
+        $ecotoneTestSupport = EcotoneLite::bootstrapFlowTesting(
+            [OrderService::class, NotificationService::class, CustomNotifier::class],
+            [ClockInterface::class => new StaticPsrClock(), new OrderService(), new NotificationService(), new CustomNotifier()],
+            enableAsynchronousProcessing: [
+                SimpleMessageChannelBuilder::createQueueChannel('notifications', true),
+            ]
+        );
+
+        $ecotoneTestSupport->changeTime(Duration::seconds(1));
+
+        $clock = $ecotoneTestSupport->getServiceFromContainer(ClockInterface::class);
+        $time1 = $clock->now();
+        usleep(1000);
+        $time2 = $clock->now();
+
+        $this->assertEquals($time1, $time2);
+    }
 }