Skip to content

Commit a6bb861

Browse files
committed
Merge small libs to jwt-library
1 parent 4eb3429 commit a6bb861

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+249
-257
lines changed

.gitsplit.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
splits:
2-
- prefix: "src/Component/Core"
3-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git"
4-
- prefix: "src/Component/Checker"
2+
- prefix: "src/Deprecated/Checker"
53
target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git"
6-
- prefix: "src/Component/Signature"
7-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
8-
- prefix: "src/Component/Encryption"
4+
- prefix: "src/Deprecated/Console"
5+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git"
6+
- prefix: "src/Deprecated/Core"
7+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git"
8+
- prefix: "src/Deprecated/Ecc"
9+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git"
10+
- prefix: "src/Deprecated/Encryption"
911
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption.git"
10-
- prefix: "src/Component/KeyManagement"
12+
- prefix: "src/Deprecated/KeyManagement"
1113
target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git"
12-
- prefix: "src/Component/Console"
13-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git"
14-
- prefix: "src/Component/NestedToken"
14+
- prefix: "src/Deprecated/NestedToken"
1515
target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git"
16+
- prefix: "src/Deprecated/Signature"
17+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
1618
- prefix: "src/JoseFramework"
1719
target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git"
20+
- prefix: "src/Component"
21+
target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
1822
- prefix: "src/EncryptionAlgorithm/ContentEncryption/AESCBC"
1923
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git"
2024
- prefix: "src/EncryptionAlgorithm/ContentEncryption/AESGCM"
@@ -47,8 +51,6 @@ splits:
4751
target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git"
4852
- prefix: "src/Experimental"
4953
target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
50-
- prefix: "src/Ecc"
51-
target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git"
5254
- prefix: "packs/encryption"
5355
target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
5456
- prefix: "packs/signature"

composer.json

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,46 +37,26 @@
3737
"Jose\\": "src/",
3838
"Jose\\Bundle\\JoseFramework\\": "src/JoseFramework/",
3939
"Jose\\Experimental\\": "src/Experimental/",
40-
"Jose\\Component\\Checker\\": "src/Component/Checker/",
41-
"Jose\\Component\\Console\\": "src/Component/Console/",
42-
"Jose\\Component\\Core\\": "src/Component/Core/",
43-
"Jose\\Component\\Encryption\\": "src/Component/Encryption/",
40+
"Jose\\Component\\": "src/Component/",
4441
"Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": [
4542
"src/EncryptionAlgorithm/ContentEncryption/AESCBC",
46-
"src/EncryptionAlgorithm/ContentEncryption/AESCBC/",
47-
"src/EncryptionAlgorithm/ContentEncryption/AESGCM",
48-
"src/EncryptionAlgorithm/ContentEncryption/AESGCM/"
43+
"src/EncryptionAlgorithm/ContentEncryption/AESGCM"
4944
],
5045
"Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": [
5146
"src/EncryptionAlgorithm/KeyEncryption/AESGCMKW",
52-
"src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/",
5347
"src/EncryptionAlgorithm/KeyEncryption/AESKW",
54-
"src/EncryptionAlgorithm/KeyEncryption/AESKW/",
5548
"src/EncryptionAlgorithm/KeyEncryption/Direct",
56-
"src/EncryptionAlgorithm/KeyEncryption/Direct/",
5749
"src/EncryptionAlgorithm/KeyEncryption/ECDHES",
58-
"src/EncryptionAlgorithm/KeyEncryption/ECDHES/",
5950
"src/EncryptionAlgorithm/KeyEncryption/PBES2",
60-
"src/EncryptionAlgorithm/KeyEncryption/PBES2/",
61-
"src/EncryptionAlgorithm/KeyEncryption/RSA",
62-
"src/EncryptionAlgorithm/KeyEncryption/RSA/"
51+
"src/EncryptionAlgorithm/KeyEncryption/RSA"
6352
],
64-
"Jose\\Component\\KeyManagement\\": "src/Component/KeyManagement/",
65-
"Jose\\Component\\NestedToken\\": "src/Component/NestedToken/",
66-
"Jose\\Component\\Signature\\": "src/Component/Signature/",
6753
"Jose\\Component\\Signature\\Algorithm\\": [
6854
"src/SignatureAlgorithm/ECDSA",
69-
"src/SignatureAlgorithm/ECDSA/",
7055
"src/SignatureAlgorithm/EdDSA",
71-
"src/SignatureAlgorithm/EdDSA/",
7256
"src/SignatureAlgorithm/Experimental",
73-
"src/SignatureAlgorithm/Experimental/",
7457
"src/SignatureAlgorithm/HMAC",
75-
"src/SignatureAlgorithm/HMAC/",
7658
"src/SignatureAlgorithm/None",
77-
"src/SignatureAlgorithm/None/",
78-
"src/SignatureAlgorithm/RSA",
79-
"src/SignatureAlgorithm/RSA/"
59+
"src/SignatureAlgorithm/RSA"
8060
]
8161
}
8262
},
@@ -140,6 +120,7 @@
140120
"replace": {
141121
"web-token/encryption-pack": "self.version",
142122
"web-token/jwt-bundle": "self.version",
123+
"web-token/jwt-library": "self.version",
143124
"web-token/jwt-checker": "self.version",
144125
"web-token/jwt-console": "self.version",
145126
"web-token/jwt-core": "self.version",

src/Component/Encryption/composer.json

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/Component/KeyManagement/composer.json

Lines changed: 0 additions & 52 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

src/Component/Signature/composer.json

Lines changed: 0 additions & 52 deletions
This file was deleted.

src/Component/Core/composer.json renamed to src/Component/composer.json

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "web-token/jwt-core",
3-
"description": "Core component of the JWT Framework.",
2+
"name": "web-token/jwt-library",
3+
"description": "JWT library",
44
"type": "library",
55
"license": "MIT",
66
"keywords": [
@@ -34,7 +34,7 @@
3434
],
3535
"autoload": {
3636
"psr-4": {
37-
"Jose\\Component\\Core\\": ""
37+
"Jose\\Component\\": ""
3838
}
3939
},
4040
"require": {
@@ -43,13 +43,21 @@
4343
"ext-mbstring": "*",
4444
"brick/math": "^0.9|^0.10|^0.11|^0.12",
4545
"paragonie/constant_time_encoding": "^2.6",
46-
"spomky-labs/pki-framework": "^1.0"
46+
"psr/clock": "^1.0",
47+
"psr/http-factory": "^1.0",
48+
"psr/http-client": "^1.0",
49+
"spomky-labs/pki-framework": "^1.0",
50+
"symfony/console": "^5.4|^6.0|^7.0"
4751
},
4852
"conflict": {
4953
"spomky-labs/jose": "*"
5054
},
5155
"suggest": {
56+
"ext-openssl": "For key management (creation, optimization, etc.)",
5257
"ext-gmp": "GMP or BCMath is highly recommended to improve the library performance",
53-
"ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance"
58+
"ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance",
59+
"ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
60+
"php-http/message-factory": "To enable JKU/X5U support.",
61+
"php-http/httplug": "To enable JKU/X5U support."
5462
}
5563
}

0 commit comments

Comments
 (0)