Updating Event Store dependency, fixing bugs

composer.json

@@ -12,15 +12,15 @@
     ],
     "require": {
         "php": "^8.2",
-        "phauthentic/event-store": "dev-master",
+        "phauthentic/event-store": "^1.0@beta",
         "phauthentic/snapshot-store": "dev-master"
     },
     "require-dev": {
         "ext-pdo": "*",
         "infection/infection": "^0.29.6",
         "phpmd/phpmd": "^2.15",
         "phpro/grumphp-shim": "^2.5",
-        "phpstan/phpstan": "^1.10",
+        "phpstan/phpstan": "^1.11",
         "phpunit/phpunit": "^9.6",
         "psr/container": "^1.0||^2.0",
         "psr/log": "^2.0||^3.0",

phpstan.neon

@@ -1,5 +1,8 @@
 parameters:
     level: 8
+    ignoreErrors:
+        - identifier: missingType.generics
     paths:
         - src
-    checkGenericClassInNonGenericObjectType: false
+    parallel:
+        maximumNumberOfProcesses: 4

src/Repository/AggregateExtractor/ReflectionBasedExtractor.php

@@ -5,6 +5,7 @@
 namespace Phauthentic\EventSourcing\Repository\AggregateExtractor;
 
 use DateTimeImmutable;
+use Phauthentic\EventSourcing\DomainEvent\AggregateIdentityProvidingEventInterface;
 use Phauthentic\EventSourcing\Repository\AggregateData;
 use Phauthentic\EventSourcing\Repository\AggregateDataInterface;
 use Phauthentic\EventSourcing\Repository\AggregateExtractor\Exception\ExtractorException;
@@ -61,6 +62,7 @@ protected function assertNotEmpty(mixed $value, string $name): void
     }
 
     /**
+     * @param ReflectionClass<object> $reflectionClass
      * @throws \Phauthentic\EventSourcing\Repository\AggregateExtractor\Exception\ExtractorException
      */
     protected function assertAggregateProperties(ReflectionClass $reflectionClass): void
@@ -71,7 +73,7 @@ protected function assertAggregateProperties(ReflectionClass $reflectionClass):
     }
 
     /**
-     * @param ReflectionClass $reflectionClass
+     * @param ReflectionClass<object> $reflectionClass
      * @param string $propertyName
      * @param object $object
      * @return mixed

src/Repository/EventSourcedRepository.php

@@ -12,6 +12,7 @@
 use Phauthentic\EventStore\EventFactoryInterface;
 use Phauthentic\EventStore\EventInterface;
 use Phauthentic\EventStore\EventStoreInterface;
+use Phauthentic\EventStore\ReplyFromPositionQuery;
 use Phauthentic\SnapshotStore\SnapshotFactoryInterface;
 use Phauthentic\SnapshotStore\SnapshotInterface;
 use Phauthentic\SnapshotStore\Store\SnapshotStoreInterface;
@@ -26,7 +27,7 @@
  * - An aggregate extractor that extracts all relevant data from the aggregate object.
  * - A snapshot store that can take serialized snapshots of aggregate objects.
  * - An event publisher that is a wrapper to connect the aggregate with whatever
- *   event system you are using. Just wrap with a class implementing the EventPublisherInterface
+ *   event system you are using. Just wrap with a class implementing the EventPublisherInterface.
  */
 readonly class EventSourcedRepository implements EventSourcedRepositoryInterface
 {
@@ -122,7 +123,10 @@ public function restore(string $aggregateId, string $aggregateType): object
             }
         }
 
-        $events = $this->eventStore->replyFromPosition($aggregateId, $position);
+        $events = $this->eventStore->replyFromPosition(new ReplyFromPositionQuery(
+            aggregateId: $aggregateId,
+            position: $position + 1
+        ));
 
         return $this->aggregateFactory->reconstituteFromEvents($aggregate, $events);
     }

tests/Repository/EventSourcedRepositoryIntegrationTest.php

@@ -115,15 +115,11 @@ private function assertAggregateState(
         $this->assertSame($expectedDomainEventCount, $invoice->getDomainEventCount());
         $this->assertSame($expectedAggregateVersion, $invoice->getAggregateVersion());
         $this->assertSame($expectedLineItemCount, $invoice->lineItemCount());
-
-        //var_dump($this->snapshotStore);
     }
 
-    public function testEventSourcedRepositoryIntegration(): void
+    private function persistAndRestoreTheAggregateFirstTime(Invoice $invoice): Invoice
     {
-        $invoice = $this->createInvoice();
-
-        // Act: Restore teh aggregate
+        // Act: Restore the aggregate
         $this->repository->persist($invoice);
 
         $this->assertAggregateState(
@@ -133,7 +129,6 @@ public function testEventSourcedRepositoryIntegration(): void
             expectedLineItemCount: 1
         );
 
-        //dd($this->eventStore);
         // Act: Restore the aggregate
         $invoice = $this->repository->restore($this->aggregateId, Invoice::class);
 
@@ -145,6 +140,11 @@ public function testEventSourcedRepositoryIntegration(): void
             expectedLineItemCount: 1
         );
 
+        return $invoice;
+    }
+
+    private function addLineItemAndAssertAggregateState(Invoice $invoice): Invoice
+    {
         // Act: Add one more line
         $invoice->addLineItem(LineItem::create(
             sku: '456',
@@ -160,6 +160,11 @@ public function testEventSourcedRepositoryIntegration(): void
             expectedLineItemCount: 2
         );
 
+        return $invoice;
+    }
+
+    private function persistAndRestoreAggregateSecondTime(Invoice $invoice): Invoice
+    {
         // Act: Persist the aggregate and restore it
         $this->repository->persist($invoice);
         $invoice = $this->repository->restore($this->aggregateId, Invoice::class);
@@ -172,6 +177,11 @@ public function testEventSourcedRepositoryIntegration(): void
             expectedLineItemCount: 2
         );
 
+        return $invoice;
+    }
+
+    private function flagInvoiceAsPaidAndAssertState(Invoice $invoice): Invoice
+    {
         // Act: Flag as Paid
         $invoice->flagAsPaid();
 
@@ -183,6 +193,11 @@ public function testEventSourcedRepositoryIntegration(): void
             expectedLineItemCount: 2
         );
 
+        return $invoice;
+    }
+
+    private function persistAndRestoreAggregateThirdTime(Invoice $invoice): Invoice
+    {
         // Act: Persist and restore the aggregate
         $this->repository->persist($invoice);
         $invoice = $this->repository->restore($this->aggregateId, Invoice::class);
@@ -193,5 +208,17 @@ public function testEventSourcedRepositoryIntegration(): void
             expectedAggregateVersion: 4,
             expectedLineItemCount: 2
         );
+
+        return $invoice;
+    }
+
+    public function testEventSourcedRepositoryIntegration(): void
+    {
+        $invoice = $this->createInvoice();
+        $invoice = $this->persistAndRestoreTheAggregateFirstTime($invoice);
+        $invoice = $this->addLineItemAndAssertAggregateState($invoice);
+        $invoice = $this->persistAndRestoreAggregateSecondTime($invoice);
+        $invoice = $this->flagInvoiceAsPaidAndAssertState($invoice);
+        $this->persistAndRestoreAggregateThirdTime($invoice);
     }
 }