Merge pull request #24 from facile-it/dependencies-update-2026-01

thomasvargiu · web-flow · commit 513de20772b8 · 2026-01-02T12:41:21.000+01:00
dependencies update 2026-01
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,7 @@
-ARG PHP_VERSION=8.0
-FROM php:8.0-cli-alpine
+ARG PHP_VERSION=8.1
+FROM php:8.1-cli-alpine
 RUN apk add --no-cache gmp-dev && docker-php-ext-install -j$(nproc) gmp
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php -r "if (hash_file('sha384', 'composer-setup.php') === '55ce33d7678c5a611085589f1f3ddf8b3c52d662cd01d4ba75c0ee0459970c2200a51f492d557530c71c15d8dba01eae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
     && php composer-setup.php \
     && php -r "unlink('composer-setup.php');" \
     && mv composer.phar /usr/local/bin/composer
diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         "psr/http-message": "^1.0 || ^2.0",
         "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
         "spomky-labs/base64url": "^2.0.1",
-        "symfony/http-client": "^6.0 || ^7.0",
+        "symfony/http-client": "^6.0 || ^7.0 || ^8.0",
         "symfony/polyfill-mbstring": "^1.15",
         "web-token/jwt-library": "^3.4"
     },
@@ -58,14 +58,12 @@
         }
     },
     "require-dev": {
-        "facile-it/facile-coding-standard": "^1.2.0",
-        "friendsofphp/php-cs-fixer": "^3.14.3",
+        "facile-it/facile-coding-standard": "^1.4.1",
+        "friendsofphp/php-cs-fixer": "^3.92.3",
         "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.5.20 || ^11.1.0",
+        "phpunit/phpunit": "^10.5.60 || ^11.5.46 || ^12.0.0",
         "spomky-labs/aes-key-wrap": "^7.0",
-        "vimeo/psalm": "^5.23.1",
-        "web-token/jwt-library": "^3.4.3"
+        "vimeo/psalm": "^6.14.3"
     },
     "scripts": {
         "cs-check": "php-cs-fixer fix --dry-run --diff --allow-risky=yes",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
diff --git a/psalm.xml b/psalm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
-    phpVersion="8.2"
+    phpVersion="8.1"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
@@ -26,6 +26,7 @@
 
     <issueHandlers>
         <InvalidCatch errorLevel="suppress" />
+        <MissingOverrideAttribute errorLevel="suppress" />
     </issueHandlers>
 
     <stubs>
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -4,4 +4,7 @@
 
 namespace Facile\JoseVerifier\Exception;
 
+/**
+ * @psalm-api
+ */
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface {}
diff --git a/src/Exception/InvalidTokenClaimException.php b/src/Exception/InvalidTokenClaimException.php
@@ -19,7 +19,7 @@ class InvalidTokenClaimException extends RuntimeException implements InvalidToke
     /**
      * @param mixed $value
      */
-    public function __construct(string $message, string $claim, $value, Throwable $previous = null)
+    public function __construct(string $message, string $claim, $value, ?Throwable $previous = null)
     {
         parent::__construct($message, 0, $previous);
         $this->claim = $claim;
diff --git a/src/Exception/InvalidTokenException.php b/src/Exception/InvalidTokenException.php
@@ -4,4 +4,7 @@
 
 namespace Facile\JoseVerifier\Exception;
 
+/**
+ * @psalm-api
+ */
 class InvalidTokenException extends RuntimeException implements InvalidTokenExceptionInterface {}
diff --git a/src/Exception/LogicException.php b/src/Exception/LogicException.php
@@ -4,4 +4,7 @@
 
 namespace Facile\JoseVerifier\Exception;
 
+/**
+ * @psalm-api
+ */
 class LogicException extends \LogicException implements ExceptionInterface {}
diff --git a/tests/IdTokenVerifierTest.php b/tests/IdTokenVerifierTest.php
@@ -14,6 +14,7 @@
 use Facile\JoseVerifier\IdTokenVerifier;
 use Facile\JoseVerifier\JWK\MemoryJwksProvider;
 use Jose\Component\KeyManagement\JWKFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 use function Facile\JoseVerifier\jose_secret_key;
 use function random_bytes;
@@ -493,10 +494,9 @@ public static function verifyIdTokenProvider(): array
     }
 
     /**
-     * @dataProvider verifyIdTokenProvider
-     *
      * @throws Exception
      */
+    #[DataProvider('verifyIdTokenProvider')]
     public function testValidateIdTokenWithAsyKey(array $payload, bool $expected): void
     {
         if (! $expected) {
diff --git a/tests/JWTVerifierTest.php b/tests/JWTVerifierTest.php
@@ -12,6 +12,7 @@
 use Facile\JoseVerifier\JWK\MemoryJwksProvider;
 use Facile\JoseVerifier\JWTVerifier;
 use Jose\Component\KeyManagement\JWKFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 use function Facile\JoseVerifier\jose_secret_key;
 use function random_bytes;
@@ -226,10 +227,9 @@ public static function verifyTokenProvider(): array
     }
 
     /**
-     * @dataProvider verifyTokenProvider
-     *
      * @throws Exception
      */
+    #[DataProvider('verifyTokenProvider')]
     public function testValidateTokenWithAsyKey(array $payload, bool $expected): void
     {
         if (! $expected) {
diff --git a/tests/UserInfoVerifierTest.php b/tests/UserInfoVerifierTest.php
@@ -13,6 +13,7 @@
 use Facile\JoseVerifier\JWK\MemoryJwksProvider;
 use Facile\JoseVerifier\UserInfoVerifier;
 use Jose\Component\KeyManagement\JWKFactory;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 use function Facile\JoseVerifier\jose_secret_key;
 use function random_bytes;
@@ -127,10 +128,9 @@ public static function verifyTokenProvider(): array
     }
 
     /**
-     * @dataProvider verifyTokenProvider
-     *
      * @throws Exception
      */
+    #[DataProvider('verifyTokenProvider')]
     public function testValidateTokenWithAsyKey(array $payload, bool $expected): void
     {
         if (! $expected) {
diff --git a/tests/functions/DerivedKeyTest.php b/tests/functions/DerivedKeyTest.php
@@ -4,15 +4,14 @@
 
 namespace Facile\JoseVerifier\Test\functions;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function Facile\JoseVerifier\derived_key;
 
 class DerivedKeyTest extends TestCase
 {
-    /**
-     * @dataProvider valuesProvider
-     */
+    #[DataProvider('valuesProvider')]
     public function testDerivedKey(string $secret, int $length, string $expected): void
     {
         $jwk = derived_key($secret, $length);
diff --git a/tests/functions/JoseSecretKeyTest.php b/tests/functions/JoseSecretKeyTest.php
@@ -4,15 +4,14 @@
 
 namespace Facile\JoseVerifier\Test\functions;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use function Facile\JoseVerifier\jose_secret_key;
 
 class JoseSecretKeyTest extends TestCase
 {
-    /**
-     * @dataProvider valuesProvider
-     */
+    #[DataProvider('valuesProvider')]
     public function testJoseSecretKey(string $secret, string $alg, string $expected): void
     {
         $jwk = jose_secret_key($secret, $alg);

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class InvalidTokenClaimException extends RuntimeException implements InvalidToke`
`19`	`19`	`/**`
`20`	`20`	`* @param mixed $value`
`21`	`21`	`*/`
`22`		`- public function __construct(string $message, string $claim, $value, Throwable $previous = null)`
	`22`	`+ public function __construct(string $message, string $claim, $value, ?Throwable $previous = null)`
`23`	`23`	`{`
`24`	`24`	`parent::__construct($message, 0, $previous);`
`25`	`25`	`$this->claim = $claim;`