Preparing 4.0.0

.github/workflows/infection.yml

@@ -18,7 +18,7 @@ jobs:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.1"
+          php-version: "8.3"
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
 
       - name: "Checkout code"

.github/workflows/integrate.yml

@@ -31,7 +31,7 @@ jobs:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.1"
+          php-version: "8.3"
 
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -54,8 +54,6 @@ jobs:
         operating-system:
           - "ubuntu-latest"
         php-version:
-          - "8.1"
-          - "8.2"
           - "8.3"
         dependencies:
           - "lowest"
@@ -81,14 +79,6 @@ jobs:
       - name: "Execute unit tests"
         run: "make ci-cc"
 
-  #      - name: Send coverage to Coveralls
-  #        if: "matrix.php-version == '8.1' && matrix.dependencies == 'highest'"
-  #        env:
-  #          COVERALLS_REPO_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-  #        run: |
-  #          wget "https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.2/php-coveralls.phar"
-  #          php ./php-coveralls.phar -v
-
   static_analysis:
     name: "3️⃣ Static Analysis"
     needs:
@@ -99,7 +89,7 @@ jobs:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.1"
+          php-version: "8.3"
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
 
       - name: "Checkout code"
@@ -127,7 +117,7 @@ jobs:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.1"
+          php-version: "8.3"
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
 
       - name: "Checkout code"
@@ -155,7 +145,7 @@ jobs:
       - name: "Set up PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          php-version: "8.1"
+          php-version: "8.3"
           extensions: "json, mbstring, openssl, sqlite3, curl, uuid"
           coverage: "xdebug"
 

.gitsplit.yml

@@ -5,56 +5,6 @@ splits:
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git"
   - prefix: "src/Experimental"
     target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git"
-  - prefix: "src/Deprecated/Signature"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git"
-  - prefix: "src/Deprecated/Checker"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git"
-  - prefix: "src/Deprecated/Console"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git"
-  - prefix: "src/Deprecated/Core"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git"
-  - prefix: "src/Deprecated/Ecc"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git"
-  - prefix: "src/Deprecated/Encryption"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption.git"
-  - prefix: "src/Deprecated/KeyManagement"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git"
-  - prefix: "src/Deprecated/NestedToken"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcm.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aesgcmkw.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aeskw.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-dir.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-ecdh-es.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-pbes2.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-rsa.git"
-  - prefix: "src/Deprecated/SignatureAlgorithm/ECDSA"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-ecdsa.git"
-  - prefix: "src/Deprecated/SignatureAlgorithm/EdDSA"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-eddsa.git"
-  - prefix: "src/Deprecated/SignatureAlgorithm/None"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-none.git"
-  - prefix: "src/Deprecated/SignatureAlgorithm/HMAC"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-hmac.git"
-  - prefix: "src/Deprecated/SignatureAlgorithm/RSA"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-rsa.git"
-  - prefix: "src/Deprecated/SignatureAlgorithm/Experimental"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature-algorithm-experimental.git"
-  - prefix: "src/Deprecated/EncryptionAlgorithm/Experimental"
-    target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git"
-  - prefix: "src/Deprecated/Pack/Encryption"
-    target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git"
-  - prefix: "rc/Deprecated/Pack/Signature"
-    target: "https://${GH_TOKEN}@github.com/web-token/signature-pack.git"
 
 origins:
   - ^\d+\.\d+\.x$

composer.json

@@ -34,7 +34,6 @@
     ],
     "autoload": {
         "psr-4": {
-            "Jose\\": "src/",
             "Jose\\Bundle\\JoseFramework\\": "src/Bundle/",
             "Jose\\Experimental\\": "src/Experimental/",
             "Jose\\Component\\": "src/Library/"
@@ -47,93 +46,62 @@
         }
     },
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.3",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-openssl": "*",
-        "ext-sodium": "*",
-        "brick/math": "^0.9|^0.10|^0.11|^0.12",
+        "brick/math": "^0.12",
         "paragonie/constant_time_encoding": "^2.6",
         "paragonie/sodium_compat": "^1.20",
         "psr/clock": "^1.0",
         "psr/event-dispatcher": "^1.0",
-        "psr/http-client": "^1.0",
-        "psr/http-factory": "^1.0",
-        "spomky-labs/aes-key-wrap": "^7.0",
         "spomky-labs/pki-framework": "^1.0",
-        "symfony/config": "^5.4|^6.0|^7.0",
-        "symfony/console": "^5.4|^6.0|^7.0",
-        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-        "symfony/http-client": "^5.4|^6.0|^7.0",
-        "symfony/http-kernel": "^5.4|^6.0|^7.0",
+        "symfony/config": "^7.0",
+        "symfony/console": "^7.0",
+        "symfony/dependency-injection": "^7.0",
+        "symfony/event-dispatcher": "^7.0",
+        "symfony/http-client": "^7.0",
+        "symfony/http-kernel": "^7.0",
         "symfony/polyfill-mbstring": "^1.12"
     },
     "require-dev": {
         "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",
-        "nyholm/psr7": "^1.8",
-        "php-http/mock-client": "^1.5",
+        "nikic/php-parser": "^4.18",
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpbench/phpbench": "^1.2",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.8",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.4",
-        "phpunit/phpunit": "^10.1",
+        "phpunit/phpunit": "^10.5.10",
         "qossmic/deptrac-shim": "^1.0",
         "rector/rector": "^1.0",
         "roave/security-advisories": "dev-latest",
-        "symfony/browser-kit": "^6.1|^7.0",
-        "symfony/finder": "^6.1|^7.0",
-        "symfony/framework-bundle": "^6.1|^7.0",
-        "symfony/phpunit-bridge": "^6.1|^7.0",
-        "symfony/serializer": "^6.1|^7.0",
-        "symfony/var-dumper": "^6.1|^7.0",
-        "symfony/yaml": "^6.1|^7.0",
+        "spomky-labs/aes-key-wrap": "^7.0",
+        "symfony/browser-kit": "^7.0",
+        "symfony/clock": "^7.0",
+        "symfony/finder": "^7.0",
+        "symfony/framework-bundle": "^7.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/serializer": "^7.0",
+        "symfony/var-dumper": "^7.0",
+        "symfony/yaml": "^7.0",
         "symplify/easy-coding-standard": "^12.0"
     },
     "replace": {
-        "web-token/encryption-pack": "self.version",
         "web-token/jwt-bundle": "self.version",
         "web-token/jwt-library": "self.version",
-        "web-token/jwt-checker": "self.version",
-        "web-token/jwt-console": "self.version",
-        "web-token/jwt-core": "self.version",
-        "web-token/jwt-encryption": "self.version",
-        "web-token/jwt-encryption-algorithm-aescbc": "self.version",
-        "web-token/jwt-encryption-algorithm-aesgcm": "self.version",
-        "web-token/jwt-encryption-algorithm-aesgcmkw": "self.version",
-        "web-token/jwt-encryption-algorithm-aeskw": "self.version",
-        "web-token/jwt-encryption-algorithm-dir": "self.version",
-        "web-token/jwt-encryption-algorithm-ecdh-es": "self.version",
-        "web-token/jwt-encryption-algorithm-experimental": "self.version",
-        "web-token/jwt-encryption-algorithm-pbes2": "self.version",
-        "web-token/jwt-encryption-algorithm-rsa": "self.version",
-        "web-token/jwt-key-mgmt": "self.version",
-        "web-token/jwt-nested-token": "self.version",
-        "web-token/jwt-signature": "self.version",
-        "web-token/jwt-signature-algorithm-ecdsa": "self.version",
-        "web-token/jwt-signature-algorithm-eddsa": "self.version",
-        "web-token/jwt-signature-algorithm-experimental": "self.version",
-        "web-token/jwt-signature-algorithm-hmac": "self.version",
-        "web-token/jwt-signature-algorithm-none": "self.version",
-        "web-token/jwt-signature-algorithm-rsa": "self.version",
-        "web-token/jwt-signature-pack": "self.version",
-        "web-token/jwt-util-ecc": "self.version",
-        "web-token/signature-pack": "self.version",
         "web-token/jwt-experimental": "self.version"
     },
     "suggest": {
         "bjeavons/zxcvbn-php": "Adds key quality check for oct keys.",
-        "php-http/httplug": "To enable JKU/X5U support.",
-        "php-http/httplug-bundle": "To enable JKU/X5U support.",
-        "php-http/message-factory": "To enable JKU/X5U support.",
         "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."
@@ -144,10 +112,10 @@
     "config": {
         "sort-packages": true,
         "allow-plugins": {
-            "infection/extension-installer": true,
             "composer/package-versions-deprecated": true,
             "phpstan/extension-installer": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "infection/extension-installer": false
         }
     }
 }

deptrac.yaml

@@ -2,72 +2,32 @@ parameters:
   paths:
     - './src'
   layers:
-    - name: 'Core'
+    - name: 'Library'
       collectors:
-        - { type: className, regex: '^Jose\\Component\\Core\\' }
-    - name: 'Checker'
+        - { type: className, regex: '^Jose\\Component\\' }
+    - name: 'Experimental'
       collectors:
-        - { type: className, regex: '^Jose\\Component\\Checker\\' }
-    - name: 'Console'
-      collectors:
-        - { type: className, regex: '^Jose\\Component\\Console\\' }
-    - name: 'KeyManagement'
-      collectors:
-        - { type: className, regex: '^Jose\\Component\\KeyManagement\\' }
-    - name: 'NestedToken'
-      collectors:
-        - { type: className, regex: '^Jose\\Component\\NestedToken\\' }
-    - name: 'Encryption'
-      collectors:
-        - { type: className, regex: '^Jose\\Component\\Encryption\\' }
-    - name: 'Signature'
-      collectors:
-        - { type: className, regex: '^Jose\\Component\\Signature\\' }
+        - { type: className, regex: '^Jose\\Experimental\\' }
     - name: 'Bundle'
       collectors:
-        - { type: className, regex: '^Jose\\Bundle\\JoseFramework\\' }
+        - { type: className, regex: '^Jose\\Bundle\\' }
     - name: 'Vendors'
       collectors:
         - { type: className, regex: '^Symfony\\' }
         - { type: className, regex: '^SpomkyLabs\\Pki\\' }
         - { type: className, regex: '^ParagonIE\\' }
         - { type: className, regex: '^Psr\\EventDispatcher\\' }
-        - { type: className, regex: '^Psr\\Http\\' }
+        - { type: className, regex: '^Psr\\Clock\\' }
         - { type: className, regex: '^Brick\\Math\\' }
         - { type: className, regex: '^AESKW\\' }
         - { type: className, regex: '^ZxcvbnPhp\\' }
   ruleset:
-    Core:
-      - 'Vendors'
-    Checker:
-      - 'Core'
-      - 'Vendors'
-    Console:
-      - 'Core'
-      - 'KeyManagement'
-      - 'Vendors'
-    KeyManagement:
-      - 'Core'
-      - 'Vendors'
-    Encryption:
-      - 'Core'
-      - 'Checker'
-      - 'Vendors'
-    Signature:
-      - 'Core'
-      - 'Checker'
+    Library:
       - 'Vendors'
-    NestedToken:
-      - 'Core'
-      - 'Encryption'
-      - 'Signature'
+    Experimental:
+      - 'Library'
       - 'Vendors'
     Bundle:
-      - 'Core'
-      - 'Checker'
-      - 'Console'
-      - 'KeyManagement'
-      - 'Encryption'
-      - 'Signature'
-      - 'NestedToken'
+      - 'Library'
+      - 'Experimental'
       - 'Vendors'