chore: Add support for php 8.5

.github/workflows/formats.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.4]
+        php: [8.3, 8.4, 8.5]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: Formats P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        php: [8.4]
+        php: [8.3, 8.4, 8.5]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: Tests P${{ matrix.php }} - ${{ matrix.os }} - ${{ matrix.dependency-version }}

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": "^8.3|^8.4",
+        "php": "^8.3|^8.4|^8.5",
         "guzzlehttp/guzzle": "^7.9"
     },
     "require-dev": {
@@ -54,7 +54,7 @@
         "test:lint": "@php vendor/bin/pint --config https://raw.githubusercontent.com/DIJ-digital/pint-config/main/pint.json",
         "test:unit": "pest",
         "test:types": "phpstan",
-        "test:refactor": "rector --dry-run",
+        "test:refactor": "rector",
         "test": [
             "@test:lint",
             "@test:type-coverage",

rector.php

@@ -19,6 +19,5 @@
         typeDeclarations: true,
         privatization: true,
         earlyReturn: true,
-        strictBooleans: true,
     )
     ->withPhpSets();

src/Concerns/IsCompilable.php

@@ -38,7 +38,7 @@ private function compileString(string $prompt, array $data = []): string
         $values = array_values($data);
 
         return str_replace(
-            array_map(fn ($i): string => '{{' . $i . '}}', array_keys($data)),
+            array_map(fn (string $i): string => '{{' . $i . '}}', array_keys($data)),
             $values,
             $prompt
         );

src/Ingestion/Generation.php

@@ -8,24 +8,23 @@
 
 class Generation
 {
-    public string $id {
-        get => $this->generationId;
-    }
+    public readonly string $id;
 
     public function __construct(
         public readonly string $generationId,
         public readonly string $traceId,
         private readonly Ingestion $ingestion,
     ) {
+        $this->id = $this->generationId;
     }
 
     /**
      * Update this generation.
      *
-     * @param array<string, mixed>|string|null $input
-     * @param array<string, mixed>|string|null $output
-     * @param array<string, mixed>|null $modelParameters
-     * @param array<string, mixed>|null $metadata
+     * @param  array<string, mixed>|string|null  $input
+     * @param  array<string, mixed>|string|null  $output
+     * @param  array<string, mixed>|null  $modelParameters
+     * @param  array<string, mixed>|null  $metadata
      */
     public function update(
         array|string|null $input = null,

src/Ingestion/Span.php

@@ -8,23 +8,22 @@
 
 class Span
 {
-    public string $id {
-        get => $this->spanId;
-    }
+    public readonly string $id;
 
     public function __construct(
         public readonly string $spanId,
         public readonly string $traceId,
         private readonly Ingestion $ingestion,
     ) {
+        $this->id = $this->spanId;
     }
 
     /**
      * Update this span.
      *
-     * @param array<string, mixed>|string|null $input
-     * @param array<string, mixed>|string|null $output
-     * @param array<string, mixed>|null $metadata
+     * @param  array<string, mixed>|string|null  $input
+     * @param  array<string, mixed>|string|null  $output
+     * @param  array<string, mixed>|null  $metadata
      */
     public function update(
         ?string $name = null,
@@ -51,9 +50,9 @@ public function update(
     /**
      * Create a child span nested under this span.
      *
-     * @param array<string, mixed>|string|null $input
-     * @param array<string, mixed>|string|null $output
-     * @param array<string, mixed>|null $metadata
+     * @param  array<string, mixed>|string|null  $input
+     * @param  array<string, mixed>|string|null  $output
+     * @param  array<string, mixed>|null  $metadata
      */
     public function span(
         string $name,
@@ -80,10 +79,10 @@ public function span(
     /**
      * Create a child generation nested under this span.
      *
-     * @param array<string, mixed>|string $input
-     * @param array<string, mixed>|string $output
-     * @param array<string, mixed>|null $modelParameters
-     * @param array<string, mixed>|null $metadata
+     * @param  array<string, mixed>|string  $input
+     * @param  array<string, mixed>|string  $output
+     * @param  array<string, mixed>|null  $modelParameters
+     * @param  array<string, mixed>|null  $metadata
      */
     public function generation(
         string $name,

src/Ingestion/Trace.php

@@ -8,23 +8,22 @@
 
 class Trace
 {
-    public string $id {
-        get => $this->traceId;
-    }
+    public readonly string $id;
 
     public function __construct(
         public readonly string $traceId,
         private readonly Ingestion $ingestion,
     ) {
+        $this->id = $this->traceId;
     }
 
     /**
      * Update this trace.
      *
-     * @param array<string, mixed>|string|null $input
-     * @param array<string, mixed>|string|null $output
-     * @param array<string, mixed>|null $metadata
-     * @param list<string>|null $tags
+     * @param  array<string, mixed>|string|null  $input
+     * @param  array<string, mixed>|string|null  $output
+     * @param  array<string, mixed>|null  $metadata
+     * @param  list<string>|null  $tags
      */
     public function update(
         ?string $name = null,
@@ -54,9 +53,9 @@ public function update(
     /**
      * Create a child span on this trace.
      *
-     * @param array<string, mixed>|string|null $input
-     * @param array<string, mixed>|string|null $output
-     * @param array<string, mixed>|null $metadata
+     * @param  array<string, mixed>|string|null  $input
+     * @param  array<string, mixed>|string|null  $output
+     * @param  array<string, mixed>|null  $metadata
      */
     public function span(
         string $name,
@@ -82,10 +81,10 @@ public function span(
     /**
      * Create a child generation on this trace.
      *
-     * @param array<string, mixed>|string $input
-     * @param array<string, mixed>|string $output
-     * @param array<string, mixed>|null $modelParameters
-     * @param array<string, mixed>|null $metadata
+     * @param  array<string, mixed>|string  $input
+     * @param  array<string, mixed>|string  $output
+     * @param  array<string, mixed>|null  $modelParameters
+     * @param  array<string, mixed>|null  $metadata
      */
     public function generation(
         string $name,

src/Prompt.php

@@ -21,7 +21,8 @@ class Prompt
     public function __construct(
         private readonly TransporterInterface $transporter,
         private readonly string $defaultLabel,
-    ) {}
+    ) {
+    }
 
     /**
      * Retrieve a text prompt by name. Uses default label if no version or label provided.
@@ -49,7 +50,7 @@ public function text(string $promptName, ?int $version = null, ?string $label =
     /**
      * Retrieve a chat prompt by name. Uses default label if no version or label provided.
      *
-     * @param  array<int, array{role: string, content: string}>|null  $fallback
+     * @param array<int, array{role: string, content: string}>|null $fallback
      *
      * @throws InvalidPromptTypeException
      */
@@ -96,10 +97,10 @@ public function list(?string $name = null, ?int $version = null, ?string $label
     /**
      * Create a new prompt.
      *
-     * @param  ($type is PromptType::TEXT ? string : array<int, array{role: string, content: string}>)  $prompt
-     * @param  array<int, string>|null  $labels
-     * @param  array<string, mixed>|null  $config
-     * @param  array<int, string>|null  $tags
+     * @param ($type is PromptType::TEXT ? string : array<int, array{role: string, content: string}>) $prompt
+     * @param array<int, string>|null $labels
+     * @param array<string, mixed>|null $config
+     * @param array<int, string>|null $tags
      * @return ($type is PromptType::TEXT ? TextPromptResponse : ChatPromptResponse)
      *
      * @throws JsonException
@@ -164,7 +165,7 @@ public function create(string $promptName, string|array $prompt, PromptType $typ
     /**
      * Update labels for a specific prompt version.
      *
-     * @param  array<int, string>  $labels
+     * @param array<int, string> $labels
      *
      * @throws JsonException
      */

src/Responses/FallbackPrompt.php

@@ -11,19 +11,6 @@
 {
     use IsCompilable;
 
-    /**
-     * @param ($type is "text" ? string : array<int, array{role: string, content: string}>) $prompt
-     */
-    public function __construct(
-        string|array $prompt,
-        string $type,
-    ) {
-        parent::__construct(
-            prompt: $prompt,
-            type: $type,
-        );
-    }
-
     /**
      * Create a text fallback prompt
      */

src/Responses/PromptListResponse.php

@@ -30,7 +30,7 @@ public function __construct(
     public static function fromArray(array $data): self
     {
         return new self(
-            data: array_map(fn (array $data): PromptListItem => PromptListItem::fromArray($data), $data['data']),
+            data: array_map(PromptListItem::fromArray(...), $data['data']),
             meta: MetaData::fromArray($data['meta']),
             pagination: PaginationData::fromArray($data['pagination']),
         );

src/Responses/ScoreListResponse.php

@@ -26,7 +26,7 @@ public function __construct(
     public static function fromArray(array $data): self
     {
         return new self(
-            data: array_map(fn (array $item): ScoreResponse => ScoreResponse::fromArray($item), $data['data']),
+            data: array_map(ScoreResponse::fromArray(...), $data['data']),
             meta: MetaData::fromArray($data['meta']),
         );
     }

tests/Feature/IngestionTest.php

@@ -113,7 +113,7 @@ function getEventType(array $history, int $index = 0): string
     $ingestion = makeIngestion($history);
 
     // Act
-    $ingestion->trace(name: 'test-trace', userId: 'user-123', sessionId: 'sess-456');
+    $ingestion->trace(name: 'test-trace', sessionId: 'sess-456', userId: 'user-123');
 
     // Assert
     $body = getEventBody($history);
@@ -166,7 +166,7 @@ function getEventType(array $history, int $index = 0): string
 
     // Act
     $trace = $ingestion->trace(name: 'my-trace', input: 'start');
-    $result = $trace->update(output: 'final result', userId: 'user-456');
+    $result = $trace->update(userId: 'user-456', output: 'final result');
 
     // Assert
     expect($result)->toBe($trace)
@@ -259,10 +259,10 @@ function getEventType(array $history, int $index = 0): string
         name: 'test-generation',
         input: ['messages' => [['role' => 'user', 'content' => 'Hi']]],
         output: 'Hello',
-        promptName: 'prompt-x',
-        promptVersion: 3,
         model: 'gpt-4o',
         modelParameters: ['temperature' => 0.2],
+        promptName: 'prompt-x',
+        promptVersion: 3,
         metadata: ['source' => 'test'],
     );
 

tests/Feature/ScoreTest.php

@@ -29,9 +29,9 @@
     $score = (new Langfuse(new HttpTransporter($client)))
         ->score()
         ->create(
-            traceId: 'trace-456',
             name: 'accuracy',
             value: 0.95,
+            traceId: 'trace-456',
             dataType: ScoreDataType::NUMERIC,
         );
 
@@ -59,9 +59,9 @@
     $score = (new Langfuse(new HttpTransporter($client)))
         ->score()
         ->create(
-            traceId: 'trace-456',
             name: 'helpfulness',
             value: 'helpful',
+            traceId: 'trace-456',
             dataType: ScoreDataType::CATEGORICAL,
         );
 
@@ -86,9 +86,9 @@
     $score = (new Langfuse(new HttpTransporter($client)))
         ->score()
         ->create(
-            traceId: 'trace-456',
             name: 'is_correct',
             value: 1,
+            traceId: 'trace-456',
             dataType: ScoreDataType::BOOLEAN,
         );
 
@@ -154,8 +154,8 @@
             page: 1,
             limit: 10,
             name: 'accuracy',
-            dataType: ScoreDataType::NUMERIC,
             traceId: 'trace-123',
+            dataType: ScoreDataType::NUMERIC,
         );
 
     expect($history)->toHaveCount(1);
@@ -217,9 +217,9 @@
     (new Langfuse(new HttpTransporter($client)))
         ->score()
         ->create(
-            traceId: 'trace-456',
             name: 'accuracy',
             value: 0.95,
+            traceId: 'trace-456',
             dataType: ScoreDataType::NUMERIC,
             id: 'custom-score-id',
             observationId: 'obs-789',