web-token · Spomky · Jan 4, 2024 · Jan 4, 2024 · Jan 4, 2024
diff --git a/src/Component/Encryption/JWELoader.php b/src/Component/Encryption/JWELoader.php
@@ -11,6 +11,9 @@
 use RuntimeException;
 use Throwable;
 
+/**
+ * @see \Jose\Tests\Component\Encryption\JWELoaderTest
+ */
 class JWELoader
 {
     public function __construct(

diff --git a/src/Component/Signature/JWS.php b/src/Component/Signature/JWS.php
@@ -8,6 +8,9 @@
 use Jose\Component\Core\JWT;
 use function count;
 
+/**
+ * @see \Jose\Tests\Component\Signature\JWSTest
+ */
 class JWS implements JWT
 {
     /**

diff --git a/src/Component/Signature/JWSBuilder.php b/src/Component/Signature/JWSBuilder.php
@@ -69,9 +69,6 @@ public function create(): self
      */
     public function withPayload(string $payload, bool $isPayloadDetached = false): self
     {
-        if (mb_detect_encoding($payload, 'UTF-8', true) === false) {
-            throw new InvalidArgumentException('The payload must be encoded in UTF-8');
-        }
         $clone = clone $this;
         $clone->payload = $payload;
         $clone->isPayloadDetached = $isPayloadDetached;
@@ -124,6 +121,13 @@ public function build(): JWS
         $encodedPayload = $this->isPayloadEncoded === false ? $this->payload : Base64UrlSafe::encodeUnpadded(
             $this->payload
         );
+
+        if ($this->isPayloadEncoded === false && $this->isPayloadDetached === false) {
+            mb_detect_encoding($this->payload, 'UTF-8', true) !== false || throw new InvalidArgumentException(
+                'The payload must be encoded in UTF-8'
+            );
+        }
+
         $jws = new JWS($this->payload, $encodedPayload, $this->isPayloadDetached);
         foreach ($this->signatures as $signature) {
             /** @var MacAlgorithm|SignatureAlgorithm $algorithm */

diff --git a/src/Component/Signature/JWSLoader.php b/src/Component/Signature/JWSLoader.php
@@ -11,6 +11,9 @@
 use Jose\Component\Signature\Serializer\JWSSerializerManager;
 use Throwable;
 
+/**
+ * @see \Jose\Tests\Component\Signature\JWSLoaderTest
+ */
 class JWSLoader
 {
     public function __construct(

diff --git a/...ponent/Encryption/CompressionTestCase.php → .../Component/Encryption/CompressionTest.php b/...ponent/Encryption/CompressionTestCase.php → .../Component/Encryption/CompressionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class CompressionTestCase extends EncryptionTestCase
+final class CompressionTest extends EncryptionTestCase
 {
     #[Test]
     public function getValidCompressionAlgorithm(): void

diff --git a/...on/ECDHESWithX25519EncryptionTestCase.php → ...yption/ECDHESWithX25519EncryptionTest.php b/...on/ECDHESWithX25519EncryptionTestCase.php → ...yption/ECDHESWithX25519EncryptionTest.php
@@ -12,7 +12,7 @@
  *
  * @internal
  */
-final class ECDHESWithX25519EncryptionTestCase extends EncryptionTestCase
+final class ECDHESWithX25519EncryptionTest extends EncryptionTestCase
 {
     /**
      * @see https://tools.ietf.org/html/rfc7516#appendix-B

diff --git a/...omponent/Encryption/EncrypterTestCase.php → tests/Component/Encryption/EncrypterTest.php b/...omponent/Encryption/EncrypterTestCase.php → tests/Component/Encryption/EncrypterTest.php
@@ -14,7 +14,7 @@
 /**
  * @internal
  */
-final class EncrypterTestCase extends EncryptionTestCase
+final class EncrypterTest extends EncryptionTestCase
 {
     #[Test]
     public function encryptWithJWTInput(): void

diff --git a/...Encryption/InvalidCurveAttackTestCase.php → ...ent/Encryption/InvalidCurveAttackTest.php b/...Encryption/InvalidCurveAttackTestCase.php → ...ent/Encryption/InvalidCurveAttackTest.php
@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class InvalidCurveAttackTestCase extends EncryptionTestCase
+final class InvalidCurveAttackTest extends EncryptionTestCase
 {
     #[Test]
     public function curveCheckNegativeP256AttackPt1(): void

diff --git a/...onent/Encryption/JWEFlattenedTestCase.php → ...Component/Encryption/JWEFlattenedTest.php b/...onent/Encryption/JWEFlattenedTestCase.php → ...Component/Encryption/JWEFlattenedTest.php
@@ -11,7 +11,7 @@
 /**
  * @internal
  */
-final class JWEFlattenedTestCase extends EncryptionTestCase
+final class JWEFlattenedTest extends EncryptionTestCase
 {
     /**
      * @see https://tools.ietf.org/html/rfc7516#appendix-A.5

diff --git a/...omponent/Encryption/JWELoaderTestCase.php → tests/Component/Encryption/JWELoaderTest.php b/...omponent/Encryption/JWELoaderTestCase.php → tests/Component/Encryption/JWELoaderTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class JWELoaderTestCase extends EncryptionTestCase
+final class JWELoaderTest extends EncryptionTestCase
 {
     private ?JWELoader $jweLoader = null;
 

diff --git a/...Component/Encryption/JWESplitTestCase.php → tests/Component/Encryption/JWESplitTest.php b/...Component/Encryption/JWESplitTestCase.php → tests/Component/Encryption/JWESplitTest.php
@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class JWESplitTestCase extends EncryptionTestCase
+final class JWESplitTest extends EncryptionTestCase
 {
     #[Test]
     public function aJweObjectWithMoreThanOneRecipientCanBeSplittedIntoSeveralJweObjects(): void

diff --git a/...ncryptionProtectedContentOnlyTestCase.php → ...GCMEncryptionProtectedContentOnlyTest.php b/...ncryptionProtectedContentOnlyTestCase.php → ...GCMEncryptionProtectedContentOnlyTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class A128KWAndA128GCMEncryptionProtectedContentOnlyTestCase extends EncryptionTestCase
+final class A128KWAndA128GCMEncryptionProtectedContentOnlyTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...20/A128KWAndA128GCMEncryptionTestCase.php → ...FC7520/A128KWAndA128GCMEncryptionTest.php b/...20/A128KWAndA128GCMEncryptionTestCase.php → ...FC7520/A128KWAndA128GCMEncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class A128KWAndA128GCMEncryptionTestCase extends EncryptionTestCase
+final class A128KWAndA128GCMEncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...thAdditionalAuthenticatedDataTestCase.php → ...onWithAdditionalAuthenticatedDataTest.php b/...thAdditionalAuthenticatedDataTestCase.php → ...onWithAdditionalAuthenticatedDataTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class A128KWAndA128GCMEncryptionWithAdditionalAuthenticatedDataTestCase extends EncryptionTestCase
+final class A128KWAndA128GCMEncryptionWithAdditionalAuthenticatedDataTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...8GCMEncryptionWithCompressionTestCase.php → ...dA128GCMEncryptionWithCompressionTest.php b/...8GCMEncryptionWithCompressionTestCase.php → ...dA128GCMEncryptionWithCompressionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class A128KWAndA128GCMEncryptionWithCompressionTestCase extends EncryptionTestCase
+final class A128KWAndA128GCMEncryptionWithCompressionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...SpecificProtectedHeaderValuesTestCase.php → ...WithSpecificProtectedHeaderValuesTest.php b/...SpecificProtectedHeaderValuesTestCase.php → ...WithSpecificProtectedHeaderValuesTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class A128KWAndA128GCMEncryptionWithSpecificProtectedHeaderValuesTestCase extends EncryptionTestCase
+final class A128KWAndA128GCMEncryptionWithSpecificProtectedHeaderValuesTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...MKWAndA128CBC_HS256EncryptionTestCase.php → ...56GCMKWAndA128CBC_HS256EncryptionTest.php b/...MKWAndA128CBC_HS256EncryptionTestCase.php → ...56GCMKWAndA128CBC_HS256EncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class A256GCMKWAndA128CBC_HS256EncryptionTestCase extends EncryptionTestCase
+final class A256GCMKWAndA128CBC_HS256EncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...C7520/DirAndA128GCMEncryptionTestCase.php → ...n/RFC7520/DirAndA128GCMEncryptionTest.php b/...C7520/DirAndA128GCMEncryptionTestCase.php → ...n/RFC7520/DirAndA128GCMEncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class DirAndA128GCMEncryptionTestCase extends EncryptionTestCase
+final class DirAndA128GCMEncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...ES_A128KWAndA128GCMEncryptionTestCase.php → ...CDH_ES_A128KWAndA128GCMEncryptionTest.php b/...ES_A128KWAndA128GCMEncryptionTestCase.php → ...CDH_ES_A128KWAndA128GCMEncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class ECDH_ES_A128KWAndA128GCMEncryptionTestCase extends EncryptionTestCase
+final class ECDH_ES_A128KWAndA128GCMEncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...ES_AndA128CBC_HS256EncryptionTestCase.php → ...CDH_ES_AndA128CBC_HS256EncryptionTest.php b/...ES_AndA128CBC_HS256EncryptionTestCase.php → ...CDH_ES_AndA128CBC_HS256EncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class ECDH_ES_AndA128CBC_HS256EncryptionTestCase extends EncryptionTestCase
+final class ECDH_ES_AndA128CBC_HS256EncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...0/MultipleRecipientEncryptionTestCase.php → ...C7520/MultipleRecipientEncryptionTest.php b/...0/MultipleRecipientEncryptionTestCase.php → ...C7520/MultipleRecipientEncryptionTest.php
@@ -15,7 +15,7 @@
  *
  * @internal
  */
-final class MultipleRecipientEncryptionTestCase extends EncryptionTestCase
+final class MultipleRecipientEncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...6KWAndA128CBC_HS256EncryptionTestCase.php → ..._A256KWAndA128CBC_HS256EncryptionTest.php b/...6KWAndA128CBC_HS256EncryptionTestCase.php → ..._A256KWAndA128CBC_HS256EncryptionTest.php
@@ -15,7 +15,7 @@
  *
  * @internal
  */
-final class PBES2_HS512_A256KWAndA128CBC_HS256EncryptionTestCase extends EncryptionTestCase
+final class PBES2_HS512_A256KWAndA128CBC_HS256EncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...1_5AndA128CBC_HS256EncryptionTestCase.php → .../RSA1_5AndA128CBC_HS256EncryptionTest.php b/...1_5AndA128CBC_HS256EncryptionTestCase.php → .../RSA1_5AndA128CBC_HS256EncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class RSA1_5AndA128CBC_HS256EncryptionTestCase extends EncryptionTestCase
+final class RSA1_5AndA128CBC_HS256EncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/.../RSA_OAEPAndA256GCMEncryptionTestCase.php → ...7520/RSA_OAEPAndA256GCMEncryptionTest.php b/.../RSA_OAEPAndA256GCMEncryptionTestCase.php → ...7520/RSA_OAEPAndA256GCMEncryptionTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class RSA_OAEPAndA256GCMEncryptionTestCase extends EncryptionTestCase
+final class RSA_OAEPAndA256GCMEncryptionTest extends EncryptionTestCase
 {
     /**
      * Please note that we cannot the encryption and get the same result as the example (IV, TAG and other data are

diff --git a/...nent/Encryption/RSAEncryptionTestCase.php → ...omponent/Encryption/RSAEncryptionTest.php b/...nent/Encryption/RSAEncryptionTestCase.php → ...omponent/Encryption/RSAEncryptionTest.php
@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class RSAEncryptionTestCase extends EncryptionTestCase
+final class RSAEncryptionTest extends EncryptionTestCase
 {
     /**
      * @see https://tools.ietf.org/html/rfc7516

diff --git a/...t/Encryption/RSAKeyEncryptionTestCase.php → ...onent/Encryption/RSAKeyEncryptionTest.php b/...t/Encryption/RSAKeyEncryptionTestCase.php → ...onent/Encryption/RSAKeyEncryptionTest.php
@@ -19,7 +19,7 @@
  *
  * @internal
  */
-final class RSAKeyEncryptionTestCase extends EncryptionTestCase
+final class RSAKeyEncryptionTest extends EncryptionTestCase
 {
     #[Test]
     public function invalidKey(): void

diff --git a/...yption/RSAKeyWithoutAllPrimesTestCase.php → ...Encryption/RSAKeyWithoutAllPrimesTest.php b/...yption/RSAKeyWithoutAllPrimesTestCase.php → ...Encryption/RSAKeyWithoutAllPrimesTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class RSAKeyWithoutAllPrimesTestCase extends EncryptionTestCase
+final class RSAKeyWithoutAllPrimesTest extends EncryptionTestCase
 {
     #[DataProvider('dataEncryptionAlgorithms')]
     #[Test]

diff --git a/...Component/NestedToken/NestingTestCase.php → tests/Component/NestedToken/NestingTest.php b/...Component/NestedToken/NestingTestCase.php → tests/Component/NestedToken/NestingTest.php
@@ -12,7 +12,7 @@
  *
  * @internal
  */
-final class NestingTestCase extends NestedTokenTestCase
+final class NestingTest extends NestedTokenTestCase
 {
     #[Test]
     public function decryption(): void

diff --git a/...omponent/Signature/ForeignJWTTestCase.php → tests/Component/Signature/ForeignJWTTest.php b/...omponent/Signature/ForeignJWTTestCase.php → tests/Component/Signature/ForeignJWTTest.php
@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class ForeignJWTTestCase extends SignatureTestCase
+final class ForeignJWTTest extends SignatureTestCase
 {
     /*
      * The following test uses an assertion created with another library.

diff --git a/...ponent/Signature/JWSFlattenedTestCase.php → .../Component/Signature/JWSFlattenedTest.php b/...ponent/Signature/JWSFlattenedTestCase.php → .../Component/Signature/JWSFlattenedTest.php
@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class JWSFlattenedTestCase extends SignatureTestCase
+final class JWSFlattenedTest extends SignatureTestCase
 {
     /**
      * @see https://tools.ietf.org/html/rfc7516#appendix-A.5

diff --git a/...Component/Signature/JWSLoaderTestCase.php → tests/Component/Signature/JWSLoaderTest.php b/...Component/Signature/JWSLoaderTestCase.php → tests/Component/Signature/JWSLoaderTest.php
@@ -12,7 +12,7 @@
 /**
  * @internal
  */
-final class JWSLoaderTestCase extends SignatureTestCase
+final class JWSLoaderTest extends SignatureTestCase
 {
     private ?JWSLoader $jwsLoader = null;
 

diff --git a/.../Component/Signature/JWSSplitTestCase.php → tests/Component/Signature/JWSSplitTest.php b/.../Component/Signature/JWSSplitTestCase.php → tests/Component/Signature/JWSSplitTest.php
@@ -10,7 +10,7 @@
 /**
  * @internal
  */
-final class JWSSplitTestCase extends SignatureTestCase
+final class JWSSplitTest extends SignatureTestCase
 {
     #[Test]
     public function aJwsObjectWithMoreThanOneRecipientCanBeSplittedIntoSeveralJwsObjects(): void

diff --git a/tests/Component/Signature/JWSTestCase.php → tests/Component/Signature/JWSTest.php b/tests/Component/Signature/JWSTestCase.php → tests/Component/Signature/JWSTest.php
@@ -14,7 +14,7 @@
 /**
  * @internal
  */
-final class JWSTestCase extends SignatureTestCase
+final class JWSTest extends SignatureTestCase
 {
     #[Test]
     public function jWS(): void

diff --git a/...re/RFC7520/MultipleSignaturesTestCase.php → ...nature/RFC7520/MultipleSignaturesTest.php b/...re/RFC7520/MultipleSignaturesTestCase.php → ...nature/RFC7520/MultipleSignaturesTest.php
@@ -13,7 +13,7 @@
  *
  * @internal
  */
-final class MultipleSignaturesTestCase extends SignatureTestCase
+final class MultipleSignaturesTest extends SignatureTestCase
 {
     #[Test]
     public function multipleSignatures(): void

diff --git a/...ent/Signature/RFC7520/NestingTestCase.php → ...mponent/Signature/RFC7520/NestingTest.php b/...ent/Signature/RFC7520/NestingTestCase.php → ...mponent/Signature/RFC7520/NestingTest.php
@@ -14,7 +14,7 @@
  *
  * @internal
  */
-final class NestingTestCase extends SignatureTestCase
+final class NestingTest extends SignatureTestCase
 {
     #[Test]
     public function signatureVerification(): void