Deps/ecs rector dependencies (#535)

* Cleanup dependencies, Rector and ECS
web-token · Mar 1, 2024 · 5268df5 · 5268df5
1 parent d81a4f7
commit 5268df5
Show file tree

Hide file tree

Showing 358 changed files with 1,857 additions and 973 deletions.
diff --git a/composer.json b/composer.json
@@ -51,8 +51,6 @@
         "ext-mbstring": "*",
         "ext-openssl": "*",
         "brick/math": "^0.12",
-        "paragonie/constant_time_encoding": "^2.6",
-        "paragonie/sodium_compat": "^1.20",
         "psr/clock": "^1.0",
         "psr/event-dispatcher": "^1.0",
         "spomky-labs/pki-framework": "^1.1",
@@ -67,11 +65,11 @@
         "ext-curl": "*",
         "ext-gmp": "*",
         "ext-sodium": "*",
-        "bjeavons/zxcvbn-php": "^1.3",
         "ekino/phpstan-banned-code": "^1.0",
         "infection/infection": "^0.27",
         "matthiasnoback/symfony-config-test": "^5.0",
         "nikic/php-parser": "^4.18",
+        "paragonie/sodium_compat": "^1.20",
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpbench/phpbench": "^1.2",
         "phpstan/extension-installer": "^1.3",
@@ -100,7 +98,6 @@
         "web-token/jwt-experimental": "self.version"
     },
     "suggest": {
-        "bjeavons/zxcvbn-php": "Adds key quality check for oct keys.",
         "symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens.",
         "symfony/var-dumper": "Used to show data on the debug toolbar.",
         "spomky-labs/aes-key-wrap": "To enable AES Key Wrap algorithm."

diff --git a/deptrac.yaml b/deptrac.yaml
@@ -15,7 +15,7 @@ parameters:
       collectors:
         - { type: className, regex: '^Symfony\\' }
         - { type: className, regex: '^SpomkyLabs\\Pki\\' }
-        - { type: className, regex: '^ParagonIE\\' }
+        - { type: className, regex: '^ParagonIE\\Sodium\\' }
         - { type: className, regex: '^Psr\\EventDispatcher\\' }
         - { type: className, regex: '^Psr\\Clock\\' }
         - { type: className, regex: '^Brick\\Math\\' }

diff --git a/performance/JWE/A128GCMKWBench.php b/performance/JWE/A128GCMKWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class A128GCMKWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/A128KWBench.php b/performance/JWE/A128KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class A128KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/A192GCMKWBench.php b/performance/JWE/A192GCMKWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class A192GCMKWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/A192KWBench.php b/performance/JWE/A192KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class A192KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/A256GCMKWBench.php b/performance/JWE/A256GCMKWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class A256GCMKWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/A256KWBench.php b/performance/JWE/A256KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class A256KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/ECDHESA128KWBench.php b/performance/JWE/ECDHESA128KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class ECDHESA128KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -179,6 +181,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -216,6 +219,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/ECDHESA192KWBench.php b/performance/JWE/ECDHESA192KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class ECDHESA192KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -179,6 +181,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -216,6 +219,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/ECDHESA256KWBench.php b/performance/JWE/ECDHESA256KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class ECDHESA256KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -179,6 +181,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -216,6 +219,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/ECDHESBench.php b/performance/JWE/ECDHESBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class ECDHESBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -251,6 +253,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -288,6 +291,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';

diff --git a/performance/JWE/PBES2HS256A128KWBench.php b/performance/JWE/PBES2HS256A128KWBench.php
@@ -4,6 +4,7 @@
 
 namespace Jose\Performance\JWE;
 
+use Override;
 use PhpBench\Benchmark\Metadata\Annotations\Groups;
 use PhpBench\Benchmark\Metadata\Annotations\Revs;
 
@@ -13,6 +14,7 @@
  */
 final class PBES2HS256A128KWBench extends EncryptionBench
 {
+    #[Override]
     public function dataHeadersAndAlgorithms(): array
     {
         return [
@@ -90,6 +92,7 @@ public function dataPrivateKeys(): array
         ];
     }
 
+    #[Override]
     public function dataRecipientPublicKeys(): array
     {
         return [
@@ -102,6 +105,7 @@ public function dataRecipientPublicKeys(): array
         ];
     }
 
+    #[Override]
     protected function getAAD(): ?string
     {
         return 'A,B,C,D';