Add PHP 8.3 to test matrix (#245)

agoallikmaa · web-flow · commit 83f0504f55f2 · 2024-03-12T14:23:13.000+11:00
* Add PHP 8.3 to test matrix
* Update psalm for 8.3 to work
* Update psalm suppressions
* Fix php-cs-fixer issue
diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
     "phpstan/phpstan": "^1.1",
     "phpstan/phpstan-phpunit": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "psalm/plugin-phpunit": "^0.16",
+    "psalm/plugin-phpunit": "^0.18.4",
     "spatie/laravel-ignition": "*",
-    "vimeo/psalm": "^4.0"
+    "vimeo/psalm": "^5.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/HeadersPropagator.php b/src/HeadersPropagator.php
@@ -20,12 +20,12 @@ public static function instance(): self
         return $instance ??= new self();
     }
 
-    /** @psalm-suppress InvalidReturnType */
+    /** @psalm-suppress MoreSpecificReturnType */
     public function keys($carrier): array
     {
         assert($carrier instanceof Request);
 
-        /** @psalm-suppress InvalidReturnStatement */
+        /** @psalm-suppress LessSpecificReturnStatement */
         return $carrier->headers->keys();
     }
 
diff --git a/src/Watchers/QueryWatcher.php b/src/Watchers/QueryWatcher.php
@@ -36,7 +36,7 @@ public function recordQuery(QueryExecuted $query): void
         if (! in_array($operationName, ['SELECT', 'INSERT', 'UPDATE', 'DELETE'])) {
             $operationName = null;
         }
-        /** @psalm-suppress InvalidArgument */
+        /** @psalm-suppress ArgumentTypeCoercion */
         $span = $this->instrumentation->tracer()->spanBuilder('sql ' . $operationName)
             ->setSpanKind(SpanKind::KIND_CLIENT)
             ->setStartTimestamp($this->calculateQueryStartTime($nowInNs, $query->time))

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ public static function instance(): self`
`20`	`20`	`return $instance ??= new self();`
`21`	`21`	`}`
`22`	`22`
`23`		`- /** @psalm-suppress InvalidReturnType */`
	`23`	`+ /** @psalm-suppress MoreSpecificReturnType */`
`24`	`24`	`public function keys($carrier): array`
`25`	`25`	`{`
`26`	`26`	`assert($carrier instanceof Request);`
`27`	`27`
`28`		`- /** @psalm-suppress InvalidReturnStatement */`
	`28`	`+ /** @psalm-suppress LessSpecificReturnStatement */`
`29`	`29`	`return $carrier->headers->keys();`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function recordQuery(QueryExecuted $query): void`
`36`	`36`	`if (! in_array($operationName, ['SELECT', 'INSERT', 'UPDATE', 'DELETE'])) {`
`37`	`37`	`$operationName = null;`
`38`	`38`	`}`
`39`		`- /** @psalm-suppress InvalidArgument */`
	`39`	`+ /** @psalm-suppress ArgumentTypeCoercion */`
`40`	`40`	`$span = $this->instrumentation->tracer()->spanBuilder('sql ' . $operationName)`
`41`	`41`	`->setSpanKind(SpanKind::KIND_CLIENT)`
`42`	`42`	`->setStartTimestamp($this->calculateQueryStartTime($nowInNs, $query->time))`