Merge branch 'master' into dependabot/composer/production-dependencie…

…s-b067fb6425

README.md

@@ -3,9 +3,9 @@
 [![Build Status](https://github.com/simplesamlphp/openid/actions/workflows/php.yml/badge.svg)](https://github.com/simplesamlphp/openid/actions/workflows/php.yml)
 [![Coverage Status](https://codecov.io/gh/simplesamlphp/openid/branch/master/graph/badge.svg)](https://app.codecov.io/gh/simplesamlphp/openid)
 
-WARNING: this library is under heavy development and should not be used in production!
+The library is under development, and you can expect braking changes along the way.
 
-This library provides some common tools that you might find useful when working with OpenID family of specifications.
+The library provides some common tools that you might find useful when working with OpenID family of specifications.
 
 ## Installation
 
@@ -15,7 +15,7 @@ Library can be installed by using Composer:
 composer require simplesamlphp/openid
 ```
 
-## OpenID Federation
+## OpenID Federation (draft 41)
 
 The initial functionality of the library revolves around the OpenID Federation specification. To use it, create an
 instance of the class `\SimpleSAML\OpenID\Federation`

composer.json

@@ -32,11 +32,12 @@
         "web-token/jwt-library": "^3.4 || ^4.0"
     },
     "require-dev": {
+        "phpstan/phpstan": "^2.1",
         "phpunit/phpunit": "^10",
+        "rector/rector": "^2.0",
+        "simplesamlphp/simplesamlphp-test-framework": "^1",
         "squizlabs/php_codesniffer": "^3",
-        "vimeo/psalm": "^5",
-        "rector/rector": "^1 || ^2",
-        "simplesamlphp/simplesamlphp-test-framework": "^1"
+        "vimeo/psalm": "^5"
     },
     "config": {
         "sort-packages": true,
@@ -50,6 +51,7 @@
         "pre-commit": [
             "vendor/bin/phpcs -p",
             "vendor/bin/psalm --no-cache",
+            "vendor/bin/rector --dry-run",
             "vendor/bin/phpunit --no-coverage"
         ]
     }

phpstan-dev.neon

@@ -0,0 +1,6 @@
+
+parameters:
+	level: 0
+	paths:
+		- tests
+    tmpDir: build/phpstan

phpstan.neon

@@ -0,0 +1,6 @@
+
+parameters:
+	level: 6
+	paths:
+		- src
+	tmpDir: build/phpstan

rector.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    // uncomment to reach your current PHP version
+    ->withPhpSets()
+    ->withTypeCoverageLevel(1000)
+    ->withDeadCodeLevel(1000)
+    ->withCodeQualityLevel(1000)
+    ;

src/Algorithms/SignatureAlgorithmBag.php

@@ -4,6 +4,8 @@
 
 namespace SimpleSAML\OpenID\Algorithms;
 
+use Jose\Component\Signature\Algorithm\SignatureAlgorithm;
+
 class SignatureAlgorithmBag
 {
     /** @var \SimpleSAML\OpenID\Algorithms\SignatureAlgorithmEnum[]  */
@@ -33,9 +35,9 @@ public function getAll(): array
     public function getAllInstances(): array
     {
         return array_map(
-            function (SignatureAlgorithmEnum $signatureAlgorithmEnum) {
-                return $signatureAlgorithmEnum->instance();
-            },
+            fn(
+                SignatureAlgorithmEnum $signatureAlgorithmEnum,
+            ): SignatureAlgorithm => $signatureAlgorithmEnum->instance(),
             $this->getAll(),
         );
     }

src/Codebooks/ContentTypesEnum.php

@@ -6,5 +6,6 @@
 
 enum ContentTypesEnum: string
 {
+    case ApplicationJwt = 'application/jwt';
     case ApplicationEntityStatementJwt = 'application/entity-statement+jwt';
 }