Move all exception codes to the ExceptionCodes class

Author: nicumicle

src/BeforeValidException.php

@@ -4,6 +4,4 @@
 
 class BeforeValidException extends \UnexpectedValueException
 {
-    public const NBF_PRIOR_TO_DATE = 1;
-    public const IAT_PRIOR_TO_DATE = 2;
 }

src/ExceptionCodes.php

@@ -12,46 +12,50 @@ class ExceptionCodes
     public const EMPTY_ALGORITHM = 6;
     public const DECODE_ALGORITHM_NOT_SUPPORTED = 7;
     public const INCORRECT_KEY_FOR_ALGORITHM = 8;
-    public const SIGN_ALGORITHM_NOT_SUPPORTED = 9;
-    public const KEY_IS_NOT_STRING = 10;
-    public const OPENSSL_CAN_NOT_SIGN_DATA = 11;
-    public const SODIUM_KEY_IS_NOT_STRING = 12;
-    public const SODIUM_EXCEPTION = 13;
-    public const SIGN_GENERAL_EXCEPTION = 14;
-    public const VERIFY_ALGORITHM_NOT_SUPPORTED = 15;
-    public const VERIFY_OPEN_SSL_ERROR = 16;
-    public const VERIFY_SODIUM_NOT_AVAILABLE = 17;
-    public const VERIFY_KEY_MATERIAL_IS_NOT_STRING = 18;
-    public const VERIFY_SODIUM_EXCEPTION = 19;
-    public const VERIFY_KEY_IS_NOT_STRING = 20;
-    public const DECODED_JSON_IS_NULL = 21;
-    public const ENCODED_JSON_IS_NULL = 22;
-    public const INVALID_JSON = 23;
-    public const KID_IS_EMPTY = 24;
-    public const KID_IS_INVALID = 25;
-    public const JSON_ERROR = 26;
+    public const SIGNATURE_VERIFICATION_FAILED = 9;
+    public const NBF_PRIOR_TO_DATE = 10;
+    public const IAT_PRIOR_TO_DATE = 11;
+    public const TOKEN_EXPIRED = 12;
+    public const SIGN_ALGORITHM_NOT_SUPPORTED = 13;
+    public const KEY_IS_NOT_STRING = 14;
+    public const OPENSSL_CAN_NOT_SIGN_DATA = 15;
+    public const SODIUM_KEY_IS_NOT_STRING = 16;
+    public const SODIUM_EXCEPTION = 17;
+    public const SIGN_GENERAL_EXCEPTION = 18;
+    public const VERIFY_ALGORITHM_NOT_SUPPORTED = 19;
+    public const VERIFY_OPEN_SSL_ERROR = 20;
+    public const VERIFY_SODIUM_NOT_AVAILABLE = 21;
+    public const VERIFY_KEY_MATERIAL_IS_NOT_STRING = 22;
+    public const VERIFY_SODIUM_EXCEPTION = 23;
+    public const VERIFY_KEY_IS_NOT_STRING = 24;
+    public const DECODED_JSON_IS_NULL = 25;
+    public const ENCODED_JSON_IS_NULL = 26;
+    public const INVALID_JSON = 27;
+    public const KID_IS_EMPTY = 28;
+    public const KID_IS_INVALID = 29;
+    public const JSON_ERROR = 30;
 
-    public const KEY_ID_NOT_FOUND = 27;
-    public const OFFSET_SET_METHOD_NOT_IMPLEMENTED = 28;
-    public const OFFSET_UNSET_METHOD_NOT_IMPLEMENTED = 29;
+    public const KEY_ID_NOT_FOUND = 31;
+    public const OFFSET_SET_METHOD_NOT_IMPLEMENTED = 32;
+    public const OFFSET_UNSET_METHOD_NOT_IMPLEMENTED = 33;
 
-    public const JWKS_URI_IS_EMPTY = 30;
+    public const JWKS_URI_IS_EMPTY = 34;
 
-    public const JWK_MISSING_KEYS = 31;
-    public const JWT_KEYS_IS_EMPTY = 32;
-    public const JWT_ALGORITHM_NOT_SUPPORTED = 33;
-    public const JWK_IS_EMPTY = 34;
-    public const JWT_MISSING_KTY_PARAMETER = 35;
-    public const JWT_MISSING_ALG_PARAMETER = 36;
-    public const JWT_RSA_KEYS_NOT_SUPPORTED = 37;
-    public const JWT_RSA_KEYS_MISSING_N_AND_E = 38;
-    public const JWT_OPEN_SSL_ERROR = 39;
-    public const JWK_EC_D_IS_NOT_SET = 40;
-    public const JWT_EC_CRV_IS_EMPTY = 41;
-    public const JWK_UNSUPPORTED_EC_CURVE = 42;
-    public const JWT_X_AND_Y_ARE_EMPTY = 43;
+    public const JWK_MISSING_KEYS = 35;
+    public const JWT_KEYS_IS_EMPTY = 36;
+    public const JWT_ALGORITHM_NOT_SUPPORTED = 37;
+    public const JWK_IS_EMPTY = 38;
+    public const JWT_MISSING_KTY_PARAMETER = 39;
+    public const JWT_MISSING_ALG_PARAMETER = 40;
+    public const JWT_RSA_KEYS_NOT_SUPPORTED = 41;
+    public const JWT_RSA_KEYS_MISSING_N_AND_E = 42;
+    public const JWT_OPEN_SSL_ERROR = 43;
+    public const JWK_EC_D_IS_NOT_SET = 44;
+    public const JWT_EC_CRV_IS_EMPTY = 45;
+    public const JWK_UNSUPPORTED_EC_CURVE = 46;
+    public const JWT_X_AND_Y_ARE_EMPTY = 47;
 
-    public const KEY_MATERIAL_IS_INVALID = 44;
-    public const KEY_MATERIAL_IS_EMPTY = 45;
-    public const KEY_ALGORITHM_IS_EMPTY = 46;
+    public const KEY_MATERIAL_IS_INVALID = 48;
+    public const KEY_MATERIAL_IS_EMPTY = 49;
+    public const KEY_ALGORITHM_IS_EMPTY = 50;
 }

src/ExpiredException.php

@@ -4,5 +4,4 @@
 
 class ExpiredException extends \UnexpectedValueException
 {
-    public const TOKEN_EXPIRED = 1;
 }

src/JWT.php

@@ -163,7 +163,7 @@ public static function decode(
         if (!self::verify("{$headb64}.{$bodyb64}", $sig, $key->getKeyMaterial(), $header->alg)) {
             throw new SignatureInvalidException(
                 'Signature verification failed',
-                SignatureInvalidException::SIGNATURE_VERIFICATION_FAILED
+                ExceptionCodes::SIGNATURE_VERIFICATION_FAILED
             );
         }
 
@@ -172,7 +172,7 @@ public static function decode(
         if (isset($payload->nbf) && $payload->nbf > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
                 'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->nbf),
-                BeforeValidException::NBF_PRIOR_TO_DATE
+                ExceptionCodes::NBF_PRIOR_TO_DATE
             );
         }
 
@@ -182,13 +182,13 @@ public static function decode(
         if (isset($payload->iat) && $payload->iat > ($timestamp + static::$leeway)) {
             throw new BeforeValidException(
                 'Cannot handle token prior to ' . \date(DateTime::ISO8601, $payload->iat),
-                BeforeValidException::IAT_PRIOR_TO_DATE
+                ExceptionCodes::IAT_PRIOR_TO_DATE
             );
         }
 
         // Check if this token has expired.
         if (isset($payload->exp) && ($timestamp - static::$leeway) >= $payload->exp) {
-            throw new ExpiredException('Expired token', ExpiredException::TOKEN_EXPIRED);
+            throw new ExpiredException('Expired token', ExceptionCodes::TOKEN_EXPIRED);
         }
 
         return $payload;

src/SignatureInvalidException.php

@@ -4,5 +4,4 @@
 
 class SignatureInvalidException extends \UnexpectedValueException
 {
-    public const SIGNATURE_VERIFICATION_FAILED = 1;
 }