Merge pull request #789 from patchlevel/3.13.x-merge-up-into-4.0.x

DanielBadura · web-flow · commit ce3769ae7de7 · 2025-11-21T13:41:39.000+01:00
merge up 3.13.x to 4.0.x
diff --git a/.github/workflows/backward-compatibility-check.yml b/.github/workflows/backward-compatibility-check.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -14,7 +14,7 @@ jobs:
     services:
       postgres:
         # Docker Hub image
-        image: "postgres:17.6"
+        image: "postgres:17.7"
         # Provide the password for postgres
         env:
           POSTGRES_PASSWORD: postgres
@@ -46,7 +46,7 @@ jobs:
           extensions: pdo_sqlite
 
       - name: "Checkout base"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.base_ref }}
 
@@ -58,7 +58,7 @@ jobs:
         run: "vendor/bin/phpbench run tests/Benchmark --progress=none --report=default --tag=base"
 
       - name: "Checkout"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           clean: false
 
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -26,7 +26,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/deptrac.yml b/.github/workflows/deptrac.yml
@@ -26,7 +26,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/docs-build-try.yml b/.github/workflows/docs-build-try.yml
@@ -11,7 +11,7 @@ jobs:
     name: Deploy docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -13,7 +13,7 @@ jobs:
     name: Deploy docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml
@@ -25,7 +25,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -49,7 +49,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
@@ -104,7 +104,7 @@ jobs:
 
       steps:
         - name: "Checkout"
-          uses: actions/checkout@v5
+          uses: actions/checkout@v6
 
         - name: "Install PHP"
           uses: "shivammathur/setup-php@2.35.5"
@@ -159,7 +159,7 @@ jobs:
 
       steps:
         - name: "Checkout"
-          uses: actions/checkout@v5
+          uses: actions/checkout@v6
 
         - name: "Install PHP"
           uses: "shivammathur/setup-php@2.35.5"
@@ -193,7 +193,7 @@ jobs:
 
       steps:
         - name: "Checkout"
-          uses: actions/checkout@v5
+          uses: actions/checkout@v6
 
         - name: "Install PHP"
           uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml
@@ -22,7 +22,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
               with:
                 fetch-depth: 0
 
diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml
@@ -26,7 +26,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -26,7 +26,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -26,7 +26,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/.github/workflows/release-on-milestone-closed-triggering-release-event.yml b/.github/workflows/release-on-milestone-closed-triggering-release-event.yml
@@ -18,7 +18,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Release"
               uses: "laminas/automatic-releases@v1"
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -37,7 +37,7 @@ jobs:
 
         steps:
             - name: "Checkout"
-              uses: actions/checkout@v5
+              uses: actions/checkout@v6
 
             - name: "Install PHP"
               uses: "shivammathur/setup-php@2.35.5"
diff --git a/baseline.xml b/baseline.xml
@@ -161,11 +161,6 @@
       <code><![CDATA[$streamName]]></code>
     </PropertyTypeCoercion>
   </file>
-  <file src="src/Store/InMemoryStore.php">
-    <MixedPropertyTypeCoercion>
-      <code><![CDATA[$this->messages]]></code>
-    </MixedPropertyTypeCoercion>
-  </file>
   <file src="src/Store/StreamDoctrineDbalStore.php">
     <DeprecatedMethod>
       <code><![CDATA[setPrimaryKey]]></code>
diff --git a/composer.lock b/composer.lock
diff --git a/deptrac.yaml b/deptrac.yaml
@@ -195,8 +195,6 @@ deptrac:
       - Identifier
       - MetadataAggregate
     Store:
-      - Aggregate
-      - Attribute
       - Clock
       - Message
       - Metadata
diff --git a/docs/pages/aggregate.md b/docs/pages/aggregate.md
@@ -561,7 +561,7 @@ final class Hotel extends BasicAggregateRoot
             throw new NoPlaceException($name);
         }
 
-        $this->recordThat(new RoomBocked($name));
+        $this->recordThat(new RoomBooked($name));
 
         if ($this->people !== self::SIZE) {
             return;
@@ -571,7 +571,7 @@ final class Hotel extends BasicAggregateRoot
     }
 
     #[Apply]
-    protected function applyRoomBocked(RoomBocked $event): void
+    protected function applyRoomBooked(RoomBooked $event): void
     {
         $this->people++;
     }
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,11 +1,11 @@
 mkdocs==1.6.1
 mike==2.1.3
-markdown==3.9
-mkdocs-material==9.6.20
+markdown==3.10
+mkdocs-material==9.7.0
 
 # Markdown extensions
 Pygments==2.19.2
-pymdown-extensions==10.16.1
+pymdown-extensions==10.17.1
 
 # MkDocs plugins
 mkdocs-material-extensions==1.3.1
diff --git a/src/Store/Header/IndexHeader.php b/src/Store/Header/IndexHeader.php
@@ -4,10 +4,7 @@
 
 namespace Patchlevel\EventSourcing\Store\Header;
 
-/**
- * @psalm-immutable
- * @experimental
- */
+/** @psalm-immutable */
 final class IndexHeader
 {
     /** @param positive-int $index */
diff --git a/src/Store/InMemoryStore.php b/src/Store/InMemoryStore.php
@@ -5,19 +5,28 @@
 namespace Patchlevel\EventSourcing\Store;
 
 use Closure;
+use Patchlevel\EventSourcing\Clock\SystemClock;
 use Patchlevel\EventSourcing\Message\HeaderNotFound;
 use Patchlevel\EventSourcing\Message\Message;
+use Patchlevel\EventSourcing\Metadata\Event\EventRegistry;
 use Patchlevel\EventSourcing\Store\Criteria\ArchivedCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\Criteria;
+use Patchlevel\EventSourcing\Store\Criteria\EventsCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromIndexCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\FromPlayheadCriterion;
 use Patchlevel\EventSourcing\Store\Criteria\StreamCriterion;
+use Patchlevel\EventSourcing\Store\Criteria\ToIndexCriterion;
+use Patchlevel\EventSourcing\Store\Header\EventIdHeader;
+use Patchlevel\EventSourcing\Store\Header\IndexHeader;
 use Patchlevel\EventSourcing\Store\Header\PlayheadHeader;
+use Patchlevel\EventSourcing\Store\Header\RecordedOnHeader;
 use Patchlevel\EventSourcing\Store\Header\StreamNameHeader;
+use Psr\Clock\ClockInterface;
+use Ramsey\Uuid\Uuid;
+use Throwable;
 
 use function array_filter;
 use function array_map;
-use function array_push;
 use function array_reverse;
 use function array_slice;
 use function array_unique;
@@ -32,10 +41,16 @@
 
 final class InMemoryStore implements Store
 {
-    /** @param array<positive-int|0, Message> $messages */
+    /** @var array<0|positive-int, Message> */
+    private array $messages = [];
+
+    /** @param list<Message> $messages */
     public function __construct(
-        private array $messages = [],
+        array $messages = [],
+        private readonly EventRegistry|null $eventRegistry = null,
+        private readonly ClockInterface $clock = new SystemClock(),
     ) {
+        $this->save(...$messages);
     }
 
     public function load(
@@ -68,7 +83,27 @@ public function count(Criteria|null $criteria = null): int
 
     public function save(Message ...$messages): void
     {
-        array_push($this->messages, ...$messages);
+        $this->transactional(function () use ($messages): void {
+            $count = count($this->messages);
+
+            foreach ($messages as $message) {
+                $count++;
+
+                if (!$message->hasHeader(IndexHeader::class)) {
+                    $message = $message->withHeader(new IndexHeader($count));
+                }
+
+                if (!$message->hasHeader(EventIdHeader::class)) {
+                    $message = $message->withHeader(new EventIdHeader(Uuid::uuid7()->toString()));
+                }
+
+                if (!$message->hasHeader(RecordedOnHeader::class)) {
+                    $message = $message->withHeader(new RecordedOnHeader($this->clock->now()));
+                }
+
+                $this->messages[] = $message;
+            }
+        });
     }
 
     /**
@@ -78,7 +113,14 @@ public function save(Message ...$messages): void
      */
     public function transactional(Closure $function): void
     {
-        $function();
+        $messages = $this->messages;
+        try {
+            $function();
+        } catch (Throwable $e) {
+            $this->messages = $messages;
+
+            throw $e;
+        }
     }
 
     /** @return list<string> */
@@ -127,9 +169,11 @@ private function filter(Criteria|null $criteria): array
             return $this->messages;
         }
 
+        $eventRegistry = $this->eventRegistry;
+
         return array_filter(
             $this->messages,
-            static function (Message $message, int $index) use ($criteria): bool {
+            static function (Message $message) use ($criteria, $eventRegistry): bool {
                 foreach ($criteria->all() as $criterion) {
                     switch ($criterion::class) {
                         case StreamCriterion::class:
@@ -187,7 +231,35 @@ static function (Message $message, int $index) use ($criteria): bool {
 
                             break;
                         case FromIndexCriterion::class:
-                            if ($index < $criterion->fromIndex) {
+                            try {
+                                $index = $message->header(IndexHeader::class)->index;
+                            } catch (HeaderNotFound) {
+                                return false;
+                            }
+
+                            if ($index <= $criterion->fromIndex) {
+                                return false;
+                            }
+
+                            break;
+                        case ToIndexCriterion::class:
+                            try {
+                                $index = $message->header(IndexHeader::class)->index;
+                            } catch (HeaderNotFound) {
+                                return false;
+                            }
+
+                            if ($index >= $criterion->toIndex) {
+                                return false;
+                            }
+
+                            break;
+                        case EventsCriterion::class:
+                            if ($eventRegistry === null) {
+                                throw new MissingEventRegistry($criterion::class);
+                            }
+
+                            if (!in_array($eventRegistry->eventName($message->event()::class), $criterion->events)) {
                                 return false;
                             }
 
diff --git a/src/Store/MissingEventRegistry.php b/src/Store/MissingEventRegistry.php
diff --git a/tests/Unit/Store/InMemoryStoreTest.php b/tests/Unit/Store/InMemoryStoreTest.php
diff --git a/tests/Unit/Subscription/Subscriber/ArgumentResolver/RecordedOnArgumentResolverTest.php b/tests/Unit/Subscription/Subscriber/ArgumentResolver/RecordedOnArgumentResolverTest.php
diff --git a/tools/composer.lock b/tools/composer.lock
