chore: update classes to final and readonly for consistency, enhance container startup logic (#22)

Co-authored-by: awu <andreas.wunderwald@westpress.de>

Author: wundii

composer.json

@@ -13,7 +13,7 @@
       "Thenativeweb\\Eventsourcingdb\\Tests\\": "tests/"
     },
     "files": [
-      "tests/getImageVersionFromDockerfile.php"
+      "tests/Fn/getImageVersionFromDockerfile.php"
     ]
   },
   "authors": [

src/Bound.php

@@ -12,7 +12,7 @@ enum BoundType: string
     case EXCLUSIVE = 'exclusive';
 }
 
-class Bound implements JsonSerializable
+final readonly class Bound implements JsonSerializable
 {
     public function __construct(
         public string $id,

src/Container.php

@@ -42,18 +42,42 @@ public function withPort(int $port): self
         return $this;
     }
 
+    /**
+     * @throws Exception
+     */
     public function start(): void
     {
-        $container =
-            (new GenericContainer("{$this->imageName}:{$this->imageTag}"))
-                ->withExposedPorts($this->internalPort)
-                ->withCommand([
-                    'run',
-                    '--api-token', $this->apiToken,
-                    '--data-directory-temporary',
-                    '--http-enabled',
-                    '--https-enabled=false',
-                ]);
+        $container = null;
+        $retryCount = 5;
+        while ($retryCount) {
+            try {
+                $container =
+                    (new GenericContainer("{$this->imageName}:{$this->imageTag}"))
+                        ->withExposedPorts($this->internalPort)
+                        ->withCommand([
+                            'run',
+                            '--api-token', $this->apiToken,
+                            '--data-directory-temporary',
+                            '--http-enabled',
+                            '--https-enabled=false',
+                        ]);
+
+            } catch (Exception $exception) {
+                --$retryCount;
+
+                $exceptionMessage = $exception->getMessage();
+
+                sleep(6);
+            }
+
+            if ($container instanceof GenericContainer) {
+                break;
+            }
+        }
+
+        if (!$container instanceof GenericContainer) {
+            exit($exceptionMessage ?? 'Failed to create container');
+        }
 
         $this->container = $container->start();
 

src/EventType.php

@@ -6,7 +6,7 @@
 
 use JsonSerializable;
 
-class EventType implements JsonSerializable
+final readonly class EventType implements JsonSerializable
 {
     public function __construct(
         public string $eventType,

src/ObserveEventsOptions.php

@@ -12,7 +12,7 @@ enum ObserveIfEventIsMissing: string
     case WAIT_FOR_EVENT = 'wait-for-event';
 }
 
-class ObserveFromLatestEvent implements JsonSerializable
+final readonly class ObserveFromLatestEvent implements JsonSerializable
 {
     public function __construct(
         public string $subject,
@@ -31,7 +31,7 @@ public function jsonSerialize(): array
     }
 }
 
-class ObserveEventsOptions implements JsonSerializable
+final readonly class ObserveEventsOptions implements JsonSerializable
 {
     public function __construct(
         public bool $recursive,

src/ReadEventsOptions.php

@@ -18,7 +18,7 @@ enum ReadIfEventIsMissing: string
     case READ_EVERYTHING = 'read-everything';
 }
 
-class ReadFromLatestEvent implements JsonSerializable
+final readonly class ReadFromLatestEvent implements JsonSerializable
 {
     public function __construct(
         public string $subject,
@@ -37,7 +37,7 @@ public function jsonSerialize(): array
     }
 }
 
-class ReadEventsOptions implements JsonSerializable
+final readonly class ReadEventsOptions implements JsonSerializable
 {
     public function __construct(
         public bool $recursive = false,

tests/ClientTestTrait.php

@@ -6,6 +6,7 @@
 
 use Thenativeweb\Eventsourcingdb\Client;
 use Thenativeweb\Eventsourcingdb\Container;
+use function Thenativeweb\Eventsourcingdb\Tests\Fn\getImageVersionFromDockerfile;
 
 trait ClientTestTrait
 {

tests/getImageVersionFromDockerfile.php …sts/Fn/getImageVersionFromDockerfile.phptests/getImageVersionFromDockerfile.php renamed to tests/Fn/getImageVersionFromDockerfile.php tests/getImageVersionFromDockerfile.php renamed to tests/Fn/getImageVersionFromDockerfile.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Thenativeweb\Eventsourcingdb\Tests;
+namespace Thenativeweb\Eventsourcingdb\Tests\Fn;
 
 use RuntimeException;
 
 function getImageVersionFromDockerfile(): string
 {
-    $dockerfile = __DIR__ . '/../docker/Dockerfile';
+    $dockerfile = __DIR__ . '/../../docker/Dockerfile';
 
     if (!file_exists($dockerfile)) {
         throw new RuntimeException('Dockerfile not found at ' . $dockerfile);