Merge branch 'master' into version-1

Author: cicnavi

.github/workflows/php.yml

@@ -45,8 +45,8 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest]
-        php-versions: ['8.3', '8.4', '8.5']
-        jwt-version: ['^4.1.3']
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
+        jwt-version: ['^3.4', '^4.0.2']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -89,15 +89,15 @@ jobs:
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Run unit tests with coverage
-        if: ${{ matrix.php-versions == '8.5' && matrix.jwt-version == '^4.1.3' }}
+        if: ${{ matrix.php-versions == '8.5' && matrix.jwt-version == '^4.0.2' }}
         run: vendor/bin/phpunit
 
       - name: Run unit tests (no coverage)
         if: ${{ matrix.php-versions != '8.5' }}
         run: vendor/bin/phpunit --no-coverage
 
       - name: Save coverage data
-        if: ${{ matrix.php-versions == '8.5' && matrix.jwt-version == '^4.1.3' }}
+        if: ${{ matrix.php-versions == '8.5' && matrix.jwt-version == '^4.0.2' }}
         uses: actions/upload-artifact@v7
         with:
           name: coverage-data
@@ -111,8 +111,8 @@ jobs:
       fail-fast: true
       matrix:
         operating-system: [windows-latest]
-        php-versions: ['8.3', '8.4', '8.5']
-        jwt-version: ['^4.1.3']
+        php-versions: ['8.2', '8.4', '8.5']
+        jwt-version: ['^4.0.2']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -227,7 +227,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           # Should be the lowest supported version
-          php-version: '8.3'
+          php-version: '8.2'
           extensions: ctype, date, dom, filter, hash, mbstring, openssl, pcre, soap, spl, xml
           tools: composer
           coverage: none

composer.json

@@ -21,25 +21,25 @@
         }
     },
     "require": {
-        "php": "^8.3",
+        "php": "^8.2",
         "ext-gmp": "*",
         "ext-filter": "*",
         "ext-mbstring": "*",
         "ext-hash": "*",
 
-        "guzzlehttp/guzzle": "^7.10",
+        "guzzlehttp/guzzle": "^7.8",
         "psr/http-client": "^1",
         "psr/http-message": "^2",
         "psr/log": "^3",
         "psr/simple-cache": "^3",
-        "web-token/jwt-library": "^4.1"
+        "web-token/jwt-library": "^3.4 || ^4.0.2"
     },
     "require-dev": {
         "phpstan/phpstan": "^2.1",
-        "phpunit/phpunit": "^11 || ^12.3 || ^13",
+        "phpunit/phpunit": "^10 || ^11",
         "rector/rector": "^2.0",
-        "simplesamlphp/simplesamlphp-test-framework": "^1.11",
-        "squizlabs/php_codesniffer": "^4"
+        "simplesamlphp/simplesamlphp-test-framework": "^1",
+        "squizlabs/php_codesniffer": "^3"
     },
     "conflict": {
         "rector/rector": "2.3.0"
@@ -49,9 +49,7 @@
         "cache-dir": "build/composer",
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "phpstan/extension-installer": true,
-            "simplesamlphp/composer-module-installer": true,
-            "simplesamlphp/composer-xmlprovider-installer": true
+            "phpstan/extension-installer": true
         }
     },
     "extra": {

src/Decorators/HttpClientDecorator.php

@@ -13,7 +13,7 @@
 
 class HttpClientDecorator
 {
-    public const array DEFAULT_HTTP_CLIENT_CONFIG = [RequestOptions::ALLOW_REDIRECTS => true,];
+    public const DEFAULT_HTTP_CLIENT_CONFIG = [RequestOptions::ALLOW_REDIRECTS => true,];
 
 
     public function __construct(public readonly Client $client = new Client(self::DEFAULT_HTTP_CLIENT_CONFIG))

src/Helpers/Arr.php

@@ -8,7 +8,7 @@
 
 class Arr
 {
-    public const int MAX_DEPTH = 99;
+    public const MAX_DEPTH = 99;
 
 
     /**

src/SdJwt/Disclosure.php

@@ -16,7 +16,7 @@ class Disclosure implements JsonSerializable
     /**
      * @var non-empty-array<string|int>
      */
-    public const array FORBIDDEN_NAMES = [
+    public const FORBIDDEN_NAMES = [
         ClaimsEnum::_SdAlg->value,
         ClaimsEnum::_Sd->value,
         ClaimsEnum::DotDotDot->value,

src/SdJwt/SdJwt.php

@@ -21,7 +21,7 @@
  */
 class SdJwt extends ParsedJws
 {
-    public const string TILDE = '~';
+    public const TILDE = '~';
 
 
     public function __construct(

src/VerifiableCredentials/SdJwtVc/SdJwtVc.php

@@ -17,7 +17,7 @@ class SdJwtVc extends SdJwt
      * As per https://datatracker.ietf.org/doc/html/draft-ietf-oauth-sd-jwt-vc#section-3.2.2.2
      * @var string[]
      */
-    public const array NON_SELECTIVELY_DISCLOSABLE_CLAIMS = [
+    public const NON_SELECTIVELY_DISCLOSABLE_CLAIMS = [
         ClaimsEnum::Iss->value,
         ClaimsEnum::Nbf->value,
         ClaimsEnum::Exp->value,

tests/src/Help.php

@@ -6,7 +6,7 @@
 
 class Help
 {
-    public const string DIR_DATA = 'data';
+    public const DIR_DATA = 'data';
 
 
     public function getTestRootDir(string ...$pathElements): string

tests/src/Jwks/Factories/JwksDecoratorFactoryTest.php

@@ -14,6 +14,7 @@
 
 #[CoversClass(JwksDecoratorFactory::class)]
 #[UsesClass(JwksDecorator::class)]
+#[UsesClass(JwksDecoratorFactory::class)]
 final class JwksDecoratorFactoryTest extends TestCase
 {
     protected array $jwksArraySample = [

tests/src/Jws/JwsFetcherTest.php

@@ -172,7 +172,7 @@ public function testWillUseJwsExpirationTimeWhenConsideringTtlForCaching(): void
         ->willReturn(60);
 
         $this->artifactFetcherMock->expects($this->once())->method('cacheIt')
-            ->with($this->isString(), 60, 'uri');
+            ->with($this->isType('string'), 60, 'uri');
 
 
         $this->sut()->fromNetwork('uri');