Merge StreamStore into Store interface

docs/pages/UPGRADE-4.0.md

@@ -64,6 +64,10 @@ $subscriptionEngine = new DefaultSubscriptionEngine(
 
 ## Store
 
+### StreamStore
+
+`StreamStore` interface was merged with `Store` interface.
+
 ### DoctrineDbalStore
 
 `DoctrineDbalStore` has been removed in favor of `StreamDoctrineDbalStore`.
@@ -73,7 +77,10 @@ And all the associated classes:
 * `Patchlevel\EventSourcing\Store\Criteria\AggregateIdCriterion`
 * `Patchlevel\EventSourcing\Store\DoctrineDbalStore`
 * `Patchlevel\EventSourcing\Store\DoctrineDbalStoreStream`
-* `Patchlevel\EventSourcing\Store\ReadOnlyStore`
+
+### StreamReadOnlyStore
+
+`StreamReadOnlyStore` has been removed in favor of `ReadOnlyStore`.
 
 ## Message
 

docs/pages/store.md

@@ -83,11 +83,11 @@ It passes all methods to the underlying store, but throws an `StoreIsReadOnly` e
 operations.
 
 ```php
-use Patchlevel\EventSourcing\Store\StreamReadOnlyStore;
+use Patchlevel\EventSourcing\Store\ReadOnlyStore;
 use Patchlevel\EventSourcing\Store\StreamStore;
 
 /** @var StreamStore $store */
-$readOnlyStore = new StreamReadOnlyStore($store);
+$readOnlyStore = new ReadOnlyStore($store);
 ```
 ## Schema
 

src/Repository/DefaultRepository.php

@@ -1,3 +1,3 @@
 <?php
 
 declare(strict_types=1);
@@ -25,7 +25,6 @@
 use Patchlevel\EventSourcing\Store\Store;
 use Patchlevel\EventSourcing\Store\Stream;
 use Patchlevel\EventSourcing\Store\StreamStartHeader;
-use Patchlevel\EventSourcing\Store\StreamStore;
 use Patchlevel\EventSourcing\Store\UniqueConstraintViolation;
 use Psr\Clock\ClockInterface;
 use Psr\Log\LoggerInterface;
@@ -253,7 +252,7 @@
             );
 
             try {
-                if ($archiveTo !== null && $this->store instanceof StreamStore) {
+                if ($archiveTo !== null) {
                     $this->store->transactional(
                         function () use ($messages, $streamName, $archiveTo): void {
                             $this->store->save(...$messages);

src/Store/InMemoryStore.php

@@ -30,7 +30,7 @@
 
 use const ARRAY_FILTER_USE_BOTH;
 
-final class InMemoryStore implements StreamStore
+final class InMemoryStore implements Store
 {
     /** @param array<positive-int|0, Message> $messages */
     public function __construct(

src/Store/StreamReadOnlyStore.php → src/Store/ReadOnlyStore.php

@@ -9,10 +9,10 @@
 use Patchlevel\EventSourcing\Store\Criteria\Criteria;
 use Psr\Log\LoggerInterface;
 
-final class StreamReadOnlyStore implements StreamStore
+final class ReadOnlyStore implements Store
 {
     public function __construct(
-        private readonly StreamStore $store,
+        private readonly Store $store,
         private readonly LoggerInterface|null $logger = null,
     ) {
     }

src/Store/Store.php

@@ -31,4 +31,11 @@ public function save(Message ...$messages): void;
      * @template ClosureReturn
      */
     public function transactional(Closure $function): void;
+
+    /** @return list<string> */
+    public function streams(): array;
+
+    public function remove(Criteria|null $criteria = null): void;
+
+    public function archive(Criteria|null $criteria = null): void;
 }

src/Store/StreamDoctrineDbalStore.php

@@ -57,7 +57,7 @@
 use function str_contains;
 use function str_replace;
 
-final class StreamDoctrineDbalStore implements StreamStore, SubscriptionStore, DoctrineSchemaConfigurator
+final class StreamDoctrineDbalStore implements Store, SubscriptionStore, DoctrineSchemaConfigurator
 {
     /**
      * PostgreSQL has a limit of 65535 parameters in a single query.

tests/Integration/Store/StreamDoctrineDbalStoreTest.php

@@ -19,7 +19,7 @@
 use Patchlevel\EventSourcing\Store\Header\RecordedOnHeader;
 use Patchlevel\EventSourcing\Store\Header\StreamNameHeader;
 use Patchlevel\EventSourcing\Store\StreamDoctrineDbalStore;
-use Patchlevel\EventSourcing\Store\StreamStore;
+use Patchlevel\EventSourcing\Store\Store;
 use Patchlevel\EventSourcing\Store\UniqueConstraintViolation;
 use Patchlevel\EventSourcing\Tests\DbalManager;
 use Patchlevel\EventSourcing\Tests\Integration\Store\Events\ExternEvent;
@@ -36,7 +36,7 @@
 final class StreamDoctrineDbalStoreTest extends TestCase
 {
     private Connection $connection;
-    private StreamStore $store;
+    private Store $store;
 
     private ClockInterface $clock;
 

tests/Unit/Repository/DefaultRepositoryTest.php

@@ -693,7 +693,7 @@ public function testLoadAggregateWithoutSnapshot(): void
 
     public function testSaveAggregateInOtherStream(): void
     {
-        $store = $this->createMock(StreamStore::class);
+        $store = $this->createMock(Store::class);
         $store
             ->expects($this->once())
             ->method('save')
@@ -717,7 +717,7 @@ public function testSaveAggregateInOtherStream(): void
 
     public function testLoadAggregateFromOtherStream(): void
     {
-        $store = $this->createMock(StreamStore::class);
+        $store = $this->createMock(Store::class);
 
         $store
             ->expects($this->once())

tests/Unit/Store/StreamReadOnlyStoreTest.php → tests/Unit/Store/ReadOnlyStoreTest.php

@@ -6,34 +6,34 @@
 
 use Patchlevel\EventSourcing\Message\Message;
 use Patchlevel\EventSourcing\Store\Criteria\Criteria;
+use Patchlevel\EventSourcing\Store\ReadOnlyStore;
+use Patchlevel\EventSourcing\Store\Store;
 use Patchlevel\EventSourcing\Store\StoreIsReadOnly;
-use Patchlevel\EventSourcing\Store\StreamReadOnlyStore;
-use Patchlevel\EventSourcing\Store\StreamStore;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 
-#[CoversClass(StreamReadOnlyStore::class)]
-final class StreamReadOnlyStoreTest extends TestCase
+#[CoversClass(ReadOnlyStore::class)]
+final class ReadOnlyStoreTest extends TestCase
 {
     public function testLoad(): void
     {
         $criteria = new Criteria();
 
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->atLeastOnce())->method('load')->with($criteria, 8, 42, true);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
         $store->load($criteria, 8, 42, true);
     }
 
     public function testCount(): void
     {
         $criteria = new Criteria();
 
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->atLeastOnce())->method('count')->with($criteria);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
         $store->count($criteria);
     }
 
@@ -42,10 +42,10 @@ public function testSave(): void
         $message = new Message(new class () {
         });
 
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->never())->method('save')->with($message);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
         $this->expectException(StoreIsReadOnly::class);
         $store->save($message);
     }
@@ -55,19 +55,19 @@ public function testTransactional(): void
         $callback = static function (): void {
         };
 
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->atLeastOnce())->method('transactional')->with($callback);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
         $store->transactional($callback);
     }
 
     public function testStreams(): void
     {
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->atLeastOnce())->method('streams')->willReturn(['foo', 'bar']);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
 
         self::assertEquals(['foo', 'bar'], $store->streams());
     }
@@ -76,10 +76,10 @@ public function testRemove(): void
     {
         $criteria = new Criteria();
 
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->never())->method('remove')->with($criteria);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
         $this->expectException(StoreIsReadOnly::class);
         $store->remove($criteria);
     }
@@ -88,10 +88,10 @@ public function testArchive(): void
     {
         $criteria = new Criteria();
 
-        $parentStore = $this->createMock(StreamStore::class);
+        $parentStore = $this->createMock(Store::class);
         $parentStore->expects($this->never())->method('archive')->with($criteria);
 
-        $store = new StreamReadOnlyStore($parentStore);
+        $store = new ReadOnlyStore($parentStore);
         $this->expectException(StoreIsReadOnly::class);
         $store->archive($criteria);
     }