Merge branch '4.1.x' into 4.2.x

* 4.1.x:
  ci: make the mutation testing job run
  fix(core): bound the compact serializers' segment split
  ci: keep the console commands compatible with Symfony 7.0
  ci: stop running the test matrix through castor
  ci: make the workflow install the dependencies it analyses
  test(bundle): repair the configuration assertions on current PHPUnit
  ci: make ECS, PHPStan and Rector run again on 4.1.x
  fix(composer): mirror the brick/math range in the library sub-package
  fix(composer): update brick/math version range to include 0.18 and 0.19
  fix(bundle): alias the nested token services with their own class
  fix(bundle): align the web debug toolbar item with the Symfony core styles
  fix(core): correct the parameter types of the nested token builder

# Conflicts:
#	.ci-tools/phpstan-baseline.neon
#	src/Library/Checker/HeaderCheckerManager.php
#	src/Library/KeyManagement/Analyzer/UsageAnalyzer.php

Author: Spomky

.ci-tools/infection.json.dist

@@ -1,7 +1,7 @@
 {
     "source": {
         "directories": [
-            "src"
+            "../src"
         ]
     },
     "timeout": 3,

.ci-tools/phpstan-baseline.neon

@@ -4506,12 +4506,6 @@ parameters:
 			count: 2
 			path: ../src/Library/Encryption/JWEBuilder.php
 
-		-
-			rawMessage: 'Method Jose\Component\Encryption\JWEBuilder::addRecipient() has parameter $recipientHeader with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../src/Library/Encryption/JWEBuilder.php
-
 		-
 			rawMessage: 'Method Jose\Component\Encryption\JWEBuilder::checkAndSetContentEncryptionAlgorithm() has parameter $completeHeader with no value type specified in iterable type array.'
 			identifier: missingType.iterableValue
@@ -4614,18 +4608,6 @@ parameters:
 			count: 1
 			path: ../src/Library/Encryption/JWEBuilder.php
 
-		-
-			rawMessage: 'Method Jose\Component\Encryption\JWEBuilder::withSharedHeader() has parameter $sharedHeader with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../src/Library/Encryption/JWEBuilder.php
-
-		-
-			rawMessage: 'Method Jose\Component\Encryption\JWEBuilder::withSharedProtectedHeader() has parameter $sharedProtectedHeader with no value type specified in iterable type array.'
-			identifier: missingType.iterableValue
-			count: 1
-			path: ../src/Library/Encryption/JWEBuilder.php
-
 		-
 			rawMessage: 'Parameter #1 $algorithm of method Jose\Component\Core\AlgorithmManager::get() expects string, mixed given.'
 			identifier: argument.type
@@ -5286,16 +5268,10 @@ parameters:
 			count: 1
 			path: ../src/Library/KeyManagement/UrlKeySetFactory.php
 
-		-
-			rawMessage: 'Call to function assert() with true will always evaluate to true.'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: ../src/Library/KeyManagement/UrlKeySetFactory.php
-
 		-
 			rawMessage: Instanceof between Symfony\Contracts\HttpClient\HttpClientInterface and Symfony\Contracts\HttpClient\HttpClientInterface will always evaluate to true.
 			identifier: instanceof.alwaysTrue
-			count: 2
+			count: 1
 			path: ../src/Library/KeyManagement/UrlKeySetFactory.php
 
 		-
@@ -5340,30 +5316,6 @@ parameters:
 			count: 1
 			path: ../src/Library/Signature/Algorithm/Util/RSA.php
 
-		-
-			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<string, mixed> given.'
-			identifier: argument.type
-			count: 1
-			path: ../src/Library/Signature/JWS.php
-
-		-
-			rawMessage: 'Parameter #4 $header of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<string, mixed> given.'
-			identifier: argument.type
-			count: 1
-			path: ../src/Library/Signature/JWS.php
-
-		-
-			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<string, mixed> given.'
-			identifier: argument.type
-			count: 1
-			path: ../src/Library/Signature/JWSBuilder.php
-
-		-
-			rawMessage: 'Parameter #4 $header of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<string, mixed> given.'
-			identifier: argument.type
-			count: 1
-			path: ../src/Library/Signature/JWSBuilder.php
-
 		-
 			rawMessage: 'Parameter #1 $algorithm of method Jose\Component\Core\AlgorithmManager::get() expects string, mixed given.'
 			identifier: argument.type
@@ -5383,7 +5335,7 @@ parameters:
 			path: ../src/Library/Signature/Serializer/CompactSerializer.php
 
 		-
-			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<mixed, mixed> given.'
+			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array<string, mixed>, array<mixed, mixed> given.'
 			identifier: argument.type
 			count: 1
 			path: ../src/Library/Signature/Serializer/CompactSerializer.php
@@ -5413,7 +5365,7 @@ parameters:
 			path: ../src/Library/Signature/Serializer/JSONFlattenedSerializer.php
 
 		-
-			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<mixed> given.'
+			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array<string, mixed>, array<mixed> given.'
 			identifier: argument.type
 			count: 1
 			path: ../src/Library/Signature/Serializer/JSONFlattenedSerializer.php
@@ -5425,7 +5377,7 @@ parameters:
 			path: ../src/Library/Signature/Serializer/JSONFlattenedSerializer.php
 
 		-
-			rawMessage: 'Parameter #4 $header of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, array<mixed> given.'
+			rawMessage: 'Parameter #4 $header of method Jose\Component\Signature\JWS::addSignature() expects array<string, mixed>, array<mixed> given.'
 			identifier: argument.type
 			count: 1
 			path: ../src/Library/Signature/Serializer/JSONFlattenedSerializer.php
@@ -5467,7 +5419,7 @@ parameters:
 			path: ../src/Library/Signature/Serializer/JSONGeneralSerializer.php
 
 		-
-			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, mixed given.'
+			rawMessage: 'Parameter #2 $protectedHeader of method Jose\Component\Signature\JWS::addSignature() expects array<string, mixed>, mixed given.'
 			identifier: argument.type
 			count: 1
 			path: ../src/Library/Signature/Serializer/JSONGeneralSerializer.php
@@ -5485,8 +5437,7 @@ parameters:
 			path: ../src/Library/Signature/Serializer/JSONGeneralSerializer.php
 
 		-
-			rawMessage: 'Parameter #4 $header of method Jose\Component\Signature\JWS::addSignature() expects array{alg?: string, string?: mixed}, mixed given.'
+			rawMessage: 'Parameter #4 $header of method Jose\Component\Signature\JWS::addSignature() expects array<string, mixed>, mixed given.'
 			identifier: argument.type
 			count: 1
 			path: ../src/Library/Signature/Serializer/JSONGeneralSerializer.php
-

.ci-tools/phpunit.xml.dist

@@ -5,6 +5,7 @@
     colors="true"
     xsi:noNamespaceSchemaLocation="phpunit.xsd"
     cacheDirectory=".phpunit.cache"
+    executionOrder="default"
 >
 <coverage/>
 <testsuites>
@@ -27,7 +28,4 @@
       <directory>./../tests</directory>
     </exclude>
   </source>
-  <extensions>
-    <bootstrap class="Ergebnis\PHPUnit\SlowTestDetector\Extension"/>
-  </extensions>
 </phpunit>

.ci-tools/rector.php

@@ -6,8 +6,10 @@
 use Rector\Doctrine\Set\DoctrineSetList;
 use Rector\PHPUnit\CodeQuality\Rector\Class_\PreferPHPUnitThisCallRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\Symfony\Symfony73\Rector\Class_\CommandHelpToAttributeRector;
 use Rector\ValueObject\PhpVersion;
 
 $builder = RectorConfig::configure();
@@ -21,7 +23,6 @@
     DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
     PHPUnitSetList::PHPUNIT_CODE_QUALITY,
     PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES,
-    PHPUnitSetList::PHPUNIT_120,
 ]);
 $builder->withComposerBased(twig: true, doctrine: true, phpunit: true, symfony: true);
 $builder->withPhpVersion(PhpVersion::PHP_82);
@@ -37,6 +38,8 @@
 );
 $builder->withSkip([
     PreferPHPUnitThisCallRector::class,
+    RenameMethodRector::class => [__DIR__ . '/../tests'],
+    CommandHelpToAttributeRector::class,
     __DIR__ . '/../src/Library/Core/JWKSet.php',
     __DIR__ . '/../src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSource.php',
     __DIR__ . '/../src/Bundle/JoseFramework/DependencyInjection/Source/KeyManagement/JWKSetSource.php',

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - id: cache-key-generator
-        run: echo "key=composer-${{ runner.os }}-${{ hashFiles('composer.lock') }}" >> $GITHUB_OUTPUT
+        run: echo "key=composer-${{ runner.os }}-${{ hashFiles('composer.json', 'src/*/composer.json') }}" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v4
         with:
@@ -205,7 +205,11 @@ jobs:
           fi
 
       - name: Run PHPUnit
-        run: castor phpunit
+        run: |
+          composer exec -- phpunit-11 \
+            --coverage-xml .ci-tools/coverage \
+            --log-junit=.ci-tools/coverage/junit.xml \
+            --configuration .ci-tools/phpunit.xml.dist
 
   infection:
     name: "🧬 Mutation Testing"
@@ -218,6 +222,20 @@ jobs:
       XDEBUG_MODE: coverage
     steps:
       - uses: actions/checkout@v5
+      - uses: actions/cache@v4
+        with:
+          path: |
+            vendor
+            ~/.composer/cache
+          key: ${{ needs.prepare_dependencies.outputs.cache-key }}
+      - name: Install dependencies
+        run: composer install --no-interaction --no-progress
+      - name: Generate coverage reports
+        run: |
+          composer exec -- phpunit-11 \
+            --coverage-xml .ci-tools/coverage \
+            --log-junit=.ci-tools/coverage/junit.xml \
+            --configuration .ci-tools/phpunit.xml.dist
       - name: Execute Infection
         run: castor infect
 

src/Bundle/DependencyInjection/Configuration.php

@@ -15,8 +15,8 @@
      * @param Source[] $sources
      */
     public function __construct(
-        private readonly string $alias,
-        private readonly array $sources
+        private string $alias,
+        private array $sources
     ) {
     }
 

src/Bundle/DependencyInjection/Source/Checker/CheckerSource.php

@@ -23,7 +23,7 @@
     /**
      * @var Source[]
      */
-    private readonly array $sources;
+    private array $sources;
 
     public function __construct()
     {

src/Bundle/DependencyInjection/Source/Encryption/EncryptionSource.php

@@ -33,7 +33,7 @@
     /**
      * @var Source[]
      */
-    private readonly array $sources;
+    private array $sources;
 
     public function __construct()
     {

src/Bundle/DependencyInjection/Source/KeyManagement/KeyManagementSource.php

@@ -24,7 +24,7 @@
     /**
      * @var Source[]
      */
-    private readonly array $sources;
+    private array $sources;
 
     public function __construct()
     {

src/Bundle/DependencyInjection/Source/NestedToken/NestedToken.php

@@ -18,7 +18,7 @@
     /**
      * @var Source[]
      */
-    private readonly array $sources;
+    private array $sources;
 
     public function __construct()
     {