CS

Spomky · Spomky · commit 37a2d5842567 · 2021-10-26T14:42:06.000+02:00
diff --git a/src/Component/Console/GeneratorCommand.php b/src/Component/Console/GeneratorCommand.php
@@ -14,9 +14,9 @@
 namespace Jose\Component\Console;
 
 use InvalidArgumentException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function is_bool;
 use Jose\Component\KeyManagement\JWKFactory;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 
diff --git a/src/Component/Core/JWK.php b/src/Component/Core/JWK.php
@@ -14,11 +14,11 @@
 namespace Jose\Component\Core;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function in_array;
 use InvalidArgumentException;
 use function is_array;
 use JsonSerializable;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 class JWK implements JsonSerializable
 {
diff --git a/src/Component/Core/Util/ECKey.php b/src/Component/Core/Util/ECKey.php
@@ -13,11 +13,11 @@
 
 namespace Jose\Component\Core\Util;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function extension_loaded;
 use InvalidArgumentException;
 use function is_array;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 /**
diff --git a/src/Component/Core/Util/RSAKey.php b/src/Component/Core/Util/RSAKey.php
@@ -14,7 +14,6 @@
 namespace Jose\Component\Core\Util;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use FG\ASN1\Universal\BitString;
 use FG\ASN1\Universal\Integer;
@@ -25,6 +24,7 @@
 use InvalidArgumentException;
 use function is_array;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 /**
diff --git a/src/Component/Encryption/JWEBuilder.php b/src/Component/Encryption/JWEBuilder.php
@@ -14,7 +14,6 @@
 namespace Jose\Component\Encryption;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use Jose\Component\Core\AlgorithmManager;
@@ -31,6 +30,7 @@
 use Jose\Component\Encryption\Compression\CompressionMethod;
 use Jose\Component\Encryption\Compression\CompressionMethodManager;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 class JWEBuilder
diff --git a/src/Component/Encryption/Serializer/CompactSerializer.php b/src/Component/Encryption/Serializer/CompactSerializer.php
@@ -13,13 +13,13 @@
 
 namespace Jose\Component\Encryption\Serializer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Encryption\JWE;
 use Jose\Component\Encryption\Recipient;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use Throwable;
 
 final class CompactSerializer implements JWESerializer
diff --git a/src/Component/Encryption/Serializer/JSONFlattenedSerializer.php b/src/Component/Encryption/Serializer/JSONFlattenedSerializer.php
@@ -14,12 +14,12 @@
 namespace Jose\Component\Encryption\Serializer;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Encryption\JWE;
 use Jose\Component\Encryption\Recipient;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class JSONFlattenedSerializer implements JWESerializer
 {
diff --git a/src/Component/Encryption/Serializer/JSONGeneralSerializer.php b/src/Component/Encryption/Serializer/JSONGeneralSerializer.php
@@ -14,13 +14,13 @@
 namespace Jose\Component\Encryption\Serializer;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Encryption\JWE;
 use Jose\Component\Encryption\Recipient;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class JSONGeneralSerializer implements JWESerializer
 {
diff --git a/src/Component/KeyManagement/Analyzer/ES256KeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/ES256KeyAnalyzer.php
@@ -13,10 +13,10 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Brick\Math\BigInteger;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\Ecc\NistCurve;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 final class ES256KeyAnalyzer implements KeyAnalyzer
diff --git a/src/Component/KeyManagement/Analyzer/ES384KeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/ES384KeyAnalyzer.php
@@ -13,10 +13,10 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Brick\Math\BigInteger;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\Ecc\NistCurve;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 final class ES384KeyAnalyzer implements KeyAnalyzer
diff --git a/src/Component/KeyManagement/Analyzer/ES512KeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/ES512KeyAnalyzer.php
@@ -13,10 +13,10 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Brick\Math\BigInteger;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\Ecc\NistCurve;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 final class ES512KeyAnalyzer implements KeyAnalyzer
diff --git a/src/Component/KeyManagement/Analyzer/HS256KeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/HS256KeyAnalyzer.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class HS256KeyAnalyzer implements KeyAnalyzer
 {
diff --git a/src/Component/KeyManagement/Analyzer/HS384KeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/HS384KeyAnalyzer.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class HS384KeyAnalyzer implements KeyAnalyzer
 {
diff --git a/src/Component/KeyManagement/Analyzer/HS512KeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/HS512KeyAnalyzer.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class HS512KeyAnalyzer implements KeyAnalyzer
 {
diff --git a/src/Component/KeyManagement/Analyzer/OctAnalyzer.php b/src/Component/KeyManagement/Analyzer/OctAnalyzer.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class OctAnalyzer implements KeyAnalyzer
 {
diff --git a/src/Component/KeyManagement/Analyzer/RsaAnalyzer.php b/src/Component/KeyManagement/Analyzer/RsaAnalyzer.php
@@ -13,10 +13,10 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use InvalidArgumentException;
 use function is_array;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class RsaAnalyzer implements KeyAnalyzer
 {
diff --git a/src/Component/KeyManagement/Analyzer/ZxcvbnKeyAnalyzer.php b/src/Component/KeyManagement/Analyzer/ZxcvbnKeyAnalyzer.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\KeyManagement\Analyzer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use ZxcvbnPhp\Zxcvbn;
 
 final class ZxcvbnKeyAnalyzer implements KeyAnalyzer
diff --git a/src/Component/KeyManagement/JWKFactory.php b/src/Component/KeyManagement/JWKFactory.php
@@ -14,7 +14,6 @@
 namespace Jose\Component\KeyManagement;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function extension_loaded;
 use InvalidArgumentException;
 use function is_array;
@@ -24,6 +23,7 @@
 use Jose\Component\Core\Util\ECKey;
 use Jose\Component\KeyManagement\KeyConverter\KeyConverter;
 use Jose\Component\KeyManagement\KeyConverter\RSAKey;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use Throwable;
 
diff --git a/src/Component/KeyManagement/KeyConverter/ECKey.php b/src/Component/KeyManagement/KeyConverter/ECKey.php
@@ -14,7 +14,6 @@
 namespace Jose\Component\KeyManagement\KeyConverter;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use FG\ASN1\ASNObject;
 use FG\ASN1\Exception\ParserException;
@@ -27,6 +26,7 @@
 use InvalidArgumentException;
 use function is_array;
 use function is_string;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 /**
  * @internal
diff --git a/src/Component/KeyManagement/KeyConverter/KeyConverter.php b/src/Component/KeyManagement/KeyConverter/KeyConverter.php
@@ -14,12 +14,12 @@
 namespace Jose\Component\KeyManagement\KeyConverter;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use function extension_loaded;
 use InvalidArgumentException;
 use function is_array;
 use function is_string;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use Throwable;
 
diff --git a/src/Component/KeyManagement/KeyConverter/RSAKey.php b/src/Component/KeyManagement/KeyConverter/RSAKey.php
@@ -14,13 +14,13 @@
 namespace Jose\Component\KeyManagement\KeyConverter;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function extension_loaded;
 use function in_array;
 use InvalidArgumentException;
 use function is_array;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\BigInteger;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 /**
diff --git a/src/Component/Signature/JWSBuilder.php b/src/Component/Signature/JWSBuilder.php
@@ -14,7 +14,6 @@
 namespace Jose\Component\Signature;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use function in_array;
 use InvalidArgumentException;
@@ -27,6 +26,7 @@
 use Jose\Component\Signature\Algorithm\MacAlgorithm;
 use Jose\Component\Signature\Algorithm\SignatureAlgorithm;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 class JWSBuilder
diff --git a/src/Component/Signature/JWSVerifier.php b/src/Component/Signature/JWSVerifier.php
@@ -13,7 +13,6 @@
 
 namespace Jose\Component\Signature;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use InvalidArgumentException;
 use Jose\Component\Core\Algorithm;
 use Jose\Component\Core\AlgorithmManager;
@@ -22,6 +21,7 @@
 use Jose\Component\Core\Util\KeyChecker;
 use Jose\Component\Signature\Algorithm\MacAlgorithm;
 use Jose\Component\Signature\Algorithm\SignatureAlgorithm;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use Throwable;
 
 class JWSVerifier
diff --git a/src/Component/Signature/Serializer/CompactSerializer.php b/src/Component/Signature/Serializer/CompactSerializer.php
@@ -13,12 +13,12 @@
 
 namespace Jose\Component\Signature\Serializer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Signature\JWS;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use Throwable;
 
 final class CompactSerializer extends Serializer
diff --git a/src/Component/Signature/Serializer/JSONFlattenedSerializer.php b/src/Component/Signature/Serializer/JSONFlattenedSerializer.php
@@ -13,12 +13,12 @@
 
 namespace Jose\Component\Signature\Serializer;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use function is_array;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Signature\JWS;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class JSONFlattenedSerializer extends Serializer
 {
diff --git a/src/Component/Signature/Serializer/JSONGeneralSerializer.php b/src/Component/Signature/Serializer/JSONGeneralSerializer.php
@@ -14,14 +14,14 @@
 namespace Jose\Component\Signature\Serializer;
 
 use function array_key_exists;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use InvalidArgumentException;
 use function is_array;
 use function is_string;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Signature\JWS;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 
 final class JSONGeneralSerializer extends Serializer
 {
diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBCHS.php b/src/EncryptionAlgorithm/ContentEncryption/AESCBC/AESCBCHS.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\Encryption\Algorithm\ContentEncryption;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Encryption\Algorithm\ContentEncryptionAlgorithm;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 abstract class AESCBCHS implements ContentEncryptionAlgorithm
diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCM.php b/src/EncryptionAlgorithm/ContentEncryption/AESGCM/AESGCM.php
@@ -13,8 +13,8 @@
 
 namespace Jose\Component\Encryption\Algorithm\ContentEncryption;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Jose\Component\Encryption\Algorithm\ContentEncryptionAlgorithm;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 abstract class AESGCM implements ContentEncryptionAlgorithm
diff --git a/src/EncryptionAlgorithm/Experimental/KeyEncryption/AESCTR.php b/src/EncryptionAlgorithm/Experimental/KeyEncryption/AESCTR.php
@@ -13,11 +13,11 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function in_array;
 use InvalidArgumentException;
 use function is_string;
 use Jose\Component\Core\JWK;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 abstract class AESCTR implements KeyEncryption
diff --git a/src/EncryptionAlgorithm/Experimental/KeyEncryption/Chacha20Poly1305.php b/src/EncryptionAlgorithm/Experimental/KeyEncryption/Chacha20Poly1305.php
@@ -13,12 +13,12 @@
 
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function in_array;
 use InvalidArgumentException;
 use function is_string;
 use Jose\Component\Core\JWK;
 use LogicException;
+use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 
 final class Chacha20Poly1305 implements KeyEncryption
diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/AESGCMKW.php b/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/AESGCMKW.php
diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/AESKW.php b/src/EncryptionAlgorithm/KeyEncryption/AESKW/AESKW.php
diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/Dir.php b/src/EncryptionAlgorithm/KeyEncryption/Direct/Dir.php
diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHES.php b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/ECDHES.php
diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/Util/ConcatKDF.php b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/Util/ConcatKDF.php
diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2AESKW.php b/src/EncryptionAlgorithm/KeyEncryption/PBES2/PBES2AESKW.php
diff --git a/src/SignatureAlgorithm/EdDSA/EdDSA.php b/src/SignatureAlgorithm/EdDSA/EdDSA.php
diff --git a/src/SignatureAlgorithm/HMAC/HMAC.php b/src/SignatureAlgorithm/HMAC/HMAC.php
