From 7201686610a17a398e93ad130ddd2e6cf8850853 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Mon, 5 May 2025 13:25:43 +0400
Subject: [PATCH 1/2] Resolve conflict with phpunit 10.5.46

---
 composer.json                          | 2 +-
 tests/app/Controller/GetController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5dc3175..e67b10b 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,7 @@
         "php": ">=8.1",
         "nyholm/psr7": "^1.8.2",
         "mockery/mockery": "^1.6.12",
-        "phpunit/phpunit": "^9.6 || ^10.5.44",
+        "phpunit/phpunit": "^9.6 || 10.5.45",
         "spiral/auth": "^3.15",
         "spiral/auth-http": "^3.15",
         "spiral/boot": "^3.15",
diff --git a/tests/app/Controller/GetController.php b/tests/app/Controller/GetController.php
index 265b5d8..15d3086 100644
--- a/tests/app/Controller/GetController.php
+++ b/tests/app/Controller/GetController.php
@@ -25,6 +25,6 @@ public function headers(ServerRequestInterface $request): array
     #[Route('/get/scopes', 'get.scopes')]
     public function scopes(ServerRequestInterface $request): array
     {
-        return Introspector::scopeNames();
+        return \array_values(\array_filter(Introspector::scopeNames()));
     }
 }

From 939ec08dc2f8ce2d7056c022974c3acdfbd157e3 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Mon, 5 May 2025 13:30:28 +0400
Subject: [PATCH 2/2] Update psalm rules

---
 psalm.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/psalm.xml b/psalm.xml
index 93b44db..1e3d55b 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,6 +8,8 @@
        errorBaseline="psalm-baseline.xml"
 >
     <issueHandlers>
+        <MissingOverrideAttribute errorLevel="suppress"/>
+        <ClassMustBeFinal errorLevel="suppress"/>
         <MissingClassConstType errorLevel="suppress"/>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
         <RedundantCastGivenDocblockType errorLevel="suppress"/>