Merge release 3.1.6 into 3.2.x

.github/workflows/tweet.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Tweet
-        uses: snow-actions/tweet@v1
+        uses: snow-actions/tweet@v1.4.0
         with:
           status: |
             We are proud to announce that ${{ github.repository }} · ${{ github.event.release.name }}

composer.json

@@ -57,7 +57,7 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "ext-sodium": "*",
-        "brick/math": "^0.9|^0.10",
+        "brick/math": "^0.9|^0.10|^0.11",
         "paragonie/constant_time_encoding": "^2.4",
         "psr/event-dispatcher": "^1.0",
         "psr/http-client": "^1.0",

phpstan.neon

@@ -6,7 +6,11 @@ parameters:
     checkGenericClassInNonGenericObjectType: false
     treatPhpDocTypesAsCertain: false
     checkUninitializedProperties: true
+    checkDynamicProperties: true
     ignoreErrors:
+        - "#Method [a-zA-Z0-9\\_\\\\:\\(\\)]+ has parameter \\$[a-zA-Z0-9_]+ with no value type specified in iterable type array#"
+        - "#Method [a-zA-Z0-9\\_\\\\:\\(\\)]+ return type has no value type specified in iterable type array#"
+        - "#Property [a-zA-Z0-9\\$\\_\\\\:\\(\\)]+ type has no value type specified in iterable type array#"
         - '#Variable static method call on Jose\\Component\\Core\\Util\\Hash\.#'
         - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)#'
         - '#Invalid type object to throw\.#'

src/Bundle/JoseFramework/DataCollector/AlgorithmCollector.php

@@ -22,6 +22,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
     {
         $algorithms = $this->algorithmManagerFactory->all();
@@ -90,6 +93,9 @@ private function getAlgorithmType(
         }
     }
 
+    /**
+     * @return array<string, array<string, string>>
+     */
     private function getAlgorithmMessages(): array
     {
         return [

src/Bundle/JoseFramework/DataCollector/CheckerCollector.php

@@ -15,26 +15,39 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Throwable;
 
 class CheckerCollector implements Collector, EventSubscriberInterface
 {
+    /**
+     * @var array<Data>
+     */
     private array $headerCheckedSuccesses = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $headerCheckedFailures = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $claimCheckedSuccesses = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $claimCheckedFailures = [];
 
     /**
-     * @var HeaderCheckerManager[]
+     * @var array<HeaderCheckerManager>
      */
     private array $headerCheckerManagers = [];
 
     /**
-     * @var ClaimCheckerManager[]
+     * @var array<ClaimCheckerManager>
      */
     private array $claimCheckerManagers = [];
 
@@ -44,6 +57,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
     {
         $this->collectHeaderCheckerManagers($data);
@@ -97,6 +113,9 @@ public function catchClaimCheckFailure(ClaimCheckedFailureEvent $event): void
         $this->claimCheckedFailures[] = $cloner->cloneVar($event);
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectHeaderCheckerManagers(array &$data): void
     {
         $data['checker']['header_checker_managers'] = [];
@@ -111,6 +130,9 @@ private function collectHeaderCheckerManagers(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedHeaderCheckers(array &$data): void
     {
         $data['checker']['header_checkers'] = [];
@@ -125,6 +147,9 @@ private function collectSupportedHeaderCheckers(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectClaimCheckerManagers(array &$data): void
     {
         $data['checker']['claim_checker_managers'] = [];
@@ -138,6 +163,9 @@ private function collectClaimCheckerManagers(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedClaimCheckers(array &$data): void
     {
         $data['checker']['claim_checkers'] = [];
@@ -151,6 +179,9 @@ private function collectSupportedClaimCheckers(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectEvents(array &$data): void
     {
         $data['checker']['events'] = [

src/Bundle/JoseFramework/DataCollector/Collector.php

@@ -10,5 +10,8 @@
 
 interface Collector
 {
+    /**
+     * @param array<string, mixed> $data
+     */
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void;
 }

src/Bundle/JoseFramework/DataCollector/JWECollector.php

@@ -16,31 +16,44 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Throwable;
 
 class JWECollector implements Collector, EventSubscriberInterface
 {
+    /**
+     * @var array<Data>
+     */
     private array $jweDecryptionSuccesses = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jweDecryptionFailures = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jweBuiltSuccesses = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jweBuiltFailures = [];
 
     /**
-     * @var JWEBuilder[]
+     * @var array<JWEBuilder>
      */
     private array $jweBuilders = [];
 
     /**
-     * @var JWEDecrypter[]
+     * @var array<JWEDecrypter>
      */
     private array $jweDecrypters = [];
 
     /**
-     * @var JWELoader[]
+     * @var array<JWELoader>
      */
     private array $jweLoaders = [];
 
@@ -50,6 +63,9 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
     {
         $this->collectSupportedCompressionMethods($data);
@@ -109,6 +125,9 @@ public function catchJweBuiltFailure(JWEBuiltFailureEvent $event): void
         $this->jweBuiltFailures[] = $cloner->cloneVar($event);
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedCompressionMethods(array &$data): void
     {
         $data['jwe']['compression_methods'] = [];
@@ -121,6 +140,9 @@ private function collectSupportedCompressionMethods(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWESerializations(array &$data): void
     {
         $data['jwe']['jwe_serialization'] = [];
@@ -133,6 +155,9 @@ private function collectSupportedJWESerializations(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWEBuilders(array &$data): void
     {
         $data['jwe']['jwe_builders'] = [];
@@ -148,6 +173,9 @@ private function collectSupportedJWEBuilders(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWEDecrypters(array &$data): void
     {
         $data['jwe']['jwe_decrypters'] = [];
@@ -163,6 +191,9 @@ private function collectSupportedJWEDecrypters(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWELoaders(array &$data): void
     {
         $data['jwe']['jwe_loaders'] = [];
@@ -183,6 +214,9 @@ private function collectSupportedJWELoaders(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectEvents(array &$data): void
     {
         $data['jwe']['events'] = [

src/Bundle/JoseFramework/DataCollector/JWSCollector.php

@@ -15,13 +15,14 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Throwable;
 
 class JWSCollector implements Collector, EventSubscriberInterface
 {
     /**
-     * @var JWSBuilder[]
+     * @var array<JWSBuilder>
      */
     private array $jwsBuilders = [];
 
@@ -35,19 +36,34 @@ class JWSCollector implements Collector, EventSubscriberInterface
      */
     private array $jwsLoaders = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jwsVerificationSuccesses = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jwsVerificationFailures = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jwsBuiltSuccesses = [];
 
+    /**
+     * @var array<Data>
+     */
     private array $jwsBuiltFailures = [];
 
     public function __construct(
         private readonly ?JWSSerializerManagerFactory $jwsSerializerManagerFactory = null
     ) {
     }
 
+    /**
+     * @param array<string, mixed> $data
+     */
     public function collect(array &$data, Request $request, Response $response, ?Throwable $exception = null): void
     {
         $this->collectSupportedJWSSerializations($data);
@@ -106,6 +122,9 @@ public function catchJwsBuiltFailure(JWSBuiltFailureEvent $event): void
         $this->jwsBuiltFailures[] = $cloner->cloneVar($event);
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWSSerializations(array &$data): void
     {
         $data['jws']['jws_serialization'] = [];
@@ -118,6 +137,9 @@ private function collectSupportedJWSSerializations(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWSBuilders(array &$data): void
     {
         $data['jws']['jws_builders'] = [];
@@ -129,6 +151,9 @@ private function collectSupportedJWSBuilders(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWSVerifiers(array &$data): void
     {
         $data['jws']['jws_verifiers'] = [];
@@ -140,6 +165,9 @@ private function collectSupportedJWSVerifiers(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectSupportedJWSLoaders(array &$data): void
     {
         $data['jws']['jws_loaders'] = [];
@@ -154,6 +182,9 @@ private function collectSupportedJWSLoaders(array &$data): void
         }
     }
 
+    /**
+     * @param array<string, array<string, mixed>> $data
+     */
     private function collectEvents(array &$data): void
     {
         $data['jws']['events'] = [

src/Bundle/JoseFramework/DataCollector/JoseCollector.php

@@ -34,6 +34,9 @@ public function getName(): string
         return 'jose_collector';
     }
 
+    /**
+     * @return array<string, mixed>|Data
+     */
     public function getData(): array|Data
     {
         return $this->data;