From 848761e7c176bf042b86e3e4883f453a2b4529f9 Mon Sep 17 00:00:00 2001
From: Maksim Stepanov <17935127+delatrie@users.noreply.github.com>
Date: Tue, 28 Apr 2026 02:13:09 +0700
Subject: [PATCH 1/3] chore: fix build on macos

---
 .github/workflows/build.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 414de85..fe10148 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,19 +30,20 @@ jobs:
           - "--prefer-lowest"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v6
 
-      - name: Validate composer.json and composer.lock
-        run: composer validate
-        
       - name: Set up PHP ${{ matrix.php-version }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
+          tools: composer:v2
           extensions: pcntl, posix
           coverage: xdebug
           ini-values: error_reporting=E_ALL
 
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
       - name: Install dependencies
         run: composer update
           --prefer-dist

From 35fba4acdaede3a7af5c11319eff100d4bc9aaa0 Mon Sep 17 00:00:00 2001
From: Maksim Stepanov <17935127+delatrie@users.noreply.github.com>
Date: Tue, 28 Apr 2026 02:13:34 +0700
Subject: [PATCH 2/3] chore: fix psaml errors

---
 src/Model/JsonSerializableTrait.php | 3 ++-
 test/AllureLifecycleTest.php        | 3 ---
 test/AllureTest.php                 | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Model/JsonSerializableTrait.php b/src/Model/JsonSerializableTrait.php
index 29d0b19..21c86fa 100644
--- a/src/Model/JsonSerializableTrait.php
+++ b/src/Model/JsonSerializableTrait.php
@@ -30,8 +30,9 @@ trait JsonSerializableTrait
      */
     final public function jsonSerialize(): array
     {
+        $thisObjectVars = get_object_vars($this);
         $includedProperties = array_filter(
-            get_object_vars($this),
+            $thisObjectVars,
             fn (string $key): bool => !in_array($key, $this->excludeFromSerialization(), true),
             ARRAY_FILTER_USE_KEY,
         );
diff --git a/test/AllureLifecycleTest.php b/test/AllureLifecycleTest.php
index 0c8dd80..740181f 100644
--- a/test/AllureLifecycleTest.php
+++ b/test/AllureLifecycleTest.php
@@ -875,7 +875,6 @@ public function testWriteContainer_ExcludedContainerWithNestedResults_RemovesNes
             ->with(
                 self::callback(
                     function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): bool {
-                        /** @psalm-var list<AttachmentResult> $removeAttachmentResults */
                         $removeAttachmentResults[] = $attachmentResult;
 
                         return true;
@@ -889,7 +888,6 @@ function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): b
             ->with(
                 self::callback(
                     function (TestResult $testResult) use (&$removeTestResults): bool {
-                        /** @psalm-var list<TestResult> $removeTestResults */
                         $removeTestResults[] = $testResult;
 
                         return true;
@@ -2752,7 +2750,6 @@ public function testWriteTest_ExcludedTestWithNestedResults_RemovesNestedResults
             ->with(
                 self::callback(
                     function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): bool {
-                        /** @psalm-var list<AttachmentResult> $removeAttachmentResults */
                         $removeAttachmentResults[] = $attachmentResult;
 
                         return true;
diff --git a/test/AllureTest.php b/test/AllureTest.php
index eddc3d8..9e9a165 100644
--- a/test/AllureTest.php
+++ b/test/AllureTest.php
@@ -242,7 +242,7 @@ public function testRunStep_OnlyMethodDisplayNameAttributeProvided_StepHasMatchi
     }
 
     #[DisplayName('b')]
-    public function titledStep(): void
+    public function titledStep(StepContextInterface $_): void
     {
     }
 
@@ -293,7 +293,7 @@ public function testRunStep_MethodParameterAttributeProvided_StepHasMatchingPara
     }
 
     #[Parameter('b', 'c')]
-    public function parametrizedStep(): void
+    public function parametrizedStep(StepContextInterface $_): void
     {
     }
 

From 2817deb872f3f4d06bb51e646ce6bbcc48654107 Mon Sep 17 00:00:00 2001
From: Maksim Stepanov <17935127+delatrie@users.noreply.github.com>
Date: Tue, 28 Apr 2026 02:45:44 +0700
Subject: [PATCH 3/3] deps: bump vimeo/psalm to 5.17.0

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 74fbc7d..59ceb65 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
     "phpunit/phpunit": "^9.6.8",
     "psalm/plugin-phpunit": "^0.18.4",
     "squizlabs/php_codesniffer": "^3.7.2",
-    "vimeo/psalm": "^5.12"
+    "vimeo/psalm": "^5.17"
   },
   "autoload": {
     "psr-4": {