From 20bde2f164b606dfb95a95e8f53c3b7f1b9fac3f Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Sat, 24 Feb 2024 15:03:37 +0100 Subject: [PATCH 1/6] Preparing 4.0.0 --- .gitsplit.yml | 50 ---- composer.json | 65 ++--- phpstan-baseline.neon | 260 +++++++++++++++++- rector.php | 4 +- src/Bundle/Helper/ConfigurationHelper.php | 2 +- src/Bundle/Resources/config/checkers.php | 17 +- src/Bundle/Services/JWEBuilder.php | 3 +- src/Bundle/Services/JWEBuilderFactory.php | 2 +- src/Bundle/Services/JWEDecrypter.php | 5 +- src/Bundle/Services/JWEDecrypterFactory.php | 13 +- src/Bundle/composer.json | 12 +- .../Checker/.github/CONTRIBUTING.md | 5 - src/Deprecated/Checker/.github/FUNDING.yml | 2 - .../Checker/.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Checker/.github/stale.yml | 8 - src/Deprecated/Checker/LICENSE | 21 -- src/Deprecated/Checker/README.md | 16 -- src/Deprecated/Checker/composer.json | 40 --- .../Console/.github/CONTRIBUTING.md | 5 - src/Deprecated/Console/.github/FUNDING.yml | 2 - .../Console/.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Console/.github/stale.yml | 8 - src/Deprecated/Console/LICENSE | 21 -- src/Deprecated/Console/README.md | 16 -- src/Deprecated/Console/composer.json | 40 --- src/Deprecated/Core/.github/CONTRIBUTING.md | 5 - src/Deprecated/Core/.github/FUNDING.yml | 2 - .../Core/.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Core/.github/stale.yml | 8 - src/Deprecated/Core/LICENSE | 21 -- src/Deprecated/Core/README.md | 16 -- src/Deprecated/Core/composer.json | 44 --- src/Deprecated/Ecc/.github/CONTRIBUTING.md | 5 - src/Deprecated/Ecc/.github/FUNDING.yml | 2 - .../Ecc/.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Ecc/.github/stale.yml | 8 - src/Deprecated/Ecc/LICENSE | 21 -- src/Deprecated/Ecc/README.md | 16 -- src/Deprecated/Ecc/composer.json | 40 --- .../Encryption/.github/CONTRIBUTING.md | 5 - src/Deprecated/Encryption/.github/FUNDING.yml | 2 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Encryption/.github/stale.yml | 8 - src/Deprecated/Encryption/LICENSE | 21 -- src/Deprecated/Encryption/README.md | 16 -- src/Deprecated/Encryption/composer.json | 39 --- .../AESCBC/.github/CONTRIBUTING.md | 5 - .../AESCBC/.github/FUNDING.yml | 2 - .../AESCBC/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../AESCBC/.github/stale.yml | 8 - .../ContentEncryption/AESCBC/LICENSE | 21 -- .../ContentEncryption/AESCBC/README.md | 16 -- .../ContentEncryption/AESCBC/composer.json | 40 --- .../AESGCM/.github/CONTRIBUTING.md | 5 - .../AESGCM/.github/FUNDING.yml | 2 - .../AESGCM/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../AESGCM/.github/stale.yml | 8 - .../ContentEncryption/AESGCM/LICENSE | 21 -- .../ContentEncryption/AESGCM/README.md | 16 -- .../ContentEncryption/AESGCM/composer.json | 40 --- .../Experimental/.github/CONTRIBUTING.md | 5 - .../Experimental/.github/FUNDING.yml | 2 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - .../Experimental/.github/stale.yml | 8 - .../EncryptionAlgorithm/Experimental/LICENSE | 21 -- .../Experimental/README.md | 16 -- .../Experimental/composer.json | 40 --- .../AESGCMKW/.github/CONTRIBUTING.md | 5 - .../AESGCMKW/.github/FUNDING.yml | 2 - .../AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyEncryption/AESGCMKW/.github/stale.yml | 8 - .../KeyEncryption/AESGCMKW/LICENSE | 21 -- .../KeyEncryption/AESGCMKW/README.md | 16 -- .../KeyEncryption/AESGCMKW/composer.json | 41 --- .../AESKW/.github/CONTRIBUTING.md | 5 - .../KeyEncryption/AESKW/.github/FUNDING.yml | 2 - .../AESKW/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyEncryption/AESKW/.github/stale.yml | 8 - .../KeyEncryption/AESKW/LICENSE | 21 -- .../KeyEncryption/AESKW/README.md | 16 -- .../KeyEncryption/AESKW/composer.json | 41 --- .../Direct/.github/CONTRIBUTING.md | 5 - .../KeyEncryption/Direct/.github/FUNDING.yml | 2 - .../Direct/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyEncryption/Direct/.github/stale.yml | 8 - .../KeyEncryption/Direct/LICENSE | 21 -- .../KeyEncryption/Direct/README.md | 16 -- .../KeyEncryption/Direct/composer.json | 39 --- .../ECDHES/.github/CONTRIBUTING.md | 5 - .../KeyEncryption/ECDHES/.github/FUNDING.yml | 2 - .../ECDHES/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyEncryption/ECDHES/.github/stale.yml | 8 - .../KeyEncryption/ECDHES/LICENSE | 21 -- .../KeyEncryption/ECDHES/README.md | 16 -- .../KeyEncryption/ECDHES/composer.json | 41 --- .../PBES2/.github/CONTRIBUTING.md | 5 - .../KeyEncryption/PBES2/.github/FUNDING.yml | 2 - .../PBES2/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyEncryption/PBES2/.github/stale.yml | 8 - .../KeyEncryption/PBES2/LICENSE | 21 -- .../KeyEncryption/PBES2/README.md | 16 -- .../KeyEncryption/PBES2/composer.json | 39 --- .../KeyEncryption/RSA/.github/CONTRIBUTING.md | 5 - .../KeyEncryption/RSA/.github/FUNDING.yml | 2 - .../RSA/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyEncryption/RSA/.github/stale.yml | 8 - .../KeyEncryption/RSA/LICENSE | 21 -- .../KeyEncryption/RSA/README.md | 16 -- .../KeyEncryption/RSA/composer.json | 42 --- .../KeyManagement/.github/CONTRIBUTING.md | 5 - .../KeyManagement/.github/FUNDING.yml | 2 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - .../KeyManagement/.github/stale.yml | 8 - src/Deprecated/KeyManagement/LICENSE | 21 -- src/Deprecated/KeyManagement/README.md | 16 -- src/Deprecated/KeyManagement/composer.json | 42 --- .../NestedToken/.github/CONTRIBUTING.md | 5 - .../NestedToken/.github/FUNDING.yml | 2 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/NestedToken/.github/stale.yml | 8 - src/Deprecated/NestedToken/LICENSE | 21 -- src/Deprecated/NestedToken/README.md | 16 -- src/Deprecated/NestedToken/composer.json | 39 --- .../Pack/Encryption/.github/CONTRIBUTING.md | 5 - .../Pack/Encryption/.github/FUNDING.yml | 1 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Pack/Encryption/README.md | 37 --- src/Deprecated/Pack/Encryption/composer.json | 10 - .../Pack/Signature/.github/CONTRIBUTING.md | 5 - .../Pack/Signature/.github/FUNDING.yml | 1 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Pack/Signature/README.md | 37 --- src/Deprecated/Pack/Signature/composer.json | 10 - .../Signature/.github/CONTRIBUTING.md | 5 - src/Deprecated/Signature/.github/FUNDING.yml | 2 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - src/Deprecated/Signature/.github/stale.yml | 8 - src/Deprecated/Signature/LICENSE | 21 -- src/Deprecated/Signature/README.md | 16 -- src/Deprecated/Signature/composer.json | 39 --- .../ECDSA/.github/CONTRIBUTING.md | 5 - .../ECDSA/.github/FUNDING.yml | 2 - .../ECDSA/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../ECDSA/.github/stale.yml | 8 - .../SignatureAlgorithm/ECDSA/LICENSE | 21 -- .../SignatureAlgorithm/ECDSA/README.md | 16 -- .../SignatureAlgorithm/ECDSA/composer.json | 40 --- .../EdDSA/.github/CONTRIBUTING.md | 5 - .../EdDSA/.github/FUNDING.yml | 2 - .../EdDSA/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../EdDSA/.github/stale.yml | 8 - .../SignatureAlgorithm/EdDSA/LICENSE | 21 -- .../SignatureAlgorithm/EdDSA/README.md | 16 -- .../SignatureAlgorithm/EdDSA/composer.json | 41 --- .../Experimental/.github/CONTRIBUTING.md | 5 - .../Experimental/.github/FUNDING.yml | 2 - .../.github/PULL_REQUEST_TEMPLATE.md | 3 - .../Experimental/.github/stale.yml | 8 - .../SignatureAlgorithm/Experimental/LICENSE | 21 -- .../SignatureAlgorithm/Experimental/README.md | 16 -- .../Experimental/composer.json | 39 --- .../HMAC/.github/CONTRIBUTING.md | 5 - .../HMAC/.github/FUNDING.yml | 2 - .../HMAC/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../SignatureAlgorithm/HMAC/.github/stale.yml | 8 - .../SignatureAlgorithm/HMAC/LICENSE | 21 -- .../SignatureAlgorithm/HMAC/README.md | 16 -- .../SignatureAlgorithm/HMAC/composer.json | 39 --- .../None/.github/CONTRIBUTING.md | 5 - .../None/.github/FUNDING.yml | 2 - .../None/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../SignatureAlgorithm/None/.github/stale.yml | 8 - .../SignatureAlgorithm/None/LICENSE | 21 -- .../SignatureAlgorithm/None/README.md | 16 -- .../SignatureAlgorithm/None/composer.json | 39 --- .../RSA/.github/CONTRIBUTING.md | 5 - .../RSA/.github/FUNDING.yml | 2 - .../RSA/.github/PULL_REQUEST_TEMPLATE.md | 3 - .../SignatureAlgorithm/RSA/.github/stale.yml | 8 - src/Deprecated/SignatureAlgorithm/RSA/LICENSE | 21 -- .../SignatureAlgorithm/RSA/README.md | 16 -- .../SignatureAlgorithm/RSA/composer.json | 41 --- src/Experimental/composer.json | 4 +- src/Library/Checker/ExpirationTimeChecker.php | 15 +- src/Library/Checker/IssuedAtChecker.php | 15 +- src/Library/Checker/NotBeforeChecker.php | 15 +- src/Library/Core/Util/ECKey.php | 18 +- src/Library/Core/Util/ECSignature.php | 8 +- src/Library/Core/Util/Ecc/Curve.php | 2 +- src/Library/Core/Util/Ecc/Point.php | 2 +- .../KeyEncryption/Util/ConcatKDF.php | 2 +- .../Algorithm/KeyEncryption/Util/RSACrypt.php | 11 +- .../Algorithm/KeyEncryptionAlgorithm.php | 8 +- src/Library/Encryption/JWEBuilder.php | 31 +-- src/Library/Encryption/JWEBuilderFactory.php | 12 +- src/Library/Encryption/JWEDecrypter.php | 31 +-- .../Encryption/JWEDecrypterFactory.php | 2 +- .../Serializer/CompactSerializer.php | 2 +- .../Serializer/JSONFlattenedSerializer.php | 2 +- .../Serializer/JSONGeneralSerializer.php | 2 +- .../KeyManagement/Analyzer/Message.php | 6 +- .../KeyManagement/Analyzer/RsaAnalyzer.php | 3 +- .../KeyManagement/UrlKeySetFactory.php | 55 +--- src/Library/Signature/Algorithm/Util/RSA.php | 6 +- .../Serializer/CompactSerializer.php | 2 +- .../Serializer/JSONFlattenedSerializer.php | 2 +- .../Serializer/JSONGeneralSerializer.php | 2 +- src/Library/composer.json | 8 +- .../TestBundle/Resources/config/services.php | 6 + tests/Component/Encryption/EncrypterTest.php | 8 +- .../Encryption/RSAKeyEncryptionTest.php | 6 +- .../KeyManagement/UrlKeySetFactoryTest.php | 89 +++--- tests/ComposerJsonTest.php | 2 +- .../AESCBC/AESCBC_HSContentEncryptionTest.php | 2 +- .../AESGCM/AESGCMContentEncryptionTest.php | 2 +- .../ECDHES/ECDHESKeyAgreementTest.php | 8 +- .../ECDHSS/ECDHSSKeyAgreementTest.php | 8 +- .../PBES2/PBES2_HS_AESKWKeyEncryptionTest.php | 2 +- 218 files changed, 434 insertions(+), 2700 deletions(-) delete mode 100644 src/Deprecated/Checker/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Checker/.github/FUNDING.yml delete mode 100644 src/Deprecated/Checker/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Checker/.github/stale.yml delete mode 100644 src/Deprecated/Checker/LICENSE delete mode 100644 src/Deprecated/Checker/README.md delete mode 100644 src/Deprecated/Checker/composer.json delete mode 100644 src/Deprecated/Console/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Console/.github/FUNDING.yml delete mode 100644 src/Deprecated/Console/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Console/.github/stale.yml delete mode 100644 src/Deprecated/Console/LICENSE delete mode 100644 src/Deprecated/Console/README.md delete mode 100644 src/Deprecated/Console/composer.json delete mode 100644 src/Deprecated/Core/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Core/.github/FUNDING.yml delete mode 100644 src/Deprecated/Core/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Core/.github/stale.yml delete mode 100644 src/Deprecated/Core/LICENSE delete mode 100644 src/Deprecated/Core/README.md delete mode 100644 src/Deprecated/Core/composer.json delete mode 100644 src/Deprecated/Ecc/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Ecc/.github/FUNDING.yml delete mode 100644 src/Deprecated/Ecc/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Ecc/.github/stale.yml delete mode 100644 src/Deprecated/Ecc/LICENSE delete mode 100644 src/Deprecated/Ecc/README.md delete mode 100644 src/Deprecated/Ecc/composer.json delete mode 100644 src/Deprecated/Encryption/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Encryption/.github/FUNDING.yml delete mode 100644 src/Deprecated/Encryption/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Encryption/.github/stale.yml delete mode 100644 src/Deprecated/Encryption/LICENSE delete mode 100644 src/Deprecated/Encryption/README.md delete mode 100644 src/Deprecated/Encryption/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/Experimental/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/README.md delete mode 100644 src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json delete mode 100644 src/Deprecated/KeyManagement/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/KeyManagement/.github/FUNDING.yml delete mode 100644 src/Deprecated/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/KeyManagement/.github/stale.yml delete mode 100644 src/Deprecated/KeyManagement/LICENSE delete mode 100644 src/Deprecated/KeyManagement/README.md delete mode 100644 src/Deprecated/KeyManagement/composer.json delete mode 100644 src/Deprecated/NestedToken/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/NestedToken/.github/FUNDING.yml delete mode 100644 src/Deprecated/NestedToken/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/NestedToken/.github/stale.yml delete mode 100644 src/Deprecated/NestedToken/LICENSE delete mode 100644 src/Deprecated/NestedToken/README.md delete mode 100644 src/Deprecated/NestedToken/composer.json delete mode 100644 src/Deprecated/Pack/Encryption/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Pack/Encryption/.github/FUNDING.yml delete mode 100644 src/Deprecated/Pack/Encryption/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Pack/Encryption/README.md delete mode 100644 src/Deprecated/Pack/Encryption/composer.json delete mode 100644 src/Deprecated/Pack/Signature/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Pack/Signature/.github/FUNDING.yml delete mode 100644 src/Deprecated/Pack/Signature/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Pack/Signature/README.md delete mode 100644 src/Deprecated/Pack/Signature/composer.json delete mode 100644 src/Deprecated/Signature/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/Signature/.github/FUNDING.yml delete mode 100644 src/Deprecated/Signature/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/Signature/.github/stale.yml delete mode 100644 src/Deprecated/Signature/LICENSE delete mode 100644 src/Deprecated/Signature/README.md delete mode 100644 src/Deprecated/Signature/composer.json delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/.github/FUNDING.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/.github/stale.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/LICENSE delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/README.md delete mode 100644 src/Deprecated/SignatureAlgorithm/ECDSA/composer.json delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/.github/FUNDING.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/.github/stale.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/LICENSE delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/README.md delete mode 100644 src/Deprecated/SignatureAlgorithm/EdDSA/composer.json delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/.github/FUNDING.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/.github/stale.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/LICENSE delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/README.md delete mode 100644 src/Deprecated/SignatureAlgorithm/Experimental/composer.json delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/.github/FUNDING.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/.github/stale.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/LICENSE delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/README.md delete mode 100644 src/Deprecated/SignatureAlgorithm/HMAC/composer.json delete mode 100644 src/Deprecated/SignatureAlgorithm/None/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/SignatureAlgorithm/None/.github/FUNDING.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/SignatureAlgorithm/None/.github/stale.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/None/LICENSE delete mode 100644 src/Deprecated/SignatureAlgorithm/None/README.md delete mode 100644 src/Deprecated/SignatureAlgorithm/None/composer.json delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/.github/FUNDING.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/.github/stale.yml delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/LICENSE delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/README.md delete mode 100644 src/Deprecated/SignatureAlgorithm/RSA/composer.json diff --git a/.gitsplit.yml b/.gitsplit.yml index ce253cf04..6086733ad 100644 --- a/.gitsplit.yml +++ b/.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$ diff --git a/composer.json b/composer.json index 281621dc2..7789b9ea2 100644 --- a/composer.json +++ b/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,31 +46,30 @@ } }, "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", @@ -89,51 +87,24 @@ "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." diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index c6a60b87d..3d10ea199 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -920,11 +920,6 @@ parameters: count: 1 path: src/Bundle/Serializer/JWESerializer.php - - - message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWESerializer\\:\\:getSupportedTypes\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: src/Bundle/Serializer/JWESerializer.php - - message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWESerializer\\:\\:supportsDenormalization\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#" count: 1 @@ -960,11 +955,6 @@ parameters: count: 1 path: src/Bundle/Serializer/JWSSerializer.php - - - message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWSSerializer\\:\\:getSupportedTypes\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: src/Bundle/Serializer/JWSSerializer.php - - message: "#^Method Jose\\\\Bundle\\\\JoseFramework\\\\Serializer\\\\JWSSerializer\\:\\:supportsDenormalization\\(\\) has parameter \\$context with no value type specified in iterable type array\\.$#" count: 1 @@ -1185,16 +1175,86 @@ parameters: count: 1 path: src/Library/Checker/IssuerChecker.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\AddKeyIntoKeysetCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/AddKeyIntoKeysetCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\AddKeyIntoKeysetCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/AddKeyIntoKeysetCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\EcKeyGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/EcKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\EcKeyGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/EcKeyGeneratorCommand.php + - message: "#^Cannot cast mixed to int\\.$#" count: 1 path: src/Library/Console/EcKeysetGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\EcKeysetGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/EcKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\EcKeysetGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/EcKeysetGeneratorCommand.php + - message: "#^Method Jose\\\\Component\\\\Console\\\\GeneratorCommand\\:\\:getOptions\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 path: src/Library/Console/GeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\GetThumbprintCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/GetThumbprintCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\GetThumbprintCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/GetThumbprintCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\JKULoaderCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/JKULoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\JKULoaderCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/JKULoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\KeyAnalyzerCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/KeyAnalyzerCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\KeyAnalyzerCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/KeyAnalyzerCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\KeyFileLoaderCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/KeyFileLoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\KeyFileLoaderCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/KeyFileLoaderCommand.php + - message: "#^Parameter \\#1 \\$jwk of method Jose\\\\Component\\\\KeyManagement\\\\Analyzer\\\\KeyAnalyzerManager\\:\\:analyze\\(\\) expects Jose\\\\Component\\\\Core\\\\JWK, mixed given\\.$#" count: 1 @@ -1205,46 +1265,226 @@ parameters: count: 1 path: src/Library/Console/KeysetAnalyzerCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\KeysetAnalyzerCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/KeysetAnalyzerCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\KeysetAnalyzerCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/KeysetAnalyzerCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\MergeKeysetCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/MergeKeysetCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\MergeKeysetCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/MergeKeysetCommand.php + - message: "#^Attribute class Jose\\\\Component\\\\Console\\\\AsCommand does not exist\\.$#" count: 1 path: src/Library/Console/NoneKeyGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\NoneKeyGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/NoneKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\NoneKeyGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/NoneKeyGeneratorCommand.php + - message: "#^Cannot cast mixed to int\\.$#" count: 1 path: src/Library/Console/OctKeyGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OctKeyGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/OctKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OctKeyGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/OctKeyGeneratorCommand.php + - message: "#^Cannot cast mixed to int\\.$#" count: 2 path: src/Library/Console/OctKeysetGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OctKeysetGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/OctKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OctKeysetGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/OctKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OkpKeyGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/OkpKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OkpKeyGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/OkpKeyGeneratorCommand.php + - message: "#^Cannot cast mixed to int\\.$#" count: 1 path: src/Library/Console/OkpKeysetGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OkpKeysetGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/OkpKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OkpKeysetGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/OkpKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OptimizeRsaKeyCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/OptimizeRsaKeyCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\OptimizeRsaKeyCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/OptimizeRsaKeyCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\P12CertificateLoaderCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/P12CertificateLoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\P12CertificateLoaderCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/P12CertificateLoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\PemConverterCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/PemConverterCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\PemConverterCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/PemConverterCommand.php + - message: "#^Attribute class Jose\\\\Component\\\\Console\\\\AsCommand does not exist\\.$#" count: 1 path: src/Library/Console/PublicKeyCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\PublicKeyCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/PublicKeyCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\PublicKeyCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/PublicKeyCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\PublicKeysetCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/PublicKeysetCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\PublicKeysetCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/PublicKeysetCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\RotateKeysetCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/RotateKeysetCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\RotateKeysetCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/RotateKeysetCommand.php + - message: "#^Cannot cast mixed to int\\.$#" count: 1 path: src/Library/Console/RsaKeyGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\RsaKeyGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/RsaKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\RsaKeyGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/RsaKeyGeneratorCommand.php + - message: "#^Cannot cast mixed to int\\.$#" count: 2 path: src/Library/Console/RsaKeysetGeneratorCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\RsaKeysetGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/RsaKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\RsaKeysetGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/RsaKeysetGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\SecretKeyGeneratorCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/SecretKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\SecretKeyGeneratorCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/SecretKeyGeneratorCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\X509CertificateLoaderCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/X509CertificateLoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\X509CertificateLoaderCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/X509CertificateLoaderCommand.php + - message: "#^Attribute class Jose\\\\Component\\\\Console\\\\AsCommand does not exist\\.$#" count: 1 path: src/Library/Console/X5ULoaderCommand.php + - + message: "#^Property Jose\\\\Component\\\\Console\\\\X5ULoaderCommand\\:\\:\\$defaultDescription has no type specified\\.$#" + count: 1 + path: src/Library/Console/X5ULoaderCommand.php + + - + message: "#^Property Jose\\\\Component\\\\Console\\\\X5ULoaderCommand\\:\\:\\$defaultName has no type specified\\.$#" + count: 1 + path: src/Library/Console/X5ULoaderCommand.php + - message: "#^Call to function is_string\\(\\) with string will always evaluate to true\\.$#" count: 1 diff --git a/rector.php b/rector.php index 69897c226..d700c17cd 100644 --- a/rector.php +++ b/rector.php @@ -15,8 +15,8 @@ return static function (RectorConfig $config): void { $config->import(SetList::DEAD_CODE); - $config->import(LevelSetList::UP_TO_PHP_81); - $config->import(SymfonyLevelSetList::UP_TO_SYMFONY_54); + $config->import(LevelSetList::UP_TO_PHP_83); + $config->import(SymfonyLevelSetList::UP_TO_SYMFONY_64); $config->import(SymfonySetList::SYMFONY_50_TYPES); $config->import(SymfonySetList::SYMFONY_52_VALIDATOR_ATTRIBUTES); $config->import(SymfonySetList::SYMFONY_CODE_QUALITY); diff --git a/src/Bundle/Helper/ConfigurationHelper.php b/src/Bundle/Helper/ConfigurationHelper.php index 61873e264..e7c9140bc 100644 --- a/src/Bundle/Helper/ConfigurationHelper.php +++ b/src/Bundle/Helper/ConfigurationHelper.php @@ -9,7 +9,7 @@ class ConfigurationHelper { - final public const BUNDLE_ALIAS = 'jose'; + final public const string BUNDLE_ALIAS = 'jose'; /** * @param string[] $signatureAlgorithms diff --git a/src/Bundle/Resources/config/checkers.php b/src/Bundle/Resources/config/checkers.php index 568db5f51..4531e36d5 100644 --- a/src/Bundle/Resources/config/checkers.php +++ b/src/Bundle/Resources/config/checkers.php @@ -5,9 +5,9 @@ use Jose\Bundle\JoseFramework\Services\ClaimCheckerManagerFactory; use Jose\Bundle\JoseFramework\Services\HeaderCheckerManagerFactory; use Jose\Component\Checker\ExpirationTimeChecker; -use Jose\Component\Checker\InternalClock; use Jose\Component\Checker\IssuedAtChecker; use Jose\Component\Checker\NotBeforeChecker; +use Psr\Clock\ClockInterface; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; use function Symfony\Component\DependencyInjection\Loader\Configurator\service; @@ -25,7 +25,7 @@ ->public(); $container->set(ExpirationTimeChecker::class) - ->arg('$clock', service('jose.internal_clock')) + ->arg('$clock', service(ClockInterface::class)) ->tag('jose.checker.claim', [ 'alias' => 'exp', ]) @@ -34,7 +34,7 @@ ]); $container->set(IssuedAtChecker::class) - ->arg('$clock', service('jose.internal_clock')) + ->arg('$clock', service(ClockInterface::class)) ->tag('jose.checker.claim', [ 'alias' => 'iat', ]) @@ -43,20 +43,11 @@ ]); $container->set(NotBeforeChecker::class) - ->arg('$clock', service('jose.internal_clock')) + ->arg('$clock', service(ClockInterface::class)) ->tag('jose.checker.claim', [ 'alias' => 'nbf', ]) ->tag('jose.checker.header', [ 'alias' => 'nbf', ]); - - $container->set('jose.internal_clock') - ->class(InternalClock::class) - ->deprecate( - 'web-token/jwt-bundle', - '3.2.0', - 'The service "%service_id%" is an internal service that will be removed in 4.0.0. Please use a PSR-20 compatible service as clock.' - ) - ->private(); }; diff --git a/src/Bundle/Services/JWEBuilder.php b/src/Bundle/Services/JWEBuilder.php index 03e386d96..015d3e3aa 100644 --- a/src/Bundle/Services/JWEBuilder.php +++ b/src/Bundle/Services/JWEBuilder.php @@ -17,11 +17,10 @@ final class JWEBuilder extends BaseJWEBuilder { public function __construct( AlgorithmManager $algorithmManager, - null|AlgorithmManager $contentEncryptionAlgorithmManager, CompressionMethodManager $compressionManager, private readonly EventDispatcherInterface $eventDispatcher ) { - parent::__construct($algorithmManager, $contentEncryptionAlgorithmManager, $compressionManager); + parent::__construct($algorithmManager, $compressionManager); } public function build(): JWE diff --git a/src/Bundle/Services/JWEBuilderFactory.php b/src/Bundle/Services/JWEBuilderFactory.php index 756f9bf5b..7c8816868 100644 --- a/src/Bundle/Services/JWEBuilderFactory.php +++ b/src/Bundle/Services/JWEBuilderFactory.php @@ -34,6 +34,6 @@ public function create( ); $compressionMethodManager = $this->compressionMethodManagerFactory->create($compressionMethods); - return new JWEBuilder($algorithmManager, null, $compressionMethodManager, $this->eventDispatcher); + return new JWEBuilder($algorithmManager, $compressionMethodManager, $this->eventDispatcher); } } diff --git a/src/Bundle/Services/JWEDecrypter.php b/src/Bundle/Services/JWEDecrypter.php index 4e4c0c859..514f3997d 100644 --- a/src/Bundle/Services/JWEDecrypter.php +++ b/src/Bundle/Services/JWEDecrypter.php @@ -17,12 +17,11 @@ final class JWEDecrypter extends BaseJWEDecrypter { public function __construct( - AlgorithmManager $keyEncryptionAlgorithmManager, - AlgorithmManager $contentEncryptionAlgorithmManager, + AlgorithmManager $algorithmManager, CompressionMethodManager $compressionMethodManager, private readonly EventDispatcherInterface $eventDispatcher ) { - parent::__construct($keyEncryptionAlgorithmManager, $contentEncryptionAlgorithmManager, $compressionMethodManager); + parent::__construct($algorithmManager, $compressionMethodManager); } public function decryptUsingKeySet( diff --git a/src/Bundle/Services/JWEDecrypterFactory.php b/src/Bundle/Services/JWEDecrypterFactory.php index 91d5d722a..44cfff9b7 100644 --- a/src/Bundle/Services/JWEDecrypterFactory.php +++ b/src/Bundle/Services/JWEDecrypterFactory.php @@ -22,15 +22,12 @@ public function create( array $contentEncryptionAlgorithms, array $compressionMethods ): JWEDecrypter { - $keyEncryptionAlgorithmManager = $this->algorithmManagerFactory->create($keyEncryptionAlgorithms); - $contentEncryptionAlgorithmManager = $this->algorithmManagerFactory->create($contentEncryptionAlgorithms); + $algorithmManager = $this->algorithmManagerFactory->create(array_merge( + $keyEncryptionAlgorithms, + $contentEncryptionAlgorithms + )); $compressionMethodManager = $this->compressionMethodManagerFactory->create($compressionMethods); - return new JWEDecrypter( - $keyEncryptionAlgorithmManager, - $contentEncryptionAlgorithmManager, - $compressionMethodManager, - $this->eventDispatcher - ); + return new JWEDecrypter($algorithmManager, $compressionMethodManager, $this->eventDispatcher); } } diff --git a/src/Bundle/composer.json b/src/Bundle/composer.json index 2bd860aa9..e279a6184 100644 --- a/src/Bundle/composer.json +++ b/src/Bundle/composer.json @@ -38,13 +38,13 @@ } }, "require": { - "php": ">=8.1", + "php": ">=8.3", "psr/event-dispatcher": "^1.0", - "symfony/config": "^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-kernel": "^5.4|^6.0|^7.0", - "web-token/jwt-library": "^3.3" + "symfony/config": "^7.0", + "symfony/dependency-injection": "^7.0", + "symfony/event-dispatcher": "^7.0", + "symfony/http-kernel": "^7.0", + "web-token/jwt-library": "^4.0" }, "suggest": { "symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens." diff --git a/src/Deprecated/Checker/.github/CONTRIBUTING.md b/src/Deprecated/Checker/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Checker/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Checker/.github/FUNDING.yml b/src/Deprecated/Checker/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/Checker/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/Checker/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Checker/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Checker/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Checker/.github/stale.yml b/src/Deprecated/Checker/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/Checker/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/Checker/LICENSE b/src/Deprecated/Checker/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/Checker/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/Checker/README.md b/src/Deprecated/Checker/README.md deleted file mode 100644 index d5578e4ac..000000000 --- a/src/Deprecated/Checker/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Checker Component -========================= - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Checker/composer.json b/src/Deprecated/Checker/composer.json deleted file mode 100644 index c12eb0323..000000000 --- a/src/Deprecated/Checker/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-checker", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "psr/clock": "^1.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/Console/.github/CONTRIBUTING.md b/src/Deprecated/Console/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Console/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Console/.github/FUNDING.yml b/src/Deprecated/Console/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/Console/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/Console/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Console/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Console/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Console/.github/stale.yml b/src/Deprecated/Console/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/Console/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/Console/LICENSE b/src/Deprecated/Console/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/Console/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/Console/README.md b/src/Deprecated/Console/README.md deleted file mode 100644 index fa36b4af1..000000000 --- a/src/Deprecated/Console/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Console Component -================================ - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Console/composer.json b/src/Deprecated/Console/composer.json deleted file mode 100644 index 6a897507e..000000000 --- a/src/Deprecated/Console/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-console", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "symfony/console": "^5.4|^6.0|^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/Core/.github/CONTRIBUTING.md b/src/Deprecated/Core/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Core/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Core/.github/FUNDING.yml b/src/Deprecated/Core/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/Core/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/Core/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Core/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Core/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Core/.github/stale.yml b/src/Deprecated/Core/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/Core/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/Core/LICENSE b/src/Deprecated/Core/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/Core/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/Core/README.md b/src/Deprecated/Core/README.md deleted file mode 100644 index f71f3bd41..000000000 --- a/src/Deprecated/Core/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Core Component -====================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Core/composer.json b/src/Deprecated/Core/composer.json deleted file mode 100644 index 6bfeada3e..000000000 --- a/src/Deprecated/Core/composer.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "web-token/jwt-core", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-json": "*", - "ext-mbstring": "*", - "brick/math": "^0.9|^0.10|^0.11|^0.12", - "paragonie/constant_time_encoding": "^2.6", - "spomky-labs/pki-framework": "^1.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/Ecc/.github/CONTRIBUTING.md b/src/Deprecated/Ecc/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Ecc/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Ecc/.github/FUNDING.yml b/src/Deprecated/Ecc/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/Ecc/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/Ecc/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Ecc/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Ecc/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Ecc/.github/stale.yml b/src/Deprecated/Ecc/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/Ecc/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/Ecc/LICENSE b/src/Deprecated/Ecc/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/Ecc/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/Ecc/README.md b/src/Deprecated/Ecc/README.md deleted file mode 100644 index e82b51681..000000000 --- a/src/Deprecated/Ecc/README.md +++ /dev/null @@ -1,16 +0,0 @@ -ECC Tools For JWT-Framework -============================ - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Ecc/composer.json b/src/Deprecated/Ecc/composer.json deleted file mode 100644 index 473a9d4d1..000000000 --- a/src/Deprecated/Ecc/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-util-ecc", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "brick/math": "^0.9|^0.10|^0.11|^0.12", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/Encryption/.github/CONTRIBUTING.md b/src/Deprecated/Encryption/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Encryption/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Encryption/.github/FUNDING.yml b/src/Deprecated/Encryption/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/Encryption/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/Encryption/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Encryption/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Encryption/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Encryption/.github/stale.yml b/src/Deprecated/Encryption/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/Encryption/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/Encryption/LICENSE b/src/Deprecated/Encryption/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/Encryption/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/Encryption/README.md b/src/Deprecated/Encryption/README.md deleted file mode 100644 index f7a144325..000000000 --- a/src/Deprecated/Encryption/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Encryption Component -============================ - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Encryption/composer.json b/src/Deprecated/Encryption/composer.json deleted file mode 100644 index 2130537b5..000000000 --- a/src/Deprecated/Encryption/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-encryption", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md deleted file mode 100644 index 82401a329..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/README.md +++ /dev/null @@ -1,16 +0,0 @@ -AES CBC Based Content Encryption Algorithms For JWT-Framework -============================================================= - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json deleted file mode 100644 index a85bbf00d..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-aescbc", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md deleted file mode 100644 index 55dd2557c..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/README.md +++ /dev/null @@ -1,16 +0,0 @@ -AES GCM Based Content Encryption Algorithms For JWT-Framework -============================================================= - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json b/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json deleted file mode 100644 index 7243b7a82..000000000 --- a/src/Deprecated/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-aesgcm", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/Experimental/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/LICENSE b/src/Deprecated/EncryptionAlgorithm/Experimental/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/README.md b/src/Deprecated/EncryptionAlgorithm/Experimental/README.md deleted file mode 100644 index fbd1c98ac..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/README.md +++ /dev/null @@ -1,16 +0,0 @@ -AES GCM Key Wrapping Based Key Encryption Algorithms For JWT-Framework -====================================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/Experimental/composer.json b/src/Deprecated/EncryptionAlgorithm/Experimental/composer.json deleted file mode 100644 index 9228cbf52..000000000 --- a/src/Deprecated/EncryptionAlgorithm/Experimental/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-experimental", - "description": "[DEPRECATED] Please use web-token/jwt-experimental instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "web-token/jwt-experimental": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md deleted file mode 100644 index fbd1c98ac..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/README.md +++ /dev/null @@ -1,16 +0,0 @@ -AES GCM Key Wrapping Based Key Encryption Algorithms For JWT-Framework -====================================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json deleted file mode 100644 index 59bc200c4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-aesgcmkw", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/README.md deleted file mode 100644 index 24bee1b27..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/README.md +++ /dev/null @@ -1,16 +0,0 @@ -AES Key Wrapping Based Key Encryption Algorithms For JWT-Framework -================================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json deleted file mode 100644 index 49ce7f2f9..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-aeskw", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/README.md deleted file mode 100644 index b539806f3..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Direct Key Encryption Algorithms For JWT-Framework -================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json deleted file mode 100644 index e5c372b82..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/Direct/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-dir", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md deleted file mode 100644 index de2167c3a..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/README.md +++ /dev/null @@ -1,16 +0,0 @@ -ECDH-ES Based Key Encryption Algorithms For JWT-Framework -========================================================= - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json deleted file mode 100644 index 625b1355c..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-ecdh-es", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/README.md deleted file mode 100644 index 43195889a..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PBES2 Based Key Encryption Algorithms For JWT-Framework -======================================================= - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json deleted file mode 100644 index ee64732ab..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-pbes2", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/README.md b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/README.md deleted file mode 100644 index b267ef149..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/README.md +++ /dev/null @@ -1,16 +0,0 @@ -RSA Based Key Encryption Algorithms For JWT-Framework -===================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json b/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json deleted file mode 100644 index f74be2179..000000000 --- a/src/Deprecated/EncryptionAlgorithm/KeyEncryption/RSA/composer.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "web-token/jwt-encryption-algorithm-rsa", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "brick/math": "^0.9|^0.10|^0.11|^0.12", - "ext-openssl": "*", - "symfony/polyfill-mbstring": "^1.12", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/KeyManagement/.github/CONTRIBUTING.md b/src/Deprecated/KeyManagement/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/KeyManagement/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/KeyManagement/.github/FUNDING.yml b/src/Deprecated/KeyManagement/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/KeyManagement/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/KeyManagement/.github/stale.yml b/src/Deprecated/KeyManagement/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/KeyManagement/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/KeyManagement/LICENSE b/src/Deprecated/KeyManagement/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/KeyManagement/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/KeyManagement/README.md b/src/Deprecated/KeyManagement/README.md deleted file mode 100644 index 6cd4c485d..000000000 --- a/src/Deprecated/KeyManagement/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Key Management Component -================================ - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/KeyManagement/composer.json b/src/Deprecated/KeyManagement/composer.json deleted file mode 100644 index 6257e2edf..000000000 --- a/src/Deprecated/KeyManagement/composer.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "web-token/jwt-key-mgmt", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "psr/http-factory": "^1.0", - "psr/http-client": "^1.0", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/NestedToken/.github/CONTRIBUTING.md b/src/Deprecated/NestedToken/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/NestedToken/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/NestedToken/.github/FUNDING.yml b/src/Deprecated/NestedToken/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/NestedToken/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/NestedToken/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/NestedToken/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/NestedToken/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/NestedToken/.github/stale.yml b/src/Deprecated/NestedToken/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/NestedToken/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/NestedToken/LICENSE b/src/Deprecated/NestedToken/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/NestedToken/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/NestedToken/README.md b/src/Deprecated/NestedToken/README.md deleted file mode 100644 index 2a5077fff..000000000 --- a/src/Deprecated/NestedToken/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Nested Token Component -============================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/NestedToken/composer.json b/src/Deprecated/NestedToken/composer.json deleted file mode 100644 index 1fcfe2024..000000000 --- a/src/Deprecated/NestedToken/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-nested-token", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/Pack/Encryption/.github/CONTRIBUTING.md b/src/Deprecated/Pack/Encryption/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Pack/Encryption/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Pack/Encryption/.github/FUNDING.yml b/src/Deprecated/Pack/Encryption/.github/FUNDING.yml deleted file mode 100644 index 7e2ca0e7e..000000000 --- a/src/Deprecated/Pack/Encryption/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -patreon: FlorentMorselli diff --git a/src/Deprecated/Pack/Encryption/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Pack/Encryption/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Pack/Encryption/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Pack/Encryption/README.md b/src/Deprecated/Pack/Encryption/README.md deleted file mode 100644 index d503c9408..000000000 --- a/src/Deprecated/Pack/Encryption/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Encryption Algorithms Pack For JWT-Framework -============================================ - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Support - -I bring solutions to your problems and answer your questions. - -If you really love that project and the work I have done or if you want I prioritize your issues, then you can help me -out for a couple of :beers: or more! - -[![Become a Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/FlorentMorselli) - -# Contributing - -Requests for new features, bug fixed and all other ideas to make this framework useful are welcome. -If you feel comfortable writing code, you could try to -fix [opened issues where help is wanted](https://github.com/web-token/jwt-framework/labels/help+wanted) -or [those that are easy to fix](https://github.com/web-token/jwt-framework/labels/easy-pick). - -Do not forget to [follow these best practices](.github/CONTRIBUTING.md). - -**If you think you have found a security issue, DO NOT open an issue** -. [You MUST submit your issue here](https://gitter.im/Spomky/). - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Pack/Encryption/composer.json b/src/Deprecated/Pack/Encryption/composer.json deleted file mode 100644 index 4fc593eb3..000000000 --- a/src/Deprecated/Pack/Encryption/composer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "web-token/encryption-pack", - "type": "symfony-pack", - "license": "MIT", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "require": { - "web-token/jwt-library": "^3.3", - "web-token/jwt-experimental": "^3.3" - } -} diff --git a/src/Deprecated/Pack/Signature/.github/CONTRIBUTING.md b/src/Deprecated/Pack/Signature/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Pack/Signature/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Pack/Signature/.github/FUNDING.yml b/src/Deprecated/Pack/Signature/.github/FUNDING.yml deleted file mode 100644 index 7e2ca0e7e..000000000 --- a/src/Deprecated/Pack/Signature/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -patreon: FlorentMorselli diff --git a/src/Deprecated/Pack/Signature/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Pack/Signature/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Pack/Signature/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Pack/Signature/README.md b/src/Deprecated/Pack/Signature/README.md deleted file mode 100644 index 7e439119d..000000000 --- a/src/Deprecated/Pack/Signature/README.md +++ /dev/null @@ -1,37 +0,0 @@ -Signature Algorithms Pack For JWT-Framework -=========================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Support - -I bring solutions to your problems and answer your questions. - -If you really love that project and the work I have done or if you want I prioritize your issues, then you can help me -out for a couple of :beers: or more! - -[![Become a Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/FlorentMorselli) - -# Contributing - -Requests for new features, bug fixed and all other ideas to make this framework useful are welcome. -If you feel comfortable writing code, you could try to -fix [opened issues where help is wanted](https://github.com/web-token/jwt-framework/labels/help+wanted) -or [those that are easy to fix](https://github.com/web-token/jwt-framework/labels/easy-pick). - -Do not forget to [follow these best practices](.github/CONTRIBUTING.md). - -**If you think you have found a security issue, DO NOT open an issue** -. [You MUST submit your issue here](https://gitter.im/Spomky/). - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Pack/Signature/composer.json b/src/Deprecated/Pack/Signature/composer.json deleted file mode 100644 index a18afc6f1..000000000 --- a/src/Deprecated/Pack/Signature/composer.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "web-token/signature-pack", - "type": "symfony-pack", - "license": "MIT", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "require": { - "web-token/jwt-library": "^3.3", - "web-token/jwt-experimental": "^3.3" - } -} diff --git a/src/Deprecated/Signature/.github/CONTRIBUTING.md b/src/Deprecated/Signature/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/Signature/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/Signature/.github/FUNDING.yml b/src/Deprecated/Signature/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/Signature/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/Signature/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Signature/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/Signature/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/Signature/.github/stale.yml b/src/Deprecated/Signature/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/Signature/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/Signature/LICENSE b/src/Deprecated/Signature/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/Signature/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/Signature/README.md b/src/Deprecated/Signature/README.md deleted file mode 100644 index f307bebc4..000000000 --- a/src/Deprecated/Signature/README.md +++ /dev/null @@ -1,16 +0,0 @@ -PHP JWT Signature Component -=========================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/Signature/composer.json b/src/Deprecated/Signature/composer.json deleted file mode 100644 index 7dad9daa1..000000000 --- a/src/Deprecated/Signature/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-signature", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/ECDSA/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/LICENSE b/src/Deprecated/SignatureAlgorithm/ECDSA/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/README.md b/src/Deprecated/SignatureAlgorithm/ECDSA/README.md deleted file mode 100644 index 49e2c0afc..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/README.md +++ /dev/null @@ -1,16 +0,0 @@ -ECDSA Based Signature Algorithms For JWT-Framework -================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/SignatureAlgorithm/ECDSA/composer.json b/src/Deprecated/SignatureAlgorithm/ECDSA/composer.json deleted file mode 100644 index 8d5a6657e..000000000 --- a/src/Deprecated/SignatureAlgorithm/ECDSA/composer.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-ecdsa", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/EdDSA/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/LICENSE b/src/Deprecated/SignatureAlgorithm/EdDSA/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/README.md b/src/Deprecated/SignatureAlgorithm/EdDSA/README.md deleted file mode 100644 index 559960c93..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/README.md +++ /dev/null @@ -1,16 +0,0 @@ -EdDSA Based Signature Algorithms For JWT-Framework -================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/SignatureAlgorithm/EdDSA/composer.json b/src/Deprecated/SignatureAlgorithm/EdDSA/composer.json deleted file mode 100644 index f572be837..000000000 --- a/src/Deprecated/SignatureAlgorithm/EdDSA/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-eddsa", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "ext-sodium": "*", - "paragonie/sodium_compat": "^1.20", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/Experimental/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/Experimental/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/LICENSE b/src/Deprecated/SignatureAlgorithm/Experimental/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/README.md b/src/Deprecated/SignatureAlgorithm/Experimental/README.md deleted file mode 100644 index 0a2b05ce5..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/README.md +++ /dev/null @@ -1,16 +0,0 @@ -Experimental Signature Algorithms For JWT-Framework -=================================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/SignatureAlgorithm/Experimental/composer.json b/src/Deprecated/SignatureAlgorithm/Experimental/composer.json deleted file mode 100644 index 481492f19..000000000 --- a/src/Deprecated/SignatureAlgorithm/Experimental/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-experimental", - "description": "[DEPRECATED] Please use web-token/jwt-experimental instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-experimental": "^3.3" - } -} diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/HMAC/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/HMAC/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/LICENSE b/src/Deprecated/SignatureAlgorithm/HMAC/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/README.md b/src/Deprecated/SignatureAlgorithm/HMAC/README.md deleted file mode 100644 index 470487099..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/README.md +++ /dev/null @@ -1,16 +0,0 @@ -HMAC Based Signature Algorithms For JWT-Framework -================================================= - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/SignatureAlgorithm/HMAC/composer.json b/src/Deprecated/SignatureAlgorithm/HMAC/composer.json deleted file mode 100644 index f57315c85..000000000 --- a/src/Deprecated/SignatureAlgorithm/HMAC/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-hmac", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/SignatureAlgorithm/None/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/None/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/SignatureAlgorithm/None/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/None/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/SignatureAlgorithm/None/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/None/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/SignatureAlgorithm/None/LICENSE b/src/Deprecated/SignatureAlgorithm/None/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/SignatureAlgorithm/None/README.md b/src/Deprecated/SignatureAlgorithm/None/README.md deleted file mode 100644 index dc5a288c0..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/README.md +++ /dev/null @@ -1,16 +0,0 @@ -None Signature Algorithm For JWT-Framework -========================================== - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/SignatureAlgorithm/None/composer.json b/src/Deprecated/SignatureAlgorithm/None/composer.json deleted file mode 100644 index e5d9d8150..000000000 --- a/src/Deprecated/SignatureAlgorithm/None/composer.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-none", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Deprecated/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md b/src/Deprecated/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md deleted file mode 100644 index 5e80b426f..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/.github/CONTRIBUTING.md +++ /dev/null @@ -1,5 +0,0 @@ -# Contributing - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. -Please do not submit any Pull Requests here. It will be automatically closed. diff --git a/src/Deprecated/SignatureAlgorithm/RSA/.github/FUNDING.yml b/src/Deprecated/SignatureAlgorithm/RSA/.github/FUNDING.yml deleted file mode 100644 index 726574c1f..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: Spomky -patreon: FlorentMorselli diff --git a/src/Deprecated/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d4ff96cb4..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,3 +0,0 @@ -Please do not submit any Pull Requests here. It will be automatically closed. - -You should submit it here: https://github.com/web-token/jwt-framework/pulls diff --git a/src/Deprecated/SignatureAlgorithm/RSA/.github/stale.yml b/src/Deprecated/SignatureAlgorithm/RSA/.github/stale.yml deleted file mode 100644 index 3c84124dd..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/.github/stale.yml +++ /dev/null @@ -1,8 +0,0 @@ -daysUntilStale: 60 -daysUntilClose: 7 -staleLabel: wontfix -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -closeComment: false diff --git a/src/Deprecated/SignatureAlgorithm/RSA/LICENSE b/src/Deprecated/SignatureAlgorithm/RSA/LICENSE deleted file mode 100644 index 5ab750604..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2024 Spomky-Labs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/src/Deprecated/SignatureAlgorithm/RSA/README.md b/src/Deprecated/SignatureAlgorithm/RSA/README.md deleted file mode 100644 index e37c688db..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/README.md +++ /dev/null @@ -1,16 +0,0 @@ -RSA Based Signature Algorithms For JWT-Framework -================================================ - -This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is -READ ONLY. - -**Please do not submit any Pull Request here.** -You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. - -# Documentation - -The official documentation is available as https://web-token.spomky-labs.com/ - -# Licence - -This software is release under [MIT licence](LICENSE). diff --git a/src/Deprecated/SignatureAlgorithm/RSA/composer.json b/src/Deprecated/SignatureAlgorithm/RSA/composer.json deleted file mode 100644 index 78c770c5f..000000000 --- a/src/Deprecated/SignatureAlgorithm/RSA/composer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "web-token/jwt-signature-algorithm-rsa", - "description": "[DEPRECATED] Please use web-token/jwt-library instead.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-framework/contributors" - } - ], - "require": { - "php": ">=8.1", - "brick/math": "^0.9|^0.10|^0.11|^0.12", - "ext-openssl": "*", - "web-token/jwt-library": "^3.3" - } -} diff --git a/src/Experimental/composer.json b/src/Experimental/composer.json index 394f915ce..13763211b 100644 --- a/src/Experimental/composer.json +++ b/src/Experimental/composer.json @@ -38,8 +38,8 @@ } }, "require": { - "php": ">=8.1", + "php": ">=8.3", "ext-openssl": "*", - "web-token/jwt-library": "^3.3" + "web-token/jwt-library": "^4.0" } } diff --git a/src/Library/Checker/ExpirationTimeChecker.php b/src/Library/Checker/ExpirationTimeChecker.php index f016d399c..9541be76b 100644 --- a/src/Library/Checker/ExpirationTimeChecker.php +++ b/src/Library/Checker/ExpirationTimeChecker.php @@ -13,24 +13,13 @@ */ final class ExpirationTimeChecker implements ClaimChecker, HeaderChecker { - private const NAME = 'exp'; - - private readonly ClockInterface $clock; + private const string NAME = 'exp'; public function __construct( + private readonly ClockInterface $clock, private readonly int $allowedTimeDrift = 0, private readonly bool $protectedHeaderOnly = false, - ?ClockInterface $clock = null, ) { - if ($clock === null) { - trigger_deprecation( - 'web-token/jwt-library', - '3.3.0', - 'The parameter "$clock" will become mandatory in 4.0.0. Please set a valid PSR Clock implementation instead of "null".' - ); - $clock = new InternalClock(); - } - $this->clock = $clock; } public function checkClaim(mixed $value): void diff --git a/src/Library/Checker/IssuedAtChecker.php b/src/Library/Checker/IssuedAtChecker.php index 4ed0fd204..ed02cf568 100644 --- a/src/Library/Checker/IssuedAtChecker.php +++ b/src/Library/Checker/IssuedAtChecker.php @@ -13,24 +13,13 @@ */ final class IssuedAtChecker implements ClaimChecker, HeaderChecker { - private const NAME = 'iat'; - - private readonly ClockInterface $clock; + private const string NAME = 'iat'; public function __construct( + private readonly ClockInterface $clock, private readonly int $allowedTimeDrift = 0, private readonly bool $protectedHeaderOnly = false, - ?ClockInterface $clock = null, ) { - if ($clock === null) { - trigger_deprecation( - 'web-token/jwt-library', - '3.3.0', - 'The parameter "$clock" will become mandatory in 4.0.0. Please set a valid PSR Clock implementation instead of "null".' - ); - $clock = new InternalClock(); - } - $this->clock = $clock; } public function checkClaim(mixed $value): void diff --git a/src/Library/Checker/NotBeforeChecker.php b/src/Library/Checker/NotBeforeChecker.php index c5b6adaf8..35585ae94 100644 --- a/src/Library/Checker/NotBeforeChecker.php +++ b/src/Library/Checker/NotBeforeChecker.php @@ -13,24 +13,13 @@ */ final class NotBeforeChecker implements ClaimChecker, HeaderChecker { - private const NAME = 'nbf'; - - private readonly ClockInterface $clock; + private const string NAME = 'nbf'; public function __construct( + private readonly ClockInterface $clock, private readonly int $allowedTimeDrift = 0, private readonly bool $protectedHeaderOnly = false, - ?ClockInterface $clock = null, ) { - if ($clock === null) { - trigger_deprecation( - 'web-token/jwt-library', - '3.3.0', - 'The parameter "$clock" will become mandatory in 4.0.0. Please set a valid PSR Clock implementation instead of "null".' - ); - $clock = new InternalClock(); - } - $this->clock = $clock; } public function checkClaim(mixed $value): void diff --git a/src/Library/Core/Util/ECKey.php b/src/Library/Core/Util/ECKey.php index 6cef96876..9bd92186b 100644 --- a/src/Library/Core/Util/ECKey.php +++ b/src/Library/Core/Util/ECKey.php @@ -115,13 +115,13 @@ private static function createECKeyUsingOpenSSL(string $curve): array 'kty' => 'EC', 'crv' => $curve, 'd' => Base64UrlSafe::encodeUnpadded( - str_pad((string) $details['ec']['d'], (int) ceil($nistCurveSize / 8), "\0", STR_PAD_LEFT) + mb_str_pad((string) $details['ec']['d'], (int) ceil($nistCurveSize / 8), "\0", STR_PAD_LEFT, '8bit') ), 'x' => Base64UrlSafe::encodeUnpadded( - str_pad((string) $details['ec']['x'], (int) ceil($nistCurveSize / 8), "\0", STR_PAD_LEFT) + mb_str_pad((string) $details['ec']['x'], (int) ceil($nistCurveSize / 8), "\0", STR_PAD_LEFT, '8bit') ), 'y' => Base64UrlSafe::encodeUnpadded( - str_pad((string) $details['ec']['y'], (int) ceil($nistCurveSize / 8), "\0", STR_PAD_LEFT) + mb_str_pad((string) $details['ec']['y'], (int) ceil($nistCurveSize / 8), "\0", STR_PAD_LEFT, '8bit') ), ]; } @@ -203,7 +203,7 @@ private static function p256PrivateKey(JWK $jwk): string if (! is_string($d)) { throw new InvalidArgumentException('Unable to get the private key'); } - $d = unpack('H*', str_pad(Base64UrlSafe::decodeNoPadding($d), 32, "\0", STR_PAD_LEFT)); + $d = unpack('H*', mb_str_pad(Base64UrlSafe::decodeNoPadding($d), 32, "\0", STR_PAD_LEFT, '8bit')); if (! is_array($d) || ! isset($d[1])) { throw new InvalidArgumentException('Unable to get the private key'); } @@ -229,7 +229,7 @@ private static function p256KPrivateKey(JWK $jwk): string if (! is_string($d)) { throw new InvalidArgumentException('Unable to get the private key'); } - $d = unpack('H*', str_pad(Base64UrlSafe::decodeNoPadding($d), 32, "\0", STR_PAD_LEFT)); + $d = unpack('H*', mb_str_pad(Base64UrlSafe::decodeNoPadding($d), 32, "\0", STR_PAD_LEFT, '8bit')); if (! is_array($d) || ! isset($d[1])) { throw new InvalidArgumentException('Unable to get the private key'); } @@ -255,7 +255,7 @@ private static function p384PrivateKey(JWK $jwk): string if (! is_string($d)) { throw new InvalidArgumentException('Unable to get the private key'); } - $d = unpack('H*', str_pad(Base64UrlSafe::decodeNoPadding($d), 48, "\0", STR_PAD_LEFT)); + $d = unpack('H*', mb_str_pad(Base64UrlSafe::decodeNoPadding($d), 48, "\0", STR_PAD_LEFT, '8bit')); if (! is_array($d) || ! isset($d[1])) { throw new InvalidArgumentException('Unable to get the private key'); } @@ -281,7 +281,7 @@ private static function p521PrivateKey(JWK $jwk): string if (! is_string($d)) { throw new InvalidArgumentException('Unable to get the private key'); } - $d = unpack('H*', str_pad(Base64UrlSafe::decodeNoPadding($d), 66, "\0", STR_PAD_LEFT)); + $d = unpack('H*', mb_str_pad(Base64UrlSafe::decodeNoPadding($d), 66, "\0", STR_PAD_LEFT, '8bit')); if (! is_array($d) || ! isset($d[1])) { throw new InvalidArgumentException('Unable to get the private key'); } @@ -321,8 +321,8 @@ private static function getKey(JWK $jwk): string $binY = ltrim(Base64UrlSafe::decodeNoPadding($y), "\0"); return "\04" - . str_pad($binX, $length, "\0", STR_PAD_LEFT) - . str_pad($binY, $length, "\0", STR_PAD_LEFT) + . mb_str_pad($binX, $length, "\0", STR_PAD_LEFT, '8bit') + . mb_str_pad($binY, $length, "\0", STR_PAD_LEFT, '8bit') ; } } diff --git a/src/Library/Core/Util/ECSignature.php b/src/Library/Core/Util/ECSignature.php index 4ca1c0c10..689150914 100644 --- a/src/Library/Core/Util/ECSignature.php +++ b/src/Library/Core/Util/ECSignature.php @@ -74,7 +74,13 @@ public static function fromAsn1(string $signature, int $length): string $pointS = self::retrievePositiveInteger(self::readAsn1Integer($message, $position)); $bin = hex2bin( - str_pad($pointR, $length, '0', STR_PAD_LEFT) . str_pad($pointS, $length, '0', STR_PAD_LEFT) + mb_str_pad($pointR, $length, '0', STR_PAD_LEFT, '8bit') . mb_str_pad( + $pointS, + $length, + '0', + STR_PAD_LEFT, + '8bit' + ) ); if (! is_string($bin)) { throw new InvalidArgumentException('Unable to parse the data'); diff --git a/src/Library/Core/Util/Ecc/Curve.php b/src/Library/Core/Util/Ecc/Curve.php index 59be935bf..b8b53a524 100644 --- a/src/Library/Core/Util/Ecc/Curve.php +++ b/src/Library/Core/Util/Ecc/Curve.php @@ -151,7 +151,7 @@ public function mul(Point $one, BigInteger $n): Point $r = [Point::infinity(), clone $one]; $k = $this->getSize(); - $n1 = str_pad(Math::baseConvert(Math::toString($n), 10, 2), $k, '0', STR_PAD_LEFT); + $n1 = mb_str_pad(Math::baseConvert(Math::toString($n), 10, 2), $k, '0', STR_PAD_LEFT, '8bit'); for ($i = 0; $i < $k; ++$i) { $j = $n1[$i]; diff --git a/src/Library/Core/Util/Ecc/Point.php b/src/Library/Core/Util/Ecc/Point.php index cbd39a383..e88127400 100644 --- a/src/Library/Core/Util/Ecc/Point.php +++ b/src/Library/Core/Util/Ecc/Point.php @@ -92,7 +92,7 @@ private static function cswapBigInteger(BigInteger &$sa, BigInteger &$sb, int $c { $size = max(mb_strlen($sa->toBase(2), '8bit'), mb_strlen($sb->toBase(2), '8bit')); $mask = (string) (1 - $cond); - $mask = str_pad('', $size, $mask, STR_PAD_LEFT); + $mask = mb_str_pad('', $size, $mask, STR_PAD_LEFT, '8bit'); $mask = BigInteger::fromBase($mask, 2); $taA = $sa->and($mask); $taB = $sb->and($mask); diff --git a/src/Library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php b/src/Library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php index f753b6cc3..3084efe35 100644 --- a/src/Library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php +++ b/src/Library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php @@ -56,7 +56,7 @@ public static function generate( */ private static function toInt32Bits(int $value): string { - $result = hex2bin(str_pad(dechex($value), 8, '0', STR_PAD_LEFT)); + $result = hex2bin(mb_str_pad(dechex($value), 8, '0', STR_PAD_LEFT, '8bit')); if ($result === false) { throw new InvalidArgumentException('Invalid result'); } diff --git a/src/Library/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php b/src/Library/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php index e53f85aa1..596a0d09f 100644 --- a/src/Library/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php +++ b/src/Library/Encryption/Algorithm/KeyEncryption/Util/RSACrypt.php @@ -23,12 +23,12 @@ final class RSACrypt /** * Optimal Asymmetric Encryption Padding (OAEP). */ - public const ENCRYPTION_OAEP = 1; + public const int ENCRYPTION_OAEP = 1; /** * Use PKCS#1 padding. */ - public const ENCRYPTION_PKCS1 = 2; + public const int ENCRYPTION_PKCS1 = 2; public static function encrypt(RSAKey $key, string $data, int $mode, ?string $hash = null): string { @@ -135,11 +135,12 @@ public static function decryptWithRSAOAEP(RSAKey $key, string $ciphertext, strin } $hash = Hash::$hash_algorithm(); $splitCiphertext = mb_str_split($ciphertext, $key->getModulusLength(), '8bit'); - $splitCiphertext[count($splitCiphertext) - 1] = str_pad( + $splitCiphertext[count($splitCiphertext) - 1] = mb_str_pad( $splitCiphertext[count($splitCiphertext) - 1], $key->getModulusLength(), chr(0), - STR_PAD_LEFT + STR_PAD_LEFT, + '8bit' ); $plaintext = ''; foreach ($splitCiphertext as $c) { @@ -157,7 +158,7 @@ private static function convertIntegerToOctetString(BigInteger $x, int $xLen): s throw new RuntimeException('Invalid length.'); } - return str_pad($x, $xLen, chr(0), STR_PAD_LEFT); + return mb_str_pad($x, $xLen, chr(0), STR_PAD_LEFT, '8bit'); } /** diff --git a/src/Library/Encryption/Algorithm/KeyEncryptionAlgorithm.php b/src/Library/Encryption/Algorithm/KeyEncryptionAlgorithm.php index 9012a2022..c3ae1d118 100644 --- a/src/Library/Encryption/Algorithm/KeyEncryptionAlgorithm.php +++ b/src/Library/Encryption/Algorithm/KeyEncryptionAlgorithm.php @@ -8,13 +8,13 @@ interface KeyEncryptionAlgorithm extends Algorithm { - public const MODE_DIRECT = 'dir'; + public const string MODE_DIRECT = 'dir'; - public const MODE_ENCRYPT = 'enc'; + public const string MODE_ENCRYPT = 'enc'; - public const MODE_WRAP = 'wrap'; + public const string MODE_WRAP = 'wrap'; - public const MODE_AGREEMENT = 'agree'; + public const string MODE_AGREEMENT = 'agree'; /** * Returns the key management mode used by the key encryption algorithm. diff --git a/src/Library/Encryption/JWEBuilder.php b/src/Library/Encryption/JWEBuilder.php index 73827c9c5..c3f1b5e84 100644 --- a/src/Library/Encryption/JWEBuilder.php +++ b/src/Library/Encryption/JWEBuilder.php @@ -51,31 +51,20 @@ class JWEBuilder public function __construct( AlgorithmManager $algorithmManager, - null|AlgorithmManager $contentEncryptionAlgorithmManager, private readonly CompressionMethodManager $compressionManager ) { - if ($contentEncryptionAlgorithmManager !== null) { - trigger_deprecation( - 'web-token/jwt-library', - '3.3.0', - 'The parameter "$contentEncryptionAlgorithmManager" is deprecated and will be removed in 4.0.0. Please set all algorithms in the first argument and set "null" instead.' - ); - $this->keyEncryptionAlgorithmManager = $algorithmManager; - $this->contentEncryptionAlgorithmManager = $contentEncryptionAlgorithmManager; - } else { - $keyEncryptionAlgorithms = []; - $contentEncryptionAlgorithms = []; - foreach ($algorithmManager->all() as $algorithm) { - if ($algorithm instanceof KeyEncryptionAlgorithm) { - $keyEncryptionAlgorithms[] = $algorithm; - } - if ($algorithm instanceof ContentEncryptionAlgorithm) { - $contentEncryptionAlgorithms[] = $algorithm; - } + $keyEncryptionAlgorithms = []; + $contentEncryptionAlgorithms = []; + foreach ($algorithmManager->all() as $algorithm) { + if ($algorithm instanceof KeyEncryptionAlgorithm) { + $keyEncryptionAlgorithms[] = $algorithm; + } + if ($algorithm instanceof ContentEncryptionAlgorithm) { + $contentEncryptionAlgorithms[] = $algorithm; } - $this->keyEncryptionAlgorithmManager = new AlgorithmManager($keyEncryptionAlgorithms); - $this->contentEncryptionAlgorithmManager = new AlgorithmManager($contentEncryptionAlgorithms); } + $this->keyEncryptionAlgorithmManager = new AlgorithmManager($keyEncryptionAlgorithms); + $this->contentEncryptionAlgorithmManager = new AlgorithmManager($contentEncryptionAlgorithms); } /** diff --git a/src/Library/Encryption/JWEBuilderFactory.php b/src/Library/Encryption/JWEBuilderFactory.php index 37f5d9b10..badb62a36 100644 --- a/src/Library/Encryption/JWEBuilderFactory.php +++ b/src/Library/Encryption/JWEBuilderFactory.php @@ -28,14 +28,12 @@ public function create( array $contentEncryptionAlgorithm, array $compressionMethods ): JWEBuilder { - $keyEncryptionAlgorithmManager = $this->algorithmManagerFactory->create($keyEncryptionAlgorithms); - $contentEncryptionAlgorithmManager = $this->algorithmManagerFactory->create($contentEncryptionAlgorithm); + $algorithmManager = $this->algorithmManagerFactory->create(array_merge( + $keyEncryptionAlgorithms, + $contentEncryptionAlgorithm + )); $compressionMethodManager = $this->compressionMethodManagerFactory->create($compressionMethods); - return new JWEBuilder( - $keyEncryptionAlgorithmManager, - $contentEncryptionAlgorithmManager, - $compressionMethodManager - ); + return new JWEBuilder($algorithmManager, $compressionMethodManager); } } diff --git a/src/Library/Encryption/JWEDecrypter.php b/src/Library/Encryption/JWEDecrypter.php index e688112ef..f72d1d641 100644 --- a/src/Library/Encryption/JWEDecrypter.php +++ b/src/Library/Encryption/JWEDecrypter.php @@ -30,31 +30,20 @@ class JWEDecrypter public function __construct( AlgorithmManager $algorithmManager, - null|AlgorithmManager $contentEncryptionAlgorithmManager, private readonly CompressionMethodManager $compressionMethodManager ) { - if ($contentEncryptionAlgorithmManager !== null) { - trigger_deprecation( - 'web-token/jwt-library', - '3.3.0', - 'The parameter "$contentEncryptionAlgorithmManager" is deprecated and will be removed in 4.0.0. Please set all algorithms in the first argument and set "null" instead.' - ); - $this->keyEncryptionAlgorithmManager = $algorithmManager; - $this->contentEncryptionAlgorithmManager = $contentEncryptionAlgorithmManager; - } else { - $keyEncryptionAlgorithms = []; - $contentEncryptionAlgorithms = []; - foreach ($algorithmManager->all() as $key => $algorithm) { - if ($algorithm instanceof KeyEncryptionAlgorithm) { - $keyEncryptionAlgorithms[$key] = $algorithm; - } - if ($algorithm instanceof ContentEncryptionAlgorithm) { - $contentEncryptionAlgorithms[$key] = $algorithm; - } + $keyEncryptionAlgorithms = []; + $contentEncryptionAlgorithms = []; + foreach ($algorithmManager->all() as $key => $algorithm) { + if ($algorithm instanceof KeyEncryptionAlgorithm) { + $keyEncryptionAlgorithms[$key] = $algorithm; + } + if ($algorithm instanceof ContentEncryptionAlgorithm) { + $contentEncryptionAlgorithms[$key] = $algorithm; } - $this->keyEncryptionAlgorithmManager = new AlgorithmManager($keyEncryptionAlgorithms); - $this->contentEncryptionAlgorithmManager = new AlgorithmManager($contentEncryptionAlgorithms); } + $this->keyEncryptionAlgorithmManager = new AlgorithmManager($keyEncryptionAlgorithms); + $this->contentEncryptionAlgorithmManager = new AlgorithmManager($contentEncryptionAlgorithms); } /** diff --git a/src/Library/Encryption/JWEDecrypterFactory.php b/src/Library/Encryption/JWEDecrypterFactory.php index a61ef3bae..8149d075e 100644 --- a/src/Library/Encryption/JWEDecrypterFactory.php +++ b/src/Library/Encryption/JWEDecrypterFactory.php @@ -33,6 +33,6 @@ public function create( ); $compressionMethodManager = $this->compressionMethodManagerFactory->create($compressionMethods); - return new JWEDecrypter($algorithmManager, null, $compressionMethodManager); + return new JWEDecrypter($algorithmManager, $compressionMethodManager); } } diff --git a/src/Library/Encryption/Serializer/CompactSerializer.php b/src/Library/Encryption/Serializer/CompactSerializer.php index ba015e8a1..cb2fae595 100644 --- a/src/Library/Encryption/Serializer/CompactSerializer.php +++ b/src/Library/Encryption/Serializer/CompactSerializer.php @@ -16,7 +16,7 @@ final class CompactSerializer implements JWESerializer { - public const NAME = 'jwe_compact'; + public const string NAME = 'jwe_compact'; public function displayName(): string { diff --git a/src/Library/Encryption/Serializer/JSONFlattenedSerializer.php b/src/Library/Encryption/Serializer/JSONFlattenedSerializer.php index 6ecf28e3e..5d52db8ff 100644 --- a/src/Library/Encryption/Serializer/JSONFlattenedSerializer.php +++ b/src/Library/Encryption/Serializer/JSONFlattenedSerializer.php @@ -15,7 +15,7 @@ final class JSONFlattenedSerializer implements JWESerializer { - public const NAME = 'jwe_json_flattened'; + public const string NAME = 'jwe_json_flattened'; public function displayName(): string { diff --git a/src/Library/Encryption/Serializer/JSONGeneralSerializer.php b/src/Library/Encryption/Serializer/JSONGeneralSerializer.php index 96f23dc0a..c456e0ba8 100644 --- a/src/Library/Encryption/Serializer/JSONGeneralSerializer.php +++ b/src/Library/Encryption/Serializer/JSONGeneralSerializer.php @@ -16,7 +16,7 @@ final class JSONGeneralSerializer implements JWESerializer { - public const NAME = 'jwe_json_general'; + public const string NAME = 'jwe_json_general'; public function displayName(): string { diff --git a/src/Library/KeyManagement/Analyzer/Message.php b/src/Library/KeyManagement/Analyzer/Message.php index b97b19fbc..65933574d 100644 --- a/src/Library/KeyManagement/Analyzer/Message.php +++ b/src/Library/KeyManagement/Analyzer/Message.php @@ -8,11 +8,11 @@ class Message implements JsonSerializable { - final public const SEVERITY_LOW = 'low'; + final public const string SEVERITY_LOW = 'low'; - final public const SEVERITY_MEDIUM = 'medium'; + final public const string SEVERITY_MEDIUM = 'medium'; - final public const SEVERITY_HIGH = 'high'; + final public const string SEVERITY_HIGH = 'high'; private function __construct( private readonly string $message, diff --git a/src/Library/KeyManagement/Analyzer/RsaAnalyzer.php b/src/Library/KeyManagement/Analyzer/RsaAnalyzer.php index 43f0b1f58..84885e2b9 100644 --- a/src/Library/KeyManagement/Analyzer/RsaAnalyzer.php +++ b/src/Library/KeyManagement/Analyzer/RsaAnalyzer.php @@ -9,6 +9,7 @@ use ParagonIE\ConstantTime\Base64UrlSafe; use function is_array; use function is_string; +use const STR_PAD_RIGHT; final class RsaAnalyzer implements KeyAnalyzer { @@ -30,7 +31,7 @@ private function checkExponent(JWK $jwk, MessageBag $bag): void return; } - $exponent = unpack('l', str_pad(Base64UrlSafe::decodeNoPadding($e), 4, "\0")); + $exponent = unpack('l', mb_str_pad(Base64UrlSafe::decodeNoPadding($e), 4, "\0", STR_PAD_RIGHT, '8bit')); if (! is_array($exponent) || ! isset($exponent[1])) { throw new InvalidArgumentException('Unable to get the private key'); } diff --git a/src/Library/KeyManagement/UrlKeySetFactory.php b/src/Library/KeyManagement/UrlKeySetFactory.php index 6bd2553ca..58afe5d11 100644 --- a/src/Library/KeyManagement/UrlKeySetFactory.php +++ b/src/Library/KeyManagement/UrlKeySetFactory.php @@ -4,11 +4,8 @@ namespace Jose\Component\KeyManagement; -use Psr\Http\Client\ClientInterface; -use Psr\Http\Message\RequestFactoryInterface; use RuntimeException; use Symfony\Contracts\HttpClient\HttpClientInterface; -use function assert; /** * @see \Jose\Tests\Component\KeyManagement\UrlKeySetFactoryTest @@ -16,25 +13,8 @@ abstract class UrlKeySetFactory { public function __construct( - private readonly ClientInterface|HttpClientInterface $client, - private readonly null|RequestFactoryInterface $requestFactory = null + private readonly HttpClientInterface $client, ) { - if ($this->client instanceof ClientInterface) { - trigger_deprecation( - 'web-token/jwt-library', - '3.3', - 'Using "%s" with an instance of "%s" is deprecated, use "%s" instead.', - self::class, - ClientInterface::class, - HttpClientInterface::class - ); - } - if (! $this->client instanceof HttpClientInterface && $this->requestFactory === null) { - throw new RuntimeException(sprintf( - 'The request factory must be provided when using an instance of "%s" as client.', - ClientInterface::class - )); - } } /** @@ -42,18 +22,6 @@ public function __construct( */ protected function getContent(string $url, array $header = []): string { - if ($this->client instanceof HttpClientInterface) { - return $this->sendSymfonyRequest($url, $header); - } - return $this->sendPsrRequest($url, $header); - } - - /** - * @param array $header - */ - private function sendSymfonyRequest(string $url, array $header = []): string - { - assert($this->client instanceof HttpClientInterface); $response = $this->client->request('GET', $url, [ 'headers' => $header, ]); @@ -64,25 +32,4 @@ private function sendSymfonyRequest(string $url, array $header = []): string return $response->getContent(); } - - /** - * @param array $header - */ - private function sendPsrRequest(string $url, array $header = []): string - { - assert($this->client instanceof ClientInterface); - assert($this->requestFactory instanceof RequestFactoryInterface); - $request = $this->requestFactory->createRequest('GET', $url); - foreach ($header as $k => $v) { - $request = $request->withHeader($k, $v); - } - $response = $this->client->sendRequest($request); - - if ($response->getStatusCode() >= 400) { - throw new RuntimeException('Unable to get the key set.', $response->getStatusCode()); - } - - return $response->getBody() - ->getContents(); - } } diff --git a/src/Library/Signature/Algorithm/Util/RSA.php b/src/Library/Signature/Algorithm/Util/RSA.php index 4c1194fe4..75e0e2ce9 100644 --- a/src/Library/Signature/Algorithm/Util/RSA.php +++ b/src/Library/Signature/Algorithm/Util/RSA.php @@ -22,12 +22,12 @@ final class RSA /** * Probabilistic Signature Scheme. */ - public const SIGNATURE_PSS = 1; + public const int SIGNATURE_PSS = 1; /** * Use the PKCS#1. */ - public const SIGNATURE_PKCS1 = 2; + public const int SIGNATURE_PKCS1 = 2; /** * @return non-empty-string @@ -110,7 +110,7 @@ private static function convertIntegerToOctetString(BigInteger $x, int $xLen): s throw new RuntimeException(); } - return str_pad($x, $xLen, chr(0), STR_PAD_LEFT); + return mb_str_pad($x, $xLen, chr(0), STR_PAD_LEFT, '8bit'); } /** diff --git a/src/Library/Signature/Serializer/CompactSerializer.php b/src/Library/Signature/Serializer/CompactSerializer.php index 3a657a147..55b5a0f7e 100644 --- a/src/Library/Signature/Serializer/CompactSerializer.php +++ b/src/Library/Signature/Serializer/CompactSerializer.php @@ -15,7 +15,7 @@ final class CompactSerializer extends Serializer { - public const NAME = 'jws_compact'; + public const string NAME = 'jws_compact'; public function displayName(): string { diff --git a/src/Library/Signature/Serializer/JSONFlattenedSerializer.php b/src/Library/Signature/Serializer/JSONFlattenedSerializer.php index 1a8b4cb00..342d910b4 100644 --- a/src/Library/Signature/Serializer/JSONFlattenedSerializer.php +++ b/src/Library/Signature/Serializer/JSONFlattenedSerializer.php @@ -13,7 +13,7 @@ final class JSONFlattenedSerializer extends Serializer { - public const NAME = 'jws_json_flattened'; + public const string NAME = 'jws_json_flattened'; public function displayName(): string { diff --git a/src/Library/Signature/Serializer/JSONGeneralSerializer.php b/src/Library/Signature/Serializer/JSONGeneralSerializer.php index 1905e645e..4329b0e3f 100644 --- a/src/Library/Signature/Serializer/JSONGeneralSerializer.php +++ b/src/Library/Signature/Serializer/JSONGeneralSerializer.php @@ -16,7 +16,7 @@ final class JSONGeneralSerializer extends Serializer { - public const NAME = 'jws_json_general'; + public const string NAME = 'jws_json_general'; public function displayName(): string { diff --git a/src/Library/composer.json b/src/Library/composer.json index bf35f837b..5c2f12078 100644 --- a/src/Library/composer.json +++ b/src/Library/composer.json @@ -38,18 +38,18 @@ } }, "require": { - "php": ">=8.1", + "php": ">=8.3", "ext-json": "*", "ext-mbstring": "*", - "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/http-factory": "^1.0", "psr/http-client": "^1.0", "spomky-labs/pki-framework": "^1.0", - "symfony/console": "^5.4|^6.0|^7.0", - "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/console": "^7.0", + "symfony/http-client": "^7.0", "symfony/polyfill-mbstring": "^1.12" }, "conflict": { diff --git a/tests/Bundle/JoseFramework/TestBundle/Resources/config/services.php b/tests/Bundle/JoseFramework/TestBundle/Resources/config/services.php index 20f05db83..5eeef8c84 100644 --- a/tests/Bundle/JoseFramework/TestBundle/Resources/config/services.php +++ b/tests/Bundle/JoseFramework/TestBundle/Resources/config/services.php @@ -3,6 +3,8 @@ declare(strict_types=1); use Jose\Tests\Bundle\JoseFramework\TestBundle\Checker\CustomChecker; +use Psr\Clock\ClockInterface; +use Symfony\Component\Clock\NativeClock; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return function (ContainerConfigurator $container) { @@ -19,4 +21,8 @@ ->tag('jose.checker.claim', [ 'alias' => 'custom_checker', ]); + + $container->set(ClockInterface::class) + ->class(NativeClock::class) + ; }; diff --git a/tests/Component/Encryption/EncrypterTest.php b/tests/Component/Encryption/EncrypterTest.php index 9173f8ece..02cd957d9 100644 --- a/tests/Component/Encryption/EncrypterTest.php +++ b/tests/Component/Encryption/EncrypterTest.php @@ -364,9 +364,7 @@ public function encParameterIsMissing(): void public function notAKeyEncryptionAlgorithm(): void { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage( - 'The key encryption algorithm "A256CBC-HS512" is not supported or not a key encryption algorithm instance.' - ); + $this->expectExceptionMessage('The algorithm "A256CBC-HS512" is not supported.'); $jweBuilder = $this->getJWEBuilderFactory() ->create(['A256CBC-HS512'], ['A256CBC-HS512'], ['DEF']); @@ -388,9 +386,7 @@ public function notAKeyEncryptionAlgorithm(): void public function notAContentEncryptionAlgorithm(): void { $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage( - 'The content encryption algorithm "RSA-OAEP-256" is not supported or not a content encryption algorithm instance.' - ); + $this->expectExceptionMessage('The algorithm "RSA-OAEP-256" is not supported.'); $jweBuilder = $this->getJWEBuilderFactory() ->create(['RSA-OAEP-256'], ['RSA-OAEP-256'], ['DEF']); diff --git a/tests/Component/Encryption/RSAKeyEncryptionTest.php b/tests/Component/Encryption/RSAKeyEncryptionTest.php index c2006b3ec..de91fd445 100644 --- a/tests/Component/Encryption/RSAKeyEncryptionTest.php +++ b/tests/Component/Encryption/RSAKeyEncryptionTest.php @@ -94,7 +94,7 @@ public function rSA15EncryptionAndDecryption(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -164,7 +164,7 @@ public function rSAOAEPEncryptionAndDecryption(): void 252, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -234,7 +234,7 @@ public function rSAOAEP256EncryptionAndDecryption(): void 252, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); diff --git a/tests/Component/KeyManagement/UrlKeySetFactoryTest.php b/tests/Component/KeyManagement/UrlKeySetFactoryTest.php index 9cce4e701..b0b4e022d 100644 --- a/tests/Component/KeyManagement/UrlKeySetFactoryTest.php +++ b/tests/Component/KeyManagement/UrlKeySetFactoryTest.php @@ -4,45 +4,43 @@ namespace Jose\Tests\Component\KeyManagement; -use Http\Mock\Client; use InvalidArgumentException; use Jose\Component\KeyManagement\JKUFactory; use Jose\Component\KeyManagement\X5UFactory; -use Nyholm\Psr7\Factory\Psr17Factory; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; use RuntimeException; +use Symfony\Component\HttpClient\MockHttpClient; +use Symfony\Component\HttpClient\Response\MockResponse; +use Symfony\Contracts\HttpClient\HttpClientInterface; /** * @internal */ final class UrlKeySetFactoryTest extends TestCase { - private Psr17Factory $messageFactory; - private ?JKUFactory $jkuFactory = null; private ?X5UFactory $x5uFactory = null; - private ?Client $httpClient = null; + private ?HttpClientInterface $httpClient = null; protected function setUp(): void { - $this->messageFactory = new Psr17Factory(); } #[Test] public function iCanGetAKeySetFromAJWKUrl(): void { - $response = $this->messageFactory->createResponse(200); - $response->getBody() - ->write( - '{"keys": [{"kty": "RSA","alg": "RS256","use": "sig","kid": "acde8d7c1997d82dcf5d5ed2858ac8d060cd3ca9","n": "kfQP58EQpxAqZUCiGolkyCio8S3hG9HTMfQpB7VVDB69mK3AN68ZmWeGTIvDnbcslQ1TEhjZ8bKJwWHFlyoJOxeGaEsn0G3xAmPeUW8WjS2tLTKx8DUYOAgto9VOWip5dngZVMrCL85fPk-jiKEL3ODsyddZiOOhBEjapco_RTDPVurVreDnG6mbScCslHda5T6KudyFOQLD77BulIENlpE5Lxh3KFGrGgu_RiVOf-XtHDDExiWOsaUhOSZFkecqF56upROBQRIuNqHv98icbVKRzYcDteRckJGfk12faaQhX24QCDsIrT8NHbbB9eKX7rcnDMp8GxSArct7KyOxyw","e": "AQAB"},{"kty": "RSA","alg": "RS256","use": "sig","kid": "ce760dff481ee9bca45ccab64eada328029bc0aa","n": "47QQ2Ru1h3WWxcTUbwQvhD_ncEw7avXtXDmcY_8zxC9FcPwv6GcAvjoWuF0afBNK4UoNqW9gG_eq96FnMUF0iIVkPio-h3cpOHzAhKN-LHB9UMx3WDCVYxeRjGOgKU8oLz7ioqGhyZc-oxWk0v691Ybp83OPhWa0bVAmTgSaAuPpyw-ZLg-Nb4eF---vjb1N0ptYltSOQNEZ3BK9jEbWKNHASTcTpFkigcWyLp_sFv79W_DLZEKIb4TxaoGGWA-AMiErFsAnzcU7Ia4ETyp5ucI6o4SifKzI1SKRkUTinlVnvedwXhu21HBviEe_a-fg3uYc7JTMgFNG3kQlfks8AQ","e": "AQAB"},{"kty": "RSA","alg": "RS256","use": "sig","kid": "3ce4a97d502af058eb66ac8d730a592ab7cea7f1","n": "5JjYSEt7lxpIBtnZSAta6uPZpiAFSwzRhhWdBbRr1QuEMPhBvfWsy0PArA8xx5U8AIWftTmhsTdXvkLRLrG_vT4fxjU22K2YBoeTY2v2QIvJOUyhLWOr5wVtG9iWtg86FsGv0ukEgEpx2mqIlpz0KWkEZwIhtYRTtFQh_G4QFjvyAg70iFi7BvSizfZlEDrg5-5ksia0Gy_gmjGvgTLHGBLciKo5d5Aw-DBPJqunnJacVu6rTkBF_QgsOWpO5Y8XuKbjEKNzUHSv6TxumaK7ueU1ckucdtkAHqURzEInbb3BxWYme_3JCzTDMRy4-pEoWR-NyLZwEZxxOtGFQRXhZw","e": "AQAB"}]}' - ); - $response->getBody() - ->rewind(); + $response = new MockResponse( + '{"keys": [{"kty": "RSA","alg": "RS256","use": "sig","kid": "acde8d7c1997d82dcf5d5ed2858ac8d060cd3ca9","n": "kfQP58EQpxAqZUCiGolkyCio8S3hG9HTMfQpB7VVDB69mK3AN68ZmWeGTIvDnbcslQ1TEhjZ8bKJwWHFlyoJOxeGaEsn0G3xAmPeUW8WjS2tLTKx8DUYOAgto9VOWip5dngZVMrCL85fPk-jiKEL3ODsyddZiOOhBEjapco_RTDPVurVreDnG6mbScCslHda5T6KudyFOQLD77BulIENlpE5Lxh3KFGrGgu_RiVOf-XtHDDExiWOsaUhOSZFkecqF56upROBQRIuNqHv98icbVKRzYcDteRckJGfk12faaQhX24QCDsIrT8NHbbB9eKX7rcnDMp8GxSArct7KyOxyw","e": "AQAB"},{"kty": "RSA","alg": "RS256","use": "sig","kid": "ce760dff481ee9bca45ccab64eada328029bc0aa","n": "47QQ2Ru1h3WWxcTUbwQvhD_ncEw7avXtXDmcY_8zxC9FcPwv6GcAvjoWuF0afBNK4UoNqW9gG_eq96FnMUF0iIVkPio-h3cpOHzAhKN-LHB9UMx3WDCVYxeRjGOgKU8oLz7ioqGhyZc-oxWk0v691Ybp83OPhWa0bVAmTgSaAuPpyw-ZLg-Nb4eF---vjb1N0ptYltSOQNEZ3BK9jEbWKNHASTcTpFkigcWyLp_sFv79W_DLZEKIb4TxaoGGWA-AMiErFsAnzcU7Ia4ETyp5ucI6o4SifKzI1SKRkUTinlVnvedwXhu21HBviEe_a-fg3uYc7JTMgFNG3kQlfks8AQ","e": "AQAB"},{"kty": "RSA","alg": "RS256","use": "sig","kid": "3ce4a97d502af058eb66ac8d730a592ab7cea7f1","n": "5JjYSEt7lxpIBtnZSAta6uPZpiAFSwzRhhWdBbRr1QuEMPhBvfWsy0PArA8xx5U8AIWftTmhsTdXvkLRLrG_vT4fxjU22K2YBoeTY2v2QIvJOUyhLWOr5wVtG9iWtg86FsGv0ukEgEpx2mqIlpz0KWkEZwIhtYRTtFQh_G4QFjvyAg70iFi7BvSizfZlEDrg5-5ksia0Gy_gmjGvgTLHGBLciKo5d5Aw-DBPJqunnJacVu6rTkBF_QgsOWpO5Y8XuKbjEKNzUHSv6TxumaK7ueU1ckucdtkAHqURzEInbb3BxWYme_3JCzTDMRy4-pEoWR-NyLZwEZxxOtGFQRXhZw","e": "AQAB"}]}', + [ + 'http_code' => 200, + ] + ); $this->getHttpClient() - ->addResponse($response); + ->setResponseFactory($response) + ; $keyset = $this->getJKUFactory() ->loadFromUrl('https://foo.bar/keys'); @@ -55,13 +53,11 @@ public function theJWKUrlIsValidButDoesNotContainAKeySet(): void $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Unsupported input.'); - $response = $this->messageFactory->createResponse(200); - $response->getBody() - ->write('Hello World!'); - $response->getBody() - ->rewind(); + $response = new MockResponse('Hello World!', [ + 'http_code' => 200, + ]); $this->getHttpClient() - ->addResponse($response); + ->setResponseFactory($response); $this->getJKUFactory() ->loadFromUrl('https://foo.bar/bad/url'); } @@ -72,13 +68,11 @@ public function theUrlIsNotValidAndJWKSetCannotBeLoaded(): void $this->expectException(RuntimeException::class); $this->expectExceptionMessage('Unable to get the key set.'); - $response = $this->messageFactory->createResponse(404); - $response->getBody() - ->write('Not found'); - $response->getBody() - ->rewind(); + $response = new MockResponse('Not found', [ + 'http_code' => 404, + ]); $this->getHttpClient() - ->addResponse($response); + ->setResponseFactory($response); $this->getJKUFactory() ->loadFromUrl('https://foo.bar/bad/url'); } @@ -86,15 +80,14 @@ public function theUrlIsNotValidAndJWKSetCannotBeLoaded(): void #[Test] public function iCanGetAKeySetFromAX509Url(): void { - $response = $this->messageFactory->createResponse(200); - $response->getBody() - ->write( - '["MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVM\nxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR2\n8gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExM\nTYwMTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UE\nCBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWR\nkeS5jb20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYW\nRkeS5jb20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlc\nnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJ\nKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTt\nwY6vj3D3HKrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqV\nTr9vcyOdQmVZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aL\nGbqGmu75RpRSgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo\n7RJlbmr2EkRTcDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgW\nJCJjPOq8lh8BJ6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAw\nEAAaOCATIwggEuMB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVH\nSMEGDAWgBTSxLDSkdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEA\nMDMGCCsGAQUFBwEBBCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWR\nkeS5jb20wRgYDVR0fBD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2\nRhZGR5LmNvbS9yZXBvc2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVH\nSAAMDgwNgYIKwYBBQUHAgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\nb20vcmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggE\nBANKGwOy9+aG2Z+5mC6IGOgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPI\nUyIXvJxwqoJKSQ3kbTJSMUA2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL\n5CkKSkB2XIsKd83ASe8T+5o0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9\np0iRFEUOOjZv2kWzRaJBydTXRE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsx\nuxN89txJx9OjxUUAiKEngHUuHqDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZ\nEjYx8WnM25sgVjOuH0aBsXBTWVU+4=","MIIE+zCCBGSgAwIBAgICAQ0wDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1Z\nhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIE\nluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb\n24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8x\nIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTA0MDYyOTE3MDY\nyMFoXDTI0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZS\nBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgM\niBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN\nADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XC\nAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux\n6wwdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLO\ntXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWo\nriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZ\nEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjggHhMIIB3TAdBgNVHQ\n4EFgQU0sSw0pHUTBFxs2HLPaH+3ahq1OMwgdIGA1UdIwSByjCBx6GBwaSBvjCBu\nzEkMCIGA1UEBxMbVmFsaUNlcnQgVmFsaWRhdGlvbiBOZXR3b3JrMRcwFQYDVQQK\nEw5WYWxpQ2VydCwgSW5jLjE1MDMGA1UECxMsVmFsaUNlcnQgQ2xhc3MgMiBQb2x\npY3kgVmFsaWRhdGlvbiBBdXRob3JpdHkxITAfBgNVBAMTGGh0dHA6Ly93d3cudm\nFsaWNlcnQuY29tLzEgMB4GCSqGSIb3DQEJARYRaW5mb0B2YWxpY2VydC5jb22CA\nQEwDwYDVR0TAQH/BAUwAwEB/zAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGG\nF2h0dHA6Ly9vY3NwLmdvZGFkZHkuY29tMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA\n6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS9yb290LmNybD\nBLBgNVHSAERDBCMEAGBFUdIAAwODA2BggrBgEFBQcCARYqaHR0cDovL2NlcnRpZ\nmljYXRlcy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIBBjAN\nBgkqhkiG9w0BAQUFAAOBgQC1QPmnHfbq/qQaQlpE9xXUhUaJwL6e4+PrxeNYiY+\nSn1eocSxI0YGyeR+sBjUZsE4OWBsUs5iB0QQeyAfJg594RAoYC5jcdnplDQ1tgM\nQLARzLrUc+cb53S8wGd9D0VmsfSxOaFIqII6hR8INMqzW/Rn453HWkrugp++85j\n09VZw==","MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ\n0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNT\nAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0a\nG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkq\nhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE\n5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTm\nV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZ\nXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQD\nExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9\nAdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5a\nvIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zf\nN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwb\nP7RfZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQU\nAA4GBADt/UG9vUJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQ\nC1u+mNr0HZDzTuIYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMM\nj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd"]' - ); - $response->getBody() - ->rewind(); + $response = new MockResponse( + '["MIIE3jCCA8agAwIBAgICAwEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCVVM\nxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR2\n8gRGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExM\nTYwMTU0MzdaFw0yNjExMTYwMTU0MzdaMIHKMQswCQYDVQQGEwJVUzEQMA4GA1UE\nCBMHQXJpem9uYTETMBEGA1UEBxMKU2NvdHRzZGFsZTEaMBgGA1UEChMRR29EYWR\nkeS5jb20sIEluYy4xMzAxBgNVBAsTKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYW\nRkeS5jb20vcmVwb3NpdG9yeTEwMC4GA1UEAxMnR28gRGFkZHkgU2VjdXJlIENlc\nnRpZmljYXRpb24gQXV0aG9yaXR5MREwDwYDVQQFEwgwNzk2OTI4NzCCASIwDQYJ\nKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMQt1RWMnCZM7DI161+4WQFapmGBWTt\nwY6vj3D3HKrjJM9N55DrtPDAjhI6zMBS2sofDPZVUBJ7fmd0LJR4h3mUpfjWoqV\nTr9vcyOdQmVZWt7/v+WIbXnvQAjYwqDL1CBM6nPwT27oDyqu9SoWlm2r4arV3aL\nGbqGmu75RpRSgAvSMeYddi5Kcju+GZtCpyz8/x4fKL4o/K1w/O5epHBp+YlLpyo\n7RJlbmr2EkRTcDCVw5wrWCs9CHRK8r5RsL+H0EwnWGu1NcWdrxcx+AuP7q2BNgW\nJCJjPOq8lh8BJ6qf9Z/dFjpfMFDniNoW1fho3/Rb2cRGadDAW/hOUoz+EDU8CAw\nEAAaOCATIwggEuMB0GA1UdDgQWBBT9rGEyk2xF1uLuhV+auud2mWjM5zAfBgNVH\nSMEGDAWgBTSxLDSkdRMEXGzYcs9of7dqGrU4zASBgNVHRMBAf8ECDAGAQH/AgEA\nMDMGCCsGAQUFBwEBBCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZ29kYWR\nkeS5jb20wRgYDVR0fBD8wPTA7oDmgN4Y1aHR0cDovL2NlcnRpZmljYXRlcy5nb2\nRhZGR5LmNvbS9yZXBvc2l0b3J5L2dkcm9vdC5jcmwwSwYDVR0gBEQwQjBABgRVH\nSAAMDgwNgYIKwYBBQUHAgEWKmh0dHA6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5j\nb20vcmVwb3NpdG9yeTAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggE\nBANKGwOy9+aG2Z+5mC6IGOgRQjhVyrEp0lVPLN8tESe8HkGsz2ZbwlFalEzAFPI\nUyIXvJxwqoJKSQ3kbTJSMUA2fCENZvD117esyfxVgqwcSeIaha86ykRvOe5GPLL\n5CkKSkB2XIsKd83ASe8T+5o0yGPwLPk9Qnt0hCqU7S+8MxZC9Y7lhyVJEnfzuz9\np0iRFEUOOjZv2kWzRaJBydTXRE4+uXR21aITVSzGh6O1mawGhId/dQb8vxRMDsx\nuxN89txJx9OjxUUAiKEngHUuHqDTMBqLdElrRhjZkAzVvb3du6/KFUJheqwNTrZ\nEjYx8WnM25sgVjOuH0aBsXBTWVU+4=","MIIE+zCCBGSgAwIBAgICAQ0wDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1Z\nhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIE\nluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb\n24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8x\nIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTA0MDYyOTE3MDY\nyMFoXDTI0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRoZS\nBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3MgM\niBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN\nADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XC\nAPVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux\n6wwdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLO\ntXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWo\nriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZ\nEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjggHhMIIB3TAdBgNVHQ\n4EFgQU0sSw0pHUTBFxs2HLPaH+3ahq1OMwgdIGA1UdIwSByjCBx6GBwaSBvjCBu\nzEkMCIGA1UEBxMbVmFsaUNlcnQgVmFsaWRhdGlvbiBOZXR3b3JrMRcwFQYDVQQK\nEw5WYWxpQ2VydCwgSW5jLjE1MDMGA1UECxMsVmFsaUNlcnQgQ2xhc3MgMiBQb2x\npY3kgVmFsaWRhdGlvbiBBdXRob3JpdHkxITAfBgNVBAMTGGh0dHA6Ly93d3cudm\nFsaWNlcnQuY29tLzEgMB4GCSqGSIb3DQEJARYRaW5mb0B2YWxpY2VydC5jb22CA\nQEwDwYDVR0TAQH/BAUwAwEB/zAzBggrBgEFBQcBAQQnMCUwIwYIKwYBBQUHMAGG\nF2h0dHA6Ly9vY3NwLmdvZGFkZHkuY29tMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA\n6Ly9jZXJ0aWZpY2F0ZXMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS9yb290LmNybD\nBLBgNVHSAERDBCMEAGBFUdIAAwODA2BggrBgEFBQcCARYqaHR0cDovL2NlcnRpZ\nmljYXRlcy5nb2RhZGR5LmNvbS9yZXBvc2l0b3J5MA4GA1UdDwEB/wQEAwIBBjAN\nBgkqhkiG9w0BAQUFAAOBgQC1QPmnHfbq/qQaQlpE9xXUhUaJwL6e4+PrxeNYiY+\nSn1eocSxI0YGyeR+sBjUZsE4OWBsUs5iB0QQeyAfJg594RAoYC5jcdnplDQ1tgM\nQLARzLrUc+cb53S8wGd9D0VmsfSxOaFIqII6hR8INMqzW/Rn453HWkrugp++85j\n09VZw==","MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ\n0IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNT\nAzBgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0a\nG9yaXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkq\nhkiG9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE\n5MDYyNjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTm\nV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZ\nXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQD\nExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9\nAdmFsaWNlcnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5a\nvIWZJV16vYdA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zf\nN1SLUzm1NZ9WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwb\nP7RfZHM047QSv4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQU\nAA4GBADt/UG9vUJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQ\nC1u+mNr0HZDzTuIYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMM\nj4QssxsodyamEwCW/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd"]', + [ + 'http_code' => 200, + ] + ); $this->getHttpClient() - ->addResponse($response); + ->setResponseFactory($response); $keyset = $this->getX5UFactory() ->loadFromUrl('https://foo.bar/keys'); @@ -107,13 +100,11 @@ public function theX509UrlIsValidButDoesNotContainAKeySet(): void $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage('Unsupported input.'); - $response = $this->messageFactory->createResponse(200); - $response->getBody() - ->write('Hello World!'); - $response->getBody() - ->rewind(); + $response = new MockResponse('Hello World!', [ + 'http_code' => 200, + ]); $this->getHttpClient() - ->addResponse($response); + ->setResponseFactory($response); $this->getX5UFactory() ->loadFromUrl('https://foo.bar/bad/url'); } @@ -124,13 +115,11 @@ public function theUrlIsNotValidAndX509CertificatesCannotBeLoaded(): void $this->expectException(RuntimeException::class); $this->expectExceptionMessage('Unable to get the key set.'); - $response = $this->messageFactory->createResponse(404); - $response->getBody() - ->write('Not found'); - $response->getBody() - ->rewind(); + $response = new MockResponse('Not found', [ + 'http_code' => 404, + ]); $this->getHttpClient() - ->addResponse($response); + ->setResponseFactory($response); $this->getX5UFactory() ->loadFromUrl('https://foo.bar/bad/url'); } @@ -138,7 +127,7 @@ public function theUrlIsNotValidAndX509CertificatesCannotBeLoaded(): void private function getJKUFactory(): JKUFactory { if ($this->jkuFactory === null) { - $this->jkuFactory = new JKUFactory($this->getHttpClient(), new Psr17Factory()); + $this->jkuFactory = new JKUFactory($this->getHttpClient()); } return $this->jkuFactory; @@ -147,16 +136,16 @@ private function getJKUFactory(): JKUFactory private function getX5UFactory(): X5UFactory { if ($this->x5uFactory === null) { - $this->x5uFactory = new X5UFactory($this->getHttpClient(), new Psr17Factory()); + $this->x5uFactory = new X5UFactory($this->getHttpClient()); } return $this->x5uFactory; } - private function getHttpClient(): Client + private function getHttpClient(): MockHttpClient { if ($this->httpClient === null) { - $this->httpClient = new Client(new Psr17Factory()); + $this->httpClient = new MockHttpClient(); } return $this->httpClient; diff --git a/tests/ComposerJsonTest.php b/tests/ComposerJsonTest.php index 2415b7bfd..de4a287cc 100644 --- a/tests/ComposerJsonTest.php +++ b/tests/ComposerJsonTest.php @@ -56,7 +56,7 @@ public function packageDependenciesEqualRootDependencies(): void $unusedDependencies = array_diff(array_keys($rootDependencies), array_unique($usedDependencies)); $message = sprintf( 'Dependencies declared in root composer.json, which are not declared in any sub-package: %s', - implode('', $unusedDependencies) + implode(', ', $unusedDependencies) ); static::assertCount(0, $unusedDependencies, $message); } diff --git a/tests/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBC_HSContentEncryptionTest.php b/tests/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBC_HSContentEncryptionTest.php index 672642e3a..f45cf3868 100644 --- a/tests/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBC_HSContentEncryptionTest.php +++ b/tests/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBC_HSContentEncryptionTest.php @@ -329,7 +329,7 @@ protected static function getMethod(string $class, string $name): ReflectionMeth private function convertArrayToBinString(array $data): string { foreach ($data as $key => $value) { - $data[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $data[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } return hex2bin(implode('', $data)); diff --git a/tests/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCMContentEncryptionTest.php b/tests/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCMContentEncryptionTest.php index f659f745c..d3cd7f12d 100644 --- a/tests/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCMContentEncryptionTest.php +++ b/tests/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCMContentEncryptionTest.php @@ -211,7 +211,7 @@ public function a256GCMDecryptTestVector(): void private function convertArrayToBinString(array $data): string { foreach ($data as $key => $value) { - $data[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $data[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } return hex2bin(implode('', $data)); diff --git a/tests/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESKeyAgreementTest.php b/tests/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESKeyAgreementTest.php index 513335437..922b329c9 100644 --- a/tests/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESKeyAgreementTest.php +++ b/tests/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHESKeyAgreementTest.php @@ -104,7 +104,7 @@ public function getAgreementKeyWithA128KeyWrapAndWithOctetKeyPairKey(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -171,7 +171,7 @@ public function getAgreementKeyWithA128KeyWrap(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -238,7 +238,7 @@ public function getAgreementKeyWithA192KeyWrap(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -311,7 +311,7 @@ public function getAgreementKeyWithA256KeyWrap(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); diff --git a/tests/EncryptionAlgorithm/KeyEncryption/ECDHSS/ECDHSSKeyAgreementTest.php b/tests/EncryptionAlgorithm/KeyEncryption/ECDHSS/ECDHSSKeyAgreementTest.php index aa7108e03..5a93909d2 100644 --- a/tests/EncryptionAlgorithm/KeyEncryption/ECDHSS/ECDHSSKeyAgreementTest.php +++ b/tests/EncryptionAlgorithm/KeyEncryption/ECDHSS/ECDHSSKeyAgreementTest.php @@ -106,7 +106,7 @@ public function getAgreementKeyWithA128KeyWrapAndOctetKeyPairKey(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -182,7 +182,7 @@ public function getAgreementKeyWithA128KeyWrap(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -259,7 +259,7 @@ public function getAgreementKeyWithA192KeyWrap(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); @@ -336,7 +336,7 @@ public function getAgreementKeyWithA256KeyWrap(): void 207, ]; foreach ($cek as $key => $value) { - $cek[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $cek[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } $cek = hex2bin(implode('', $cek)); diff --git a/tests/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2_HS_AESKWKeyEncryptionTest.php b/tests/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2_HS_AESKWKeyEncryptionTest.php index e09fbd422..d033c3cb6 100644 --- a/tests/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2_HS_AESKWKeyEncryptionTest.php +++ b/tests/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2_HS_AESKWKeyEncryptionTest.php @@ -914,7 +914,7 @@ public function p2SParameterIsMissing(): void private function convertArrayToBinString(array $data) { foreach ($data as $key => $value) { - $data[$key] = str_pad(dechex($value), 2, '0', STR_PAD_LEFT); + $data[$key] = mb_str_pad(dechex($value), 2, '0', STR_PAD_LEFT); } return hex2bin(implode('', $data)); From e357477fa53dc4330b426982816d701283c3a41c Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Sat, 24 Feb 2024 15:06:17 +0100 Subject: [PATCH 2/6] Preparing 4.0.0 --- .github/workflows/infection.yml | 2 +- .github/workflows/integrate.yml | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/infection.yml b/.github/workflows/infection.yml index dd8e196c3..3aa511a4a 100644 --- a/.github/workflows/infection.yml +++ b/.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" diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 00d39dce6..5822411b0 100644 --- a/.github/workflows/integrate.yml +++ b/.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" From 753b7cff15d41c87d854d29f975727beac5b5612 Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Sat, 24 Feb 2024 15:28:13 +0100 Subject: [PATCH 3/6] Preparing 4.0.0 --- composer.json | 4 ++-- rector.php | 6 ++++-- .../Functional/Checker/ClaimCheckerTest.php | 13 ------------- .../Functional/Checker/ConfigurationTest.php | 8 -------- .../Functional/Checker/HeaderCheckerTest.php | 13 ------------- .../Functional/Console/ConsoleTest.php | 8 -------- .../Functional/Encryption/JWEBuilderTest.php | 13 ------------- .../Functional/Encryption/JWEComputationTest.php | 10 ---------- .../Functional/Encryption/JWEDecrypterTest.php | 13 ------------- .../Functional/Encryption/JWELoaderTest.php | 13 ------------- .../Functional/Encryption/JWESerializerTest.php | 11 ----------- .../Encryption/JweBuilderConfigurationTest.php | 8 -------- .../Encryption/JweDecrypterConfigurationTest.php | 8 -------- .../Encryption/SerializerConfigurationTest.php | 8 -------- .../KeyManagement/JKUAndX5UFactoriesTest.php | 10 ---------- .../Functional/KeyManagement/JWKLoaderTest.php | 16 ---------------- .../KeyManagement/JwkUriConfigurationTest.php | 8 -------- .../KeyManagement/KeyConfigurationTest.php | 8 -------- .../KeyManagement/KeySetConfigurationTest.php | 8 -------- .../NestedTokenBuilderConfigurationTest.php | 8 -------- .../NestedToken/NestedTokenBuilderTest.php | 8 -------- .../NestedTokenLoaderConfigurationTest.php | 8 -------- .../NestedToken/NestedTokenLoaderTest.php | 7 ------- .../Functional/Serializer/JWEEncoderTest.php | 12 ------------ .../Functional/Serializer/JWESerializerTest.php | 12 ------------ .../Functional/Serializer/JWSEncoderTest.php | 12 ------------ .../Functional/Serializer/JWSSerializerTest.php | 12 ------------ .../Functional/Signature/JWSBuilderTest.php | 12 ------------ .../Functional/Signature/JWSComputationTest.php | 10 ---------- .../Functional/Signature/JWSLoaderTest.php | 12 ------------ .../Functional/Signature/JWSSerializerTest.php | 11 ----------- .../Functional/Signature/JWSVerifierTest.php | 13 ------------- .../Signature/JwsBuilderConfigurationTest.php | 8 -------- .../Signature/JwsVerifierConfigurationTest.php | 8 -------- .../Signature/SerializerConfigurationTest.php | 8 -------- .../KeyManagement/UrlKeySetFactoryTest.php | 4 ---- .../NestedToken/NestingTokenBuilderTest.php | 12 ------------ .../NestingTokenUsingNestedTokenLoaderTest.php | 11 ----------- 38 files changed, 6 insertions(+), 368 deletions(-) diff --git a/composer.json b/composer.json index 7789b9ea2..7b874e0c9 100644 --- a/composer.json +++ b/composer.json @@ -115,10 +115,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 } } } diff --git a/rector.php b/rector.php index d700c17cd..b3c24ab79 100644 --- a/rector.php +++ b/rector.php @@ -16,7 +16,8 @@ return static function (RectorConfig $config): void { $config->import(SetList::DEAD_CODE); $config->import(LevelSetList::UP_TO_PHP_83); - $config->import(SymfonyLevelSetList::UP_TO_SYMFONY_64); + //$config->import(SymfonyLevelSetList::UP_TO_SYMFONY_64); + $config->import(SymfonySetList::SYMFONY_64); $config->import(SymfonySetList::SYMFONY_50_TYPES); $config->import(SymfonySetList::SYMFONY_52_VALIDATOR_ATTRIBUTES); $config->import(SymfonySetList::SYMFONY_CODE_QUALITY); @@ -26,7 +27,8 @@ $config->import(DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES); $config->import(PHPUnitSetList::PHPUNIT_CODE_QUALITY); $config->import(PHPUnitSetList::ANNOTATIONS_TO_ATTRIBUTES); - $config->import(PHPUnitLevelSetList::UP_TO_PHPUNIT_100); + $config->import(PHPUnitSetList::PHPUNIT_100); + //$config->import(PHPUnitLevelSetList::UP_TO_PHPUNIT_100); $config->paths([ __DIR__ . '/ecs.php', __DIR__ . '/rector.php', diff --git a/tests/Bundle/JoseFramework/Functional/Checker/ClaimCheckerTest.php b/tests/Bundle/JoseFramework/Functional/Checker/ClaimCheckerTest.php index f4d294e3b..13ed9a4f0 100644 --- a/tests/Bundle/JoseFramework/Functional/Checker/ClaimCheckerTest.php +++ b/tests/Bundle/JoseFramework/Functional/Checker/ClaimCheckerTest.php @@ -5,30 +5,20 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Checker; use Jose\Bundle\JoseFramework\Services\ClaimCheckerManagerFactory as ClaimCheckerManagerFactoryService; -use Jose\Component\Checker\ClaimCheckerManagerFactory; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class ClaimCheckerTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(ClaimCheckerManagerFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-checker" is not installed.'); - } - } - #[Test] public static function theClaimCheckerManagerFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(ClaimCheckerManagerFactoryService::class)); } @@ -38,7 +28,6 @@ public static function theClaimCheckerManagerFactoryCanCreateAClaimCheckerManage static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $claimCheckerManagerFactory = $container->get(ClaimCheckerManagerFactoryService::class); static::assertInstanceOf(ClaimCheckerManagerFactoryService::class, $claimCheckerManagerFactory); @@ -52,7 +41,6 @@ public static function aClaimCheckerCanBeDefinedUsingTheConfigurationFile(): voi static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.claim_checker.checker1')); } @@ -62,7 +50,6 @@ public static function aClaimCheckerCanBeDefinedFromAnotherBundleUsingTheHelper( static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.claim_checker.checker2')); } } diff --git a/tests/Bundle/JoseFramework/Functional/Checker/ConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Checker/ConfigurationTest.php index 7bba39229..021380230 100644 --- a/tests/Bundle/JoseFramework/Functional/Checker/ConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Checker/ConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Checker\CheckerSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; -use Jose\Component\Checker\ClaimCheckerManagerFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class ConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(ClaimCheckerManagerFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-checker" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Checker/HeaderCheckerTest.php b/tests/Bundle/JoseFramework/Functional/Checker/HeaderCheckerTest.php index 2ad961d73..ca7550473 100644 --- a/tests/Bundle/JoseFramework/Functional/Checker/HeaderCheckerTest.php +++ b/tests/Bundle/JoseFramework/Functional/Checker/HeaderCheckerTest.php @@ -5,30 +5,20 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Checker; use Jose\Bundle\JoseFramework\Services\HeaderCheckerManagerFactory as HeaderCheckerManagerFactoryService; -use Jose\Component\Checker\HeaderCheckerManagerFactory; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class HeaderCheckerTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(HeaderCheckerManagerFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-checker" is not installed.'); - } - } - #[Test] public static function theHeaderCheckerManagerFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(HeaderCheckerManagerFactoryService::class)); } @@ -38,7 +28,6 @@ public static function theHeaderCheckerManagerFactoryCanCreateAHeaderCheckerMana static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $headerCheckerManagerFactory = $container->get(HeaderCheckerManagerFactoryService::class); static::assertInstanceOf(HeaderCheckerManagerFactoryService::class, $headerCheckerManagerFactory); @@ -52,7 +41,6 @@ public static function aHeaderCheckerCanBeDefinedUsingTheConfigurationFile(): vo static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.header_checker.checker1')); } @@ -62,7 +50,6 @@ public static function aHeaderCheckerCanBeDefinedFromAnotherBundleUsingTheHelper static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.header_checker.checker2')); } } diff --git a/tests/Bundle/JoseFramework/Functional/Console/ConsoleTest.php b/tests/Bundle/JoseFramework/Functional/Console/ConsoleTest.php index 5f10a4850..1af21677b 100644 --- a/tests/Bundle/JoseFramework/Functional/Console/ConsoleTest.php +++ b/tests/Bundle/JoseFramework/Functional/Console/ConsoleTest.php @@ -4,7 +4,6 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Console; -use Jose\Component\Console\EcKeyGeneratorCommand; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; @@ -14,13 +13,6 @@ */ final class ConsoleTest extends KernelTestCase { - protected function setUp(): void - { - if (! class_exists(EcKeyGeneratorCommand::class)) { - static::markTestSkipped('The component "web-token/jwt-console" is not installed.'); - } - } - #[Test] public static function allCommandsAreAvailable(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JWEBuilderTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JWEBuilderTest.php index 9e8cf6786..ae4fb3324 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JWEBuilderTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JWEBuilderTest.php @@ -6,30 +6,20 @@ use Jose\Bundle\JoseFramework\Services\JWEBuilder; use Jose\Bundle\JoseFramework\Services\JWEBuilderFactory as JWEBuilderFactoryService; -use Jose\Component\Encryption\JWEBuilderFactory; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWEBuilderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public static function theJWEBuilderFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JWEBuilderFactoryService::class)); } @@ -39,7 +29,6 @@ public static function theJWEBuilderFactoryCanCreateAJWEBuilder(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $jweFactory = $container->get(JWEBuilderFactoryService::class); static::assertInstanceOf(JWEBuilderFactoryService::class, $jweFactory); @@ -53,7 +42,6 @@ public static function aJWEBuilderCanBeDefinedUsingTheConfigurationFile(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_builder.builder1')); $jwe = $container->get('jose.jwe_builder.builder1'); @@ -66,7 +54,6 @@ public static function aJWEBuilderCanBeDefinedFromAnotherBundleUsingTheHelper(): static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_builder.builder2')); $jwe = $container->get('jose.jwe_builder.builder2'); diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JWEComputationTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JWEComputationTest.php index 45e931d75..1eed59f91 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JWEComputationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JWEComputationTest.php @@ -6,32 +6,22 @@ use Jose\Component\Core\JWK; use Jose\Component\Encryption\JWEBuilder; -use Jose\Component\Encryption\JWEBuilderFactory; use Jose\Component\Encryption\JWEDecrypter; use Jose\Component\Encryption\Serializer\CompactSerializer; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWEComputationTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public static function iCanCreateAndLoadAToken(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $jwk = new JWK([ 'kty' => 'oct', diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JWEDecrypterTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JWEDecrypterTest.php index 651a70c46..8f7b345b1 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JWEDecrypterTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JWEDecrypterTest.php @@ -5,31 +5,21 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Encryption; use Jose\Bundle\JoseFramework\Services\JWEDecrypterFactory as JWEDecrypterFactoryService; -use Jose\Component\Encryption\JWEBuilderFactory; use Jose\Component\Encryption\JWEDecrypter; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWEDecrypterTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public static function theJWEDecrypterFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JWEDecrypterFactoryService::class)); } @@ -39,7 +29,6 @@ public static function theWEDecrypterFactoryCanCreateAJWEDecrypter(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $jweFactory = $container->get(JWEDecrypterFactoryService::class); static::assertInstanceOf(JWEDecrypterFactoryService::class, $jweFactory); @@ -53,7 +42,6 @@ public static function aJWEDecrypterCanBeDefinedUsingTheConfigurationFile(): voi static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_decrypter.loader1')); $jwe = $container->get('jose.jwe_decrypter.loader1'); @@ -66,7 +54,6 @@ public static function aJWEDecrypterCanBeDefinedFromAnotherBundleUsingTheHelper( static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_decrypter.loader2')); $jwe = $container->get('jose.jwe_decrypter.loader2'); diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JWELoaderTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JWELoaderTest.php index a2f51b62d..5580f0d58 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JWELoaderTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JWELoaderTest.php @@ -5,31 +5,21 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Encryption; use Jose\Bundle\JoseFramework\Services\JWELoaderFactory as JWELoaderFactoryAlias; -use Jose\Component\Encryption\JWEBuilderFactory; use Jose\Component\Encryption\JWELoader; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWELoaderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public static function theJWELoaderFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JWELoaderFactoryAlias::class)); } @@ -39,7 +29,6 @@ public static function theWELoaderFactoryCanCreateAJWELoader(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $jweLoaderFactory = $container->get(JWELoaderFactoryAlias::class); static::assertInstanceOf(JWELoaderFactoryAlias::class, $jweLoaderFactory); @@ -58,7 +47,6 @@ public static function aJWELoaderCanBeDefinedUsingTheConfigurationFile(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_loader.jwe_loader1')); $jwe = $container->get('jose.jwe_loader.jwe_loader1'); @@ -71,7 +59,6 @@ public static function aJWELoaderCanBeDefinedFromAnotherBundleUsingTheHelper(): static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_loader.jwe_loader2')); $jwe = $container->get('jose.jwe_loader.jwe_loader2'); diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JWESerializerTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JWESerializerTest.php index bd46051bf..872ed0d43 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JWESerializerTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JWESerializerTest.php @@ -4,31 +4,21 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Encryption; -use Jose\Component\Encryption\JWEBuilderFactory; use Jose\Component\Encryption\Serializer\JWESerializerManager; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWESerializerTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public static function jWESerializerManagerFromConfigurationIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_serializer.jwe_serializer1')); $jwe = $container->get('jose.jwe_serializer.jwe_serializer1'); @@ -41,7 +31,6 @@ public static function jWESerializerManagerFromExternalBundleExtensionIsAvailabl static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jwe_serializer.jwe_serializer2')); $jwe = $container->get('jose.jwe_serializer.jwe_serializer2'); diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JweBuilderConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JweBuilderConfigurationTest.php index 87cd29245..eb5120d34 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JweBuilderConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JweBuilderConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption\EncryptionSource; -use Jose\Component\Encryption\JWEBuilderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class JweBuilderConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/JweDecrypterConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/JweDecrypterConfigurationTest.php index 8d5d1dd61..a08ca03f5 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/JweDecrypterConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/JweDecrypterConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption\EncryptionSource; -use Jose\Component\Encryption\JWEBuilderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class JweDecrypterConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Encryption/SerializerConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Encryption/SerializerConfigurationTest.php index ccec92519..fc1dacfba 100644 --- a/tests/Bundle/JoseFramework/Functional/Encryption/SerializerConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Encryption/SerializerConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption\EncryptionSource; -use Jose\Component\Encryption\JWEBuilderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class SerializerConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/KeyManagement/JKUAndX5UFactoriesTest.php b/tests/Bundle/JoseFramework/Functional/KeyManagement/JKUAndX5UFactoriesTest.php index 5818529f4..eae098a8e 100644 --- a/tests/Bundle/JoseFramework/Functional/KeyManagement/JKUAndX5UFactoriesTest.php +++ b/tests/Bundle/JoseFramework/Functional/KeyManagement/JKUAndX5UFactoriesTest.php @@ -8,20 +8,12 @@ use Jose\Component\KeyManagement\X5UFactory; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JKUAndX5UFactoriesTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JKUFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-key-mgmt" is not installed.'); - } - } - #[Test] public static function theJKUFactoryServiceIsAvailable(): void { @@ -29,7 +21,6 @@ public static function theJKUFactoryServiceIsAvailable(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JKUFactory::class)); } @@ -40,7 +31,6 @@ public static function theX5UFactoryServiceIsAvailable(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(X5UFactory::class)); } } diff --git a/tests/Bundle/JoseFramework/Functional/KeyManagement/JWKLoaderTest.php b/tests/Bundle/JoseFramework/Functional/KeyManagement/JWKLoaderTest.php index 88774a89b..a5e81b93b 100644 --- a/tests/Bundle/JoseFramework/Functional/KeyManagement/JWKLoaderTest.php +++ b/tests/Bundle/JoseFramework/Functional/KeyManagement/JWKLoaderTest.php @@ -5,24 +5,15 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\KeyManagement; use Jose\Component\Core\JWK; -use Jose\Component\KeyManagement\JWKFactory; use ParagonIE\ConstantTime\Base64UrlSafe; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWKLoaderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWKFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-key-mgmt" is not installed.'); - } - } - #[Test] public static function aJWKCanBeDefinedInTheConfiguration(): void { @@ -30,7 +21,6 @@ public static function aJWKCanBeDefinedInTheConfiguration(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.jwk1')); static::assertInstanceOf(JWK::class, $container->get('jose.key.jwk1')); } @@ -42,7 +32,6 @@ public static function aJWKCanBeDefinedFromAnotherBundle(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.jwk2')); static::assertInstanceOf(JWK::class, $container->get('jose.key.jwk2')); } @@ -54,7 +43,6 @@ public static function aX509InFileCanBeDefinedInTheConfiguration(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.certificate1')); static::assertInstanceOf(JWK::class, $container->get('jose.key.certificate1')); } @@ -66,7 +54,6 @@ public static function aDirectX509InputCanBeDefinedInTheConfiguration(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.x5c1')); static::assertInstanceOf(JWK::class, $container->get('jose.key.x5c1')); } @@ -78,7 +65,6 @@ public static function anEncryptedKeyFileCanBeLoadedInTheConfiguration(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.file1')); static::assertInstanceOf(JWK::class, $container->get('jose.key.file1')); } @@ -90,7 +76,6 @@ public static function aJWKCanBeLoadedFromAJwkSetInTheConfiguration(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.jwkset1')); static::assertInstanceOf(JWK::class, $container->get('jose.key.jwkset1')); } @@ -102,7 +87,6 @@ public static function aJWKCanBeLoadedFromASecretInTheConfiguration(): void $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.key.secret1')); $jwk = $container->get('jose.key.secret1'); diff --git a/tests/Bundle/JoseFramework/Functional/KeyManagement/JwkUriConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/KeyManagement/JwkUriConfigurationTest.php index 3cc608f37..9f8d88362 100644 --- a/tests/Bundle/JoseFramework/Functional/KeyManagement/JwkUriConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/KeyManagement/JwkUriConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\KeyManagementSource; -use Jose\Component\KeyManagement\JWKFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class JwkUriConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWKFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-key-mgmt" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/KeyManagement/KeyConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/KeyManagement/KeyConfigurationTest.php index 1a3b69257..e0585c9ca 100644 --- a/tests/Bundle/JoseFramework/Functional/KeyManagement/KeyConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/KeyManagement/KeyConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\KeyManagementSource; -use Jose\Component\KeyManagement\JWKFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class KeyConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWKFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-key-mgmt" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/KeyManagement/KeySetConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/KeyManagement/KeySetConfigurationTest.php index 167c92e45..5c6c58e3c 100644 --- a/tests/Bundle/JoseFramework/Functional/KeyManagement/KeySetConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/KeyManagement/KeySetConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\KeyManagement\KeyManagementSource; -use Jose\Component\KeyManagement\JWKFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class KeySetConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWKFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-key-mgmt" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderConfigurationTest.php index e89bb31c7..dc8838d3c 100644 --- a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderConfigurationTest.php @@ -10,7 +10,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption\EncryptionSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\NestedToken\NestedToken; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Signature\SignatureSource; -use Jose\Bundle\JoseFramework\Services\NestedTokenLoaderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -22,13 +21,6 @@ final class NestedTokenBuilderConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(NestedTokenLoaderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-nested-token" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderTest.php b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderTest.php index c3cc6e597..990e0439f 100644 --- a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderTest.php +++ b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenBuilderTest.php @@ -5,7 +5,6 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\NestedToken; use Jose\Bundle\JoseFramework\Services\NestedTokenBuilderFactory; -use Jose\Bundle\JoseFramework\Services\NestedTokenLoaderFactory; use Jose\Component\Core\JWK; use Jose\Component\NestedToken\NestedTokenBuilder; use PHPUnit\Framework\Attributes\Test; @@ -16,13 +15,6 @@ */ final class NestedTokenBuilderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(NestedTokenLoaderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-nested-token" is not installed.'); - } - } - #[Test] public static function theNestedTokenBuilderFactoryIsAvailable(): void { diff --git a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderConfigurationTest.php index 303e1fa18..aaf1ade12 100644 --- a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderConfigurationTest.php @@ -10,7 +10,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Source\Encryption\EncryptionSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\NestedToken\NestedToken; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Signature\SignatureSource; -use Jose\Component\Encryption\JWELoaderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -22,13 +21,6 @@ final class NestedTokenLoaderConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWELoaderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-nested-token" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderTest.php b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderTest.php index 0cf33af60..102476f9e 100644 --- a/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderTest.php +++ b/tests/Bundle/JoseFramework/Functional/NestedToken/NestedTokenLoaderTest.php @@ -16,13 +16,6 @@ */ final class NestedTokenLoaderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(NestedTokenLoaderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-nested-token" is not installed.'); - } - } - #[Test] public static function theNestedTokenLoaderFactoryIsAvailable(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Serializer/JWEEncoderTest.php b/tests/Bundle/JoseFramework/Functional/Serializer/JWEEncoderTest.php index 1354f2c9d..160bba420 100644 --- a/tests/Bundle/JoseFramework/Functional/Serializer/JWEEncoderTest.php +++ b/tests/Bundle/JoseFramework/Functional/Serializer/JWEEncoderTest.php @@ -9,7 +9,6 @@ use Jose\Bundle\JoseFramework\Services\JWELoaderFactory; use Jose\Component\Core\JWK; use Jose\Component\Encryption\JWE; -use Jose\Component\Encryption\JWEBuilderFactory as BaseJWEBuilderFactory; use Jose\Component\Encryption\Serializer\CompactSerializer; use Jose\Component\Encryption\Serializer\JWESerializerManager; use Jose\Component\Encryption\Serializer\JWESerializerManagerFactory; @@ -18,23 +17,12 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Serializer\Encoder\DecoderInterface; use Symfony\Component\Serializer\Encoder\EncoderInterface; -use Symfony\Component\Serializer\Serializer; /** * @internal */ final class JWEEncoderTest extends KernelTestCase { - protected function setUp(): void - { - if (! class_exists(BaseJWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - if (! class_exists(Serializer::class)) { - static::markTestSkipped('The component "symfony/serializer" is not installed.'); - } - } - #[DataProvider('jweFormatDataProvider')] #[Test] public function theJWEEncoderSupportsAllFormatsByDefault(string $format, string $serializerId): void diff --git a/tests/Bundle/JoseFramework/Functional/Serializer/JWESerializerTest.php b/tests/Bundle/JoseFramework/Functional/Serializer/JWESerializerTest.php index 833a5c973..c3da43087 100644 --- a/tests/Bundle/JoseFramework/Functional/Serializer/JWESerializerTest.php +++ b/tests/Bundle/JoseFramework/Functional/Serializer/JWESerializerTest.php @@ -8,7 +8,6 @@ use Jose\Bundle\JoseFramework\Services\JWEBuilderFactory; use Jose\Component\Core\JWK; use Jose\Component\Encryption\JWE; -use Jose\Component\Encryption\JWEBuilderFactory as BaseJWEBuilderFactory; use Jose\Component\Encryption\Serializer\JWESerializerManager; use Jose\Component\Encryption\Serializer\JWESerializerManagerFactory; use PHPUnit\Framework\Attributes\DataProvider; @@ -16,23 +15,12 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Symfony\Component\Serializer\Serializer; /** * @internal */ final class JWESerializerTest extends KernelTestCase { - protected function setUp(): void - { - if (! class_exists(BaseJWEBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-encryption" is not installed.'); - } - if (! class_exists(Serializer::class)) { - static::markTestSkipped('The component "symfony/serializer" is not installed.'); - } - } - #[DataProvider('jweFormatDataProvider')] #[Test] public function theJWESerializerSupportsAllFormatsByDefault(string $format, string $serializerId): void diff --git a/tests/Bundle/JoseFramework/Functional/Serializer/JWSEncoderTest.php b/tests/Bundle/JoseFramework/Functional/Serializer/JWSEncoderTest.php index f939224ce..3767d5026 100644 --- a/tests/Bundle/JoseFramework/Functional/Serializer/JWSEncoderTest.php +++ b/tests/Bundle/JoseFramework/Functional/Serializer/JWSEncoderTest.php @@ -8,7 +8,6 @@ use Jose\Bundle\JoseFramework\Services\JWSBuilderFactory; use Jose\Component\Core\JWK; use Jose\Component\Signature\JWS; -use Jose\Component\Signature\JWSBuilderFactory as BaseJWSBuilderFactory; use Jose\Component\Signature\Serializer\CompactSerializer; use Jose\Component\Signature\Serializer\JWSSerializerManager; use Jose\Component\Signature\Serializer\JWSSerializerManagerFactory; @@ -17,23 +16,12 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Serializer\Encoder\DecoderInterface; use Symfony\Component\Serializer\Encoder\EncoderInterface; -use Symfony\Component\Serializer\Serializer; /** * @internal */ final class JWSEncoderTest extends KernelTestCase { - protected function setUp(): void - { - if (! class_exists(BaseJWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - if (! class_exists(Serializer::class)) { - static::markTestSkipped('The component "symfony/serializer" is not installed.'); - } - } - #[DataProvider('jwsFormatDataProvider')] #[Test] public function theJWSSerializerSupportsAllFormatsByDefault(string $format, string $serializerId): void diff --git a/tests/Bundle/JoseFramework/Functional/Serializer/JWSSerializerTest.php b/tests/Bundle/JoseFramework/Functional/Serializer/JWSSerializerTest.php index 4ef00a410..ab5889710 100644 --- a/tests/Bundle/JoseFramework/Functional/Serializer/JWSSerializerTest.php +++ b/tests/Bundle/JoseFramework/Functional/Serializer/JWSSerializerTest.php @@ -8,7 +8,6 @@ use Jose\Bundle\JoseFramework\Services\JWSBuilderFactory; use Jose\Component\Core\JWK; use Jose\Component\Signature\JWS; -use Jose\Component\Signature\JWSBuilderFactory as BaseJWSBuilderFactory; use Jose\Component\Signature\Serializer\JWSSerializerManager; use Jose\Component\Signature\Serializer\JWSSerializerManagerFactory; use PHPUnit\Framework\Attributes\DataProvider; @@ -16,23 +15,12 @@ use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase; use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Symfony\Component\Serializer\Serializer; /** * @internal */ final class JWSSerializerTest extends KernelTestCase { - protected function setUp(): void - { - if (! class_exists(BaseJWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - if (! class_exists(Serializer::class)) { - static::markTestSkipped('The component "symfony/serializer" is not installed.'); - } - } - #[DataProvider('jwsFormatDataProvider')] #[Test] public function theJWSSerializerSupportsAllFormatsByDefault(string $format, string $serializerId): void diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JWSBuilderTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JWSBuilderTest.php index d95d26750..1801bd1cc 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JWSBuilderTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JWSBuilderTest.php @@ -9,27 +9,18 @@ use Jose\Component\Signature\JWSBuilderFactory; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWSBuilderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public static function jWSBuilderFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JWSBuilderFactoryService::class)); } @@ -39,7 +30,6 @@ public static function jWSBuilderFactoryCanCreateAJWSBuilder(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); /** @var JWSBuilderFactory $jwsFactory */ $jwsFactory = $container->get(JWSBuilderFactoryService::class); @@ -55,7 +45,6 @@ public static function jWSBuilderFromConfigurationIsAvailable(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_builder.builder1')); $jws = $container->get('jose.jws_builder.builder1'); @@ -68,7 +57,6 @@ public static function jWSBuilderFromExternalBundleExtensionIsAvailable(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_builder.builder2')); $jws = $container->get('jose.jws_builder.builder2'); diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JWSComputationTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JWSComputationTest.php index 6eb985b81..b3f3441ed 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JWSComputationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JWSComputationTest.php @@ -6,32 +6,22 @@ use Jose\Component\Core\JWK; use Jose\Component\Signature\JWSBuilder; -use Jose\Component\Signature\JWSBuilderFactory; use Jose\Component\Signature\JWSVerifier; use Jose\Component\Signature\Serializer\CompactSerializer; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWSComputationTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public static function createAndLoadAToken(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $jwk = new JWK([ 'kty' => 'oct', diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JWSLoaderTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JWSLoaderTest.php index 96d10546b..55aac82ac 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JWSLoaderTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JWSLoaderTest.php @@ -9,27 +9,18 @@ use Jose\Component\Signature\JWSLoaderFactory; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWSLoaderTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWSLoaderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public static function theJWSLoaderFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JWSLoaderFactoryService::class)); } @@ -39,7 +30,6 @@ public static function theWELoaderFactoryCanCreateAJWSLoader(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); /** @var JWSLoaderFactory $jwsLoaderFactory */ $jwsLoaderFactory = $container->get(JWSLoaderFactoryService::class); @@ -56,7 +46,6 @@ public static function aJWSLoaderCanBeDefinedUsingTheConfigurationFile(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_loader.jws_loader1')); $jws = $container->get('jose.jws_loader.jws_loader1'); @@ -69,7 +58,6 @@ public static function aJWSLoaderCanBeDefinedFromAnotherBundleUsingTheHelper(): static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_loader.jws_loader2')); $jws = $container->get('jose.jws_loader.jws_loader2'); diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JWSSerializerTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JWSSerializerTest.php index 53982cd6c..63da70897 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JWSSerializerTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JWSSerializerTest.php @@ -4,31 +4,21 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Signature; -use Jose\Component\Signature\JWSBuilderFactory; use Jose\Component\Signature\Serializer\JWSSerializerManager; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWSSerializerTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public static function jWSSerializerManagerFromConfigurationIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_serializer.jws_serializer1')); $jws = $container->get('jose.jws_serializer.jws_serializer1'); @@ -41,7 +31,6 @@ public static function jWSSerializerManagerFromExternalBundleExtensionIsAvailabl static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_serializer.jws_serializer2')); $jws = $container->get('jose.jws_serializer.jws_serializer2'); diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JWSVerifierTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JWSVerifierTest.php index 49070543a..bd5c8f5d9 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JWSVerifierTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JWSVerifierTest.php @@ -5,31 +5,21 @@ namespace Jose\Tests\Bundle\JoseFramework\Functional\Signature; use Jose\Bundle\JoseFramework\Services\JWSVerifierFactory as JWSVerifierFactoryService; -use Jose\Component\Signature\JWSBuilderFactory; use Jose\Component\Signature\JWSVerifier; use PHPUnit\Framework\Attributes\Test; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -use Symfony\Component\DependencyInjection\ContainerInterface; /** * @internal */ final class JWSVerifierTest extends WebTestCase { - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public static function jWSVerifierFactoryIsAvailable(): void { static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has(JWSVerifierFactoryService::class)); } @@ -39,7 +29,6 @@ public static function jWSVerifierFactoryCanCreateAJWSVerifier(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); $jwsFactory = $container->get(JWSVerifierFactoryService::class); static::assertInstanceOf(JWSVerifierFactoryService::class, $jwsFactory); @@ -53,7 +42,6 @@ public static function jWSVerifierFromConfigurationIsAvailable(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_verifier.loader1')); $jws = $container->get('jose.jws_verifier.loader1'); @@ -66,7 +54,6 @@ public static function jWSVerifierFromExternalBundleExtensionIsAvailable(): void static::ensureKernelShutdown(); $client = static::createClient(); $container = $client->getContainer(); - static::assertInstanceOf(ContainerInterface::class, $container); static::assertTrue($container->has('jose.jws_verifier.loader2')); $jws = $container->get('jose.jws_verifier.loader2'); diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JwsBuilderConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JwsBuilderConfigurationTest.php index c4d801b0c..e61c28a1b 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JwsBuilderConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JwsBuilderConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Signature\SignatureSource; -use Jose\Component\Signature\JWSBuilderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class JwsBuilderConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Signature/JwsVerifierConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Signature/JwsVerifierConfigurationTest.php index a130265b4..4d8775c28 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/JwsVerifierConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/JwsVerifierConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Signature\SignatureSource; -use Jose\Component\Signature\JWSBuilderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class JwsVerifierConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Bundle/JoseFramework/Functional/Signature/SerializerConfigurationTest.php b/tests/Bundle/JoseFramework/Functional/Signature/SerializerConfigurationTest.php index aa72a3bbd..386f6c15d 100644 --- a/tests/Bundle/JoseFramework/Functional/Signature/SerializerConfigurationTest.php +++ b/tests/Bundle/JoseFramework/Functional/Signature/SerializerConfigurationTest.php @@ -7,7 +7,6 @@ use Jose\Bundle\JoseFramework\DependencyInjection\Configuration; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Core\CoreSource; use Jose\Bundle\JoseFramework\DependencyInjection\Source\Signature\SignatureSource; -use Jose\Component\Signature\JWSBuilderFactory; use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\TestCase; @@ -19,13 +18,6 @@ final class SerializerConfigurationTest extends TestCase { use ConfigurationTestCaseTrait; - protected function setUp(): void - { - if (! class_exists(JWSBuilderFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public function theConfigurationIsValidIfNoConfigurationIsSet(): void { diff --git a/tests/Component/KeyManagement/UrlKeySetFactoryTest.php b/tests/Component/KeyManagement/UrlKeySetFactoryTest.php index b0b4e022d..bb2fec5ff 100644 --- a/tests/Component/KeyManagement/UrlKeySetFactoryTest.php +++ b/tests/Component/KeyManagement/UrlKeySetFactoryTest.php @@ -25,10 +25,6 @@ final class UrlKeySetFactoryTest extends TestCase private ?HttpClientInterface $httpClient = null; - protected function setUp(): void - { - } - #[Test] public function iCanGetAKeySetFromAJWKUrl(): void { diff --git a/tests/Component/NestedToken/NestingTokenBuilderTest.php b/tests/Component/NestedToken/NestingTokenBuilderTest.php index 99661f2bc..28db501c6 100644 --- a/tests/Component/NestedToken/NestingTokenBuilderTest.php +++ b/tests/Component/NestedToken/NestingTokenBuilderTest.php @@ -4,7 +4,6 @@ namespace Jose\Tests\Component\NestedToken; -use Jose\Component\Checker\HeaderCheckerManagerFactory; use Jose\Component\Core\AlgorithmManagerFactory; use Jose\Component\Core\JWK; use Jose\Component\Encryption\Algorithm\ContentEncryption\A128GCM; @@ -16,7 +15,6 @@ use Jose\Component\Encryption\Serializer\JWESerializerManagerFactory; use Jose\Component\NestedToken\NestedTokenBuilderFactory; use Jose\Component\Signature\Algorithm\PS256; -use Jose\Component\Signature\JWSBuilder; use Jose\Component\Signature\JWSBuilderFactory; use Jose\Component\Signature\Serializer as JwsSerializer; use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; @@ -42,16 +40,6 @@ final class NestingTokenBuilderTest extends TestCase private ?JWESerializerManagerFactory $jwsSerializerManagerFactory = null; - protected function setUp(): void - { - if (! class_exists(HeaderCheckerManagerFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-checker" is not installed.'); - } - if (! class_exists(JWSBuilder::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[DoesNotPerformAssertions] #[Test] public function decryption(): void diff --git a/tests/Component/NestedToken/NestingTokenUsingNestedTokenLoaderTest.php b/tests/Component/NestedToken/NestingTokenUsingNestedTokenLoaderTest.php index 40830cfab..516243d80 100644 --- a/tests/Component/NestedToken/NestingTokenUsingNestedTokenLoaderTest.php +++ b/tests/Component/NestedToken/NestingTokenUsingNestedTokenLoaderTest.php @@ -19,7 +19,6 @@ use Jose\Component\Encryption\Serializer\JWESerializerManagerFactory; use Jose\Component\NestedToken\NestedTokenLoaderFactory; use Jose\Component\Signature\Algorithm\PS256; -use Jose\Component\Signature\JWSLoader; use Jose\Component\Signature\JWSLoaderFactory; use Jose\Component\Signature\JWSTokenSupport; use Jose\Component\Signature\JWSVerifierFactory; @@ -48,16 +47,6 @@ final class NestingTokenUsingNestedTokenLoaderTest extends TestCase private ?JWESerializerManagerFactory $jwsSerializerManagerFactory = null; - protected function setUp(): void - { - if (! class_exists(HeaderCheckerManagerFactory::class)) { - static::markTestSkipped('The component "web-token/jwt-checker" is not installed.'); - } - if (! class_exists(JWSLoader::class)) { - static::markTestSkipped('The component "web-token/jwt-signature" is not installed.'); - } - } - #[Test] public function decryption(): void { From 28968b347a43e5e4d981ef2723e44391cf98f203 Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Sat, 24 Feb 2024 15:30:42 +0100 Subject: [PATCH 4/6] Preparing 4.0.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b874e0c9..76d95ea99 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,7 @@ "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", From 9f1e170447073accd791bbd3546e5362d23e9f3d Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Sat, 24 Feb 2024 15:35:54 +0100 Subject: [PATCH 5/6] Preparing 4.0.0 --- composer.json | 5 +---- src/Library/composer.json | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 76d95ea99..ba67613ba 100644 --- a/composer.json +++ b/composer.json @@ -55,8 +55,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/pki-framework": "^1.0", "symfony/config": "^7.0", "symfony/console": "^7.0", @@ -74,8 +72,7 @@ "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", diff --git a/src/Library/composer.json b/src/Library/composer.json index 5c2f12078..e392a6d00 100644 --- a/src/Library/composer.json +++ b/src/Library/composer.json @@ -45,8 +45,6 @@ "paragonie/constant_time_encoding": "^2.6", "paragonie/sodium_compat": "^1.20", "psr/clock": "^1.0", - "psr/http-factory": "^1.0", - "psr/http-client": "^1.0", "spomky-labs/pki-framework": "^1.0", "symfony/console": "^7.0", "symfony/http-client": "^7.0", From c84e986ed95893b57ccea59c800a7ae2f6d68a4b Mon Sep 17 00:00:00 2001 From: Florent Morselli Date: Sat, 24 Feb 2024 15:47:38 +0100 Subject: [PATCH 6/6] Preparing 4.0.0 --- deptrac.yaml | 62 ++++++++++------------------------------------------ 1 file changed, 11 insertions(+), 51 deletions(-) diff --git a/deptrac.yaml b/deptrac.yaml index f0df02726..b71e53d00 100644 --- a/deptrac.yaml +++ b/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'