Merge branch 'thenativeweb:main' into main

Author: wundii

.github/workflows/qa.yml

@@ -14,11 +14,11 @@ jobs:
 
     strategy:
       matrix:
-        version: [ '8.2', '8.3', '8.4', 'latest' ]
+        version: [ '8.2', '8.3', '8.4', '8.5', 'latest' ]
 
     steps:
     - name: Clone repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - name: Use PHP
       uses: shivammathur/setup-php@v2
       with:

.github/workflows/release.yml

@@ -16,13 +16,13 @@ jobs:
 
     steps:
     - name: Clone repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         fetch-depth: '0'
     - name: Use PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.4'
+        php-version: '8.5'
         tools: composer
     - name: Install dependencies
       run: |

README.md

@@ -79,6 +79,20 @@ $writtenEvents = $client->writeEvents([
 ]);
 ```
 
+#### Using the `isSubjectPopulated` precondition
+
+If you only want to write events in case a subject (such as `/books/42`) already has at least one event, import the `IsSubjectPopulated` class, use it to create a precondition, and pass it in an array as the second argument:
+
+```php
+use Thenativeweb\Eventsourcingdb\IsSubjectPopulated;
+
+$writtenEvents = $client->writeEvents([
+  // events
+], [
+  new IsSubjectPopulated('/books/42'),
+]);
+```
+
 #### Using the `isSubjectOnEventId` precondition
 
 If you only want to write events in case the last event of a subject (such as `/books/42`) has a specific ID (e.g., `0`), import the `IsSubjectOnEventId` class, use it to create a precondition, and pass it in an array as the second argument:

composer.json

@@ -31,10 +31,10 @@
     "testcontainers/testcontainers": "1.0.3"
   },
   "require-dev": {
-    "phpstan/phpstan": "2.1.31",
+    "phpstan/phpstan": "2.1.32",
     "phpunit/phpunit": "11.5.21",
-    "rector/rector": "2.2.3",
-    "symplify/easy-coding-standard": "12.6.0"
+    "rector/rector": "2.2.7",
+    "symplify/easy-coding-standard": "13.0.0"
   },
   "scripts": {
     "analyze": [

composer.lock

@@ -18,6 +18,7 @@ final class Container
     private string $apiToken = 'secret';
     private ?SigningKey $signingKey = null;
     private ?StartedGenericContainer $container = null;
+    private ?string $tempSigningKeyFile = null;
 
     public function withImageTag(string $tag): self
     {
@@ -57,26 +58,25 @@ public function start(): void
             '--http-enabled',
             '--https-enabled=false',
         ];
-        $content = [];
 
         if ($this->signingKey instanceof SigningKey) {
             $command[] = '--signing-key-file';
             $command[] = '/etc/esdb/signing-key.pem';
+        }
+
+        $container = (new GenericContainer("{$this->imageName}:{$this->imageTag}"))
+            ->withExposedPorts($this->internalPort)
+            ->withCommand($command);
+
+        if ($this->signingKey instanceof SigningKey) {
+            $this->tempSigningKeyFile = getcwd() . '/.esdb_signing_key_' . uniqid();
+            file_put_contents($this->tempSigningKeyFile, $this->signingKey->privateKeyPem);
+            chmod($this->tempSigningKeyFile, 0o644);
 
-            $content[] = [
-                'content' => $this->signingKey->privateKeyPem,
-                'target' => '/etc/esdb/signing-key.pem',
-                'mode' => 0o777,
-            ];
+            $container = $container->withMount($this->tempSigningKeyFile, '/etc/esdb/signing-key.pem');
         }
 
-        $container =
-            (new GenericContainer("{$this->imageName}:{$this->imageTag}"))
-                ->withExposedPorts($this->internalPort)
-                ->withCommand($command)
-                ->withCopyContentToContainer($content)
-                ->withWait((new WaitForHttp($this->internalPort, 20000))->withPath('/api/v1/ping'))
-        ;
+        $container = $container->withWait((new WaitForHttp($this->internalPort, 20000))->withPath('/api/v1/ping'));
 
         try {
             $this->container = $container->start();
@@ -139,6 +139,11 @@ public function stop(): void
             $this->container->stop();
             $this->container = null;
         }
+
+        if ($this->tempSigningKeyFile !== null && file_exists($this->tempSigningKeyFile)) {
+            unlink($this->tempSigningKeyFile);
+            $this->tempSigningKeyFile = null;
+        }
     }
 
     public function getClient(): Client

src/Container.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+use JsonSerializable;
+
+final readonly class IsSubjectPopulated implements JsonSerializable
+{
+    public function __construct(
+        public string $subject,
+    ) {
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'type' => 'isSubjectPopulated',
+            'payload' => [
+                'subject' => $this->subject,
+            ],
+        ];
+    }
+}

src/IsSubjectPopulated.php

@@ -2,7 +2,11 @@
 
 declare(strict_types=1);
 
+namespace Thenativeweb\Eventsourcingdb\Tests;
+
+use Exception;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 use Thenativeweb\Eventsourcingdb\CloudEvent;
 use Thenativeweb\Eventsourcingdb\Container;
 use Thenativeweb\Eventsourcingdb\EventCandidate;

tests/CloudEventSignatureTest.php

@@ -2,7 +2,10 @@
 
 declare(strict_types=1);
 
+namespace Thenativeweb\Eventsourcingdb\Tests;
+
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 use Thenativeweb\Eventsourcingdb\CloudEvent;
 use Thenativeweb\Eventsourcingdb\EventCandidate;
 use Thenativeweb\Eventsourcingdb\Tests\Trait\ClientTestTrait;

tests/CloudEventTest.php

@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+namespace Thenativeweb\Eventsourcingdb\Tests;
+
 use PHPUnit\Framework\TestCase;
 use Thenativeweb\Eventsourcingdb\Bound;
 use Thenativeweb\Eventsourcingdb\BoundType;