allow psr 7 v2 and update dependencies

Author: thomasvargiu

.github/workflows/continuous-integration.yml

@@ -58,6 +58,7 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
         deps:
           - "--prefer-lowest"
           - ""

composer.json

@@ -30,13 +30,13 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
-        "facile-it/php-jose-verifier": "^0.3 || ^0.4",
+        "facile-it/php-jose-verifier": "^0.3 || ^0.4.3",
         "php-http/discovery": "^1.6",
         "psr/http-client": "^1.0",
         "psr/http-client-implementation": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-factory-implementation": "^1.0",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^1.0 || ^2.0",
         "psr/http-message-implementation": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "web-token/jwt-checker": "^2.0 || ^3.0",
@@ -74,7 +74,7 @@
         "laminas/laminas-component-installer": "^2.1 || ^3.0",
         "laminas/laminas-config-aggregator": "^1.1",
         "laminas/laminas-di": "^3.1",
-        "laminas/laminas-diactoros": "^2.1",
+        "laminas/laminas-diactoros": "^2.1 || ^3.0",
         "laminas/laminas-servicemanager": "^3.4",
         "php-http/cache-plugin": "^1.6",
         "php-http/curl-client": "^2.0",
@@ -90,6 +90,8 @@
         "web-token/jwt-encryption-algorithm-aeskw": "^2.0 || ^3.0",
         "web-token/jwt-encryption-algorithm-dir": "^2.0 || ^3.0",
         "web-token/jwt-encryption-algorithm-ecdh-es": "^2.0 || ^3.0",
+        "web-token/jwt-signature-algorithm-eddsa": "^2.2.0 || ^3.0",
+        "web-token/jwt-encryption-algorithm-ecdh-es": "^2.2.0 || ^3.0",
         "web-token/jwt-encryption-algorithm-experimental": "^2.0 || ^3.0",
         "web-token/jwt-encryption-algorithm-pbes2": "^2.0 || ^3.0",
         "web-token/jwt-encryption-algorithm-rsa": "^2.0 || ^3.0",

composer.lock

@@ -5,9 +5,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    findUnusedBaselineEntry="false"
+    findUnusedBaselineEntry="true"
     findUnusedCode="false"
-    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />

psalm-baseline.xml

@@ -158,13 +158,14 @@ protected function assignClaims(array $claims, array $sourceNames, array $source
                 throw new RuntimeException(sprintf('Unable to find claim "%s" in source "%s"', $claim, $inSource));
             }
 
-            /** @var scalar $value */
+            /** @psalm-var scalar $value */
             $value = $sources[$inSource][$claim];
             $claims[$claim] = $value;
-            /** @var TokenSetClaimsType $claims */
+            /** @psalm-var TokenSetClaimsType $claims */
             $claims['_claim_names'] = array_diff_key($claims['_claim_names'] ?? [], array_flip([$claim]));
         }
 
+        /** @psalm-var TokenSetClaimsType $claims */
         return $claims;
     }
 

psalm.xml

@@ -48,6 +48,13 @@ public function __construct(
         $this->cacheIdGenerator = $cacheIdGenerator ?? static fn (string $uri): string => substr(sha1($uri), 0, 65);
     }
 
+    /**
+     * @return array<string, mixed>
+     *
+     * @psalm-return IssuerMetadataObject
+     *
+     * @psalm-suppress MixedReturnTypeCoercion
+     */
     public function fetch(string $uri): array
     {
         $cacheId = ($this->cacheIdGenerator)($uri);

src/Claims/AbstractClaims.php

@@ -48,6 +48,13 @@ public function isAllowedUri(string $uri): bool
         return (int) preg_match('/https?:\/\//', $uri) > 0;
     }
 
+    /**
+     * @return array<string, mixed>
+     *
+     * @psalm-return IssuerMetadataObject
+     *
+     * @psalm-suppress MixedReturnTypeCoercion
+     */
     public function discovery(string $url): array
     {
         $uri = $this->uriFactory->createUri($url);
@@ -85,7 +92,7 @@ private function fetchOpenIdConfiguration(string $uri): array
             ->withHeader('accept', 'application/json');
 
         try {
-            /** @var IssuerMetadataObject $data */
+            /** @psalm-var IssuerMetadataObject $data */
             $data = parse_metadata_response($this->client->sendRequest($request));
         } catch (ClientExceptionInterface $e) {
             throw new RuntimeException('Unable to fetch provider metadata', 0, $e);

src/Issuer/Metadata/Provider/CachedProviderDecorator.php

@@ -43,6 +43,7 @@
  * @psalm-type TokenSetAttributesType = array{}&array{
  *     code?: string,
  *     access_token?: string,
+ *     id_token?: string,
  *     token_type?: string,
  *     refresh_token?: string,
  *     expires_in?: int,

src/Issuer/Metadata/Provider/DiscoveryProvider.php

@@ -39,8 +39,8 @@ class JWSBuilder
     /**
      * Adds the information needed to compute the signature. This method will return a new JWSBuilder object.
      *
-     * @param array{}&array{alg?: string} $protectedHeader
-     * @param array{}&array{alg?: string} $header
+     * @psalm-param array{alg?: string, ...} $protectedHeader
+     * @psalm-param array{alg?: string, ...} $header
      */
     public function addSignature(JWK $signatureKey, array $protectedHeader, array $header = []): self
     {