Fix CI 2.x

lexik · Mar 24, 2024 · 60770f1 · 60770f1
1 parent d737b37
commit 60770f1
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 12 deletions.
diff --git a/Command/MigrateConfigCommand.php b/Command/MigrateConfigCommand.php
@@ -307,7 +307,6 @@ private function getKeySize(string $algorithm): int
             case 'HS512':
                 return 512;
             default:
-                dump($algorithm);
                 throw new \LogicException('Unsupported algorithm');
         }
     }

diff --git a/Resources/config/web_token_issuance.xml b/Resources/config/web_token_issuance.xml
@@ -11,9 +11,9 @@
             <argument type="service" id="Jose\Bundle\JoseFramework\Services\JWEBuilderFactory" on-invalid="null" />
             <argument /> <!-- Signature algorithm -->
             <argument /> <!-- Signature key -->
-            <argument on-invalid="null" /> <!-- Key encryption algorithm -->
-            <argument on-invalid="null" /> <!-- Content encryption algorithm -->
-            <argument on-invalid="null" /> <!-- Encryption key -->
+            <argument /> <!-- Key encryption algorithm -->
+            <argument /> <!-- Content encryption algorithm -->
+            <argument /> <!-- Encryption key -->
         </service>
     </services>
 </container>
diff --git a/Resources/config/web_token_verification.xml b/Resources/config/web_token_verification.xml
@@ -15,9 +15,9 @@
             <argument type="collection" /> <!-- Allowed signature algorithms -->
             <argument /> <!-- Signature keyset -->
             <argument on-invalid="null" /> <!-- Continue on decryption failure -->
-            <argument type="collection" on-invalid="null" /> <!-- JWE header checkers -->
-            <argument type="collection" on-invalid="null" /> <!-- Allowed key encryption algorithms -->
-            <argument type="collection" on-invalid="null" /> <!-- Allowed content encryption algorithms -->
+            <argument type="collection" /> <!-- JWE header checkers -->
+            <argument type="collection" /> <!-- Allowed key encryption algorithms -->
+            <argument type="collection" /> <!-- Allowed content encryption algorithms -->
             <argument on-invalid="null" /> <!-- Encryption keyset -->
         </service>
         <service id="lexik_jwt_authentication.web_token.iat_validator" class="Jose\Component\Checker\IssuedAtChecker" public="false">

diff --git a/Resources/doc/10-web-token.rst b/Resources/doc/10-web-token.rst
@@ -15,7 +15,7 @@ To enable this feature, you must install the following dependencies:
 
 .. code-block:: sh
 
-    composer require --no-update web-token/jwt-bundle
+    composer require web-token/jwt-bundle
 
 ## About Algorithms
 

diff --git a/Services/WebToken/AccessTokenBuilder.php b/Services/WebToken/AccessTokenBuilder.php
@@ -67,7 +67,7 @@ public function __construct(
     ) {
         $this->jwsBuilder = $jwsBuilderFactory->create([$signatureAlgorithm]);
         if ($jweBuilderFactory !== null && $keyEncryptionAlgorithm !== null && $contentEncryptionAlgorithm !== null) {
-            $this->jweBuilder = $jweBuilderFactory->create([$keyEncryptionAlgorithm], [$contentEncryptionAlgorithm], []);
+            $this->jweBuilder = $jweBuilderFactory->create([$keyEncryptionAlgorithm, $contentEncryptionAlgorithm]);
         }
         $this->signatureKey = JWK::createFromJson($signatureKey);
         $this->encryptionKey = $encryptionKey ? JWK::createFromJson($encryptionKey) : null;

diff --git a/Services/WebToken/AccessTokenLoader.php b/Services/WebToken/AccessTokenLoader.php
@@ -52,7 +52,7 @@ public function __construct(
     ) {
         $this->jwsLoader = $jwsLoaderFactory->create(['jws_compact'], $signatureAlgorithms, $jwsHeaderChecker);
         if ($jweLoaderFactory !== null && $keyEncryptionAlgorithms !== null && $contentEncryptionAlgorithms !== null && $jweHeaderChecker !== null) {
-            $this->jweLoader = $jweLoaderFactory->create(['jwe_compact'], $keyEncryptionAlgorithms, $contentEncryptionAlgorithms, [], $jweHeaderChecker);
+            $this->jweLoader = $jweLoaderFactory->create(['jwe_compact'], array_merge($keyEncryptionAlgorithms, $contentEncryptionAlgorithms), null, null, $jweHeaderChecker);
             $this->continueOnDecryptionFailure = $continueOnDecryptionFailure;
         }
         $this->signatureKeyset = JWKSet::createFromJson($signatureKeyset);

diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
@@ -28,7 +28,7 @@ class AppKernel extends Kernel
 
     private $testCase;
 
-    public function __construct($environment, $debug, $testCase = null)
+    public function __construct(string $environment, bool $debug, ?string $testCase = null)
     {
         parent::__construct($environment, $debug);
 

diff --git a/ecs.php b/ecs.php
@@ -9,7 +9,7 @@
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return static function (ECSConfig $config): void {
-    $config->sets([SetList::PSR_12, ]);
+    $config->sets([SetList::PSR_12]);
     $config->rule(OrderedImportsFixer::class);
     $config->ruleWithConfiguration(ArraySyntaxFixer::class, [
         'syntax' => 'short',