Merge pull request #80 from spiral/fix-phpunit-fail

roxblnfk · web-flow · commit bdc194796a26 · 2025-05-05T13:32:07.000+04:00
Resolve conflict with phpunit 10.5.46
diff --git 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/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"/>
diff --git 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()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`errorBaseline="psalm-baseline.xml"`
`9`	`9`	`>`
`10`	`10`	`<issueHandlers>`
	`11`	`+ <MissingOverrideAttribute errorLevel="suppress"/>`
	`12`	`+ <ClassMustBeFinal errorLevel="suppress"/>`
`11`	`13`	`<MissingClassConstType errorLevel="suppress"/>`
`12`	`14`	`<RedundantConditionGivenDocblockType errorLevel="suppress"/>`
`13`	`15`	`<RedundantCastGivenDocblockType errorLevel="suppress"/>`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,6 @@ public function headers(ServerRequestInterface $request): array`
`25`	`25`	`#[Route('/get/scopes', 'get.scopes')]`
`26`	`26`	`public function scopes(ServerRequestInterface $request): array`
`27`	`27`	`{`
`28`		`- return Introspector::scopeNames();`
	`28`	`+ return \array_values(\array_filter(Introspector::scopeNames()));`
`29`	`29`	`}`
`30`	`30`	`}`