sop / jwx

lib/JWX/JWS/Algorithm/ECDSAAlgorithm.php

Indentation +121 added lines, -121 removed lines

@@ -21,134 +21,134 @@
  */
 abstract class ECDSAAlgorithm extends OpenSSLSignatureAlgorithm
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = [
-        JWA::ALGO_ES256 => ES256Algorithm::class,
-        JWA::ALGO_ES384 => ES384Algorithm::class,
-        JWA::ALGO_ES512 => ES512Algorithm::class,
-    ];
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = [
+		JWA::ALGO_ES256 => ES256Algorithm::class,
+		JWA::ALGO_ES384 => ES384Algorithm::class,
+		JWA::ALGO_ES512 => ES512Algorithm::class,
+	];
 
-    /**
-     * Signature size in bytes.
-     *
-     * @var int
-     */
-    private $_signatureSize;
+	/**
+	 * Signature size in bytes.
+	 *
+	 * @var int
+	 */
+	private $_signatureSize;
 
-    /**
-     * Constructor.
-     *
-     * @param ECPublicKeyJWK  $pub_key
-     * @param ECPrivateKeyJWK $priv_key
-     */
-    protected function __construct(ECPublicKeyJWK $pub_key,
-        ?ECPrivateKeyJWK $priv_key = null)
-    {
-        $curve = $pub_key->curveParameter()->value();
-        if ($this->_curveName() !== $curve) {
-            throw new \InvalidArgumentException(
-                'Key with ' . $this->_curveName() .
-                     " curve expected, got {$curve}.");
-        }
-        $this->_publicKey = $pub_key;
-        $this->_privateKey = $priv_key;
-        $key_size = $pub_key->curveParameter()->keySizeBits();
-        $this->_signatureSize = intval(ceil($key_size / 8) * 2);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param ECPublicKeyJWK  $pub_key
+	 * @param ECPrivateKeyJWK $priv_key
+	 */
+	protected function __construct(ECPublicKeyJWK $pub_key,
+		?ECPrivateKeyJWK $priv_key = null)
+	{
+		$curve = $pub_key->curveParameter()->value();
+		if ($this->_curveName() !== $curve) {
+			throw new \InvalidArgumentException(
+				'Key with ' . $this->_curveName() .
+					 " curve expected, got {$curve}.");
+		}
+		$this->_publicKey = $pub_key;
+		$this->_privateKey = $priv_key;
+		$key_size = $pub_key->curveParameter()->keySizeBits();
+		$this->_signatureSize = intval(ceil($key_size / 8) * 2);
+	}
 
-    /**
-     * Initialize from a public key.
-     *
-     * @param ECPublicKeyJWK $jwk
-     *
-     * @return self
-     */
-    public static function fromPublicKey(ECPublicKeyJWK $jwk): self
-    {
-        return new static($jwk);
-    }
+	/**
+	 * Initialize from a public key.
+	 *
+	 * @param ECPublicKeyJWK $jwk
+	 *
+	 * @return self
+	 */
+	public static function fromPublicKey(ECPublicKeyJWK $jwk): self
+	{
+		return new static($jwk);
+	}
 
-    /**
-     * Initialize from a private key.
-     *
-     * @param ECPrivateKeyJWK $jwk
-     *
-     * @return self
-     */
-    public static function fromPrivateKey(ECPrivateKeyJWK $jwk): self
-    {
-        return new static($jwk->publicKey(), $jwk);
-    }
+	/**
+	 * Initialize from a private key.
+	 *
+	 * @param ECPrivateKeyJWK $jwk
+	 *
+	 * @return self
+	 */
+	public static function fromPrivateKey(ECPrivateKeyJWK $jwk): self
+	{
+		return new static($jwk->publicKey(), $jwk);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
-    {
-        $alg = JWA::deriveAlgorithmName($header, $jwk);
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException("Unsupported algorithm '{$alg}'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$alg];
-        if ($jwk->has(...ECPrivateKeyJWK::MANAGED_PARAMS)) {
-            return $cls::fromPrivateKey(ECPrivateKeyJWK::fromJWK($jwk));
-        }
-        return $cls::fromPublicKey(ECPublicKeyJWK::fromJWK($jwk));
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
+	{
+		$alg = JWA::deriveAlgorithmName($header, $jwk);
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException("Unsupported algorithm '{$alg}'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$alg];
+		if ($jwk->has(...ECPrivateKeyJWK::MANAGED_PARAMS)) {
+			return $cls::fromPrivateKey(ECPrivateKeyJWK::fromJWK($jwk));
+		}
+		return $cls::fromPublicKey(ECPublicKeyJWK::fromJWK($jwk));
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function computeSignature(string $data): string
-    {
-        // OpenSSL returns ECDSA signature as a DER encoded ECDSA-Sig-Value
-        $der = parent::computeSignature($data);
-        $sig = ECSignature::fromDER($der);
-        $mlen = intval(floor($this->_signatureSize / 2));
-        return ECConversion::numberToOctets($sig->r(), $mlen) .
-             ECConversion::numberToOctets($sig->s(), $mlen);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function computeSignature(string $data): string
+	{
+		// OpenSSL returns ECDSA signature as a DER encoded ECDSA-Sig-Value
+		$der = parent::computeSignature($data);
+		$sig = ECSignature::fromDER($der);
+		$mlen = intval(floor($this->_signatureSize / 2));
+		return ECConversion::numberToOctets($sig->r(), $mlen) .
+			 ECConversion::numberToOctets($sig->s(), $mlen);
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \UnexpectedValueException If signature length is invalid
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        if (strlen($signature) !== $this->_signatureSize) {
-            throw new \UnexpectedValueException('Invalid signature length.');
-        }
-        [$r_octets, $s_octets] = str_split($signature,
-            intval(floor($this->_signatureSize / 2)));
-        // convert signature to DER sequence for OpenSSL
-        $r = ECConversion::octetsToNumber($r_octets);
-        $s = ECConversion::octetsToNumber($s_octets);
-        $sig = new ECSignature($r, $s);
-        return parent::validateSignature($data, $sig->toDER());
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws \UnexpectedValueException If signature length is invalid
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		if (strlen($signature) !== $this->_signatureSize) {
+			throw new \UnexpectedValueException('Invalid signature length.');
+		}
+		[$r_octets, $s_octets] = str_split($signature,
+			intval(floor($this->_signatureSize / 2)));
+		// convert signature to DER sequence for OpenSSL
+		$r = ECConversion::octetsToNumber($r_octets);
+		$s = ECConversion::octetsToNumber($s_octets);
+		$sig = new ECSignature($r, $s);
+		return parent::validateSignature($data, $sig->toDER());
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            [AlgorithmParameter::fromAlgorithm($this)]);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			[AlgorithmParameter::fromAlgorithm($this)]);
+	}
 
-    /**
-     * Get the name of the curve used by this algorithm.
-     *
-     * @return string
-     */
-    abstract protected function _curveName(): string;
+	/**
+	 * Get the name of the curve used by this algorithm.
+	 *
+	 * @return string
+	 */
+	abstract protected function _curveName(): string;
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/RS384Algorithm.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
  */
 class RS384Algorithm extends RSASSAPKCS1Algorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_RS384;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_RS384;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): int
-    {
-        return OPENSSL_ALGO_SHA384;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): int
+	{
+		return OPENSSL_ALGO_SHA384;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/HMACAlgorithm.php

Indentation +78 added lines, -78 removed lines

@@ -18,89 +18,89 @@
  */
 abstract class HMACAlgorithm extends SignatureAlgorithm
 {
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = [
-        JWA::ALGO_HS256 => HS256Algorithm::class,
-        JWA::ALGO_HS384 => HS384Algorithm::class,
-        JWA::ALGO_HS512 => HS512Algorithm::class,
-    ];
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = [
+		JWA::ALGO_HS256 => HS256Algorithm::class,
+		JWA::ALGO_HS384 => HS384Algorithm::class,
+		JWA::ALGO_HS512 => HS512Algorithm::class,
+	];
 
-    /**
-     * Shared secret key.
-     *
-     * @var string
-     */
-    protected $_key;
+	/**
+	 * Shared secret key.
+	 *
+	 * @var string
+	 */
+	protected $_key;
 
-    /**
-     * Constructor.
-     *
-     * @param string $key Shared secret key
-     */
-    public function __construct(string $key)
-    {
-        $this->_key = $key;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $key Shared secret key
+	 */
+	public function __construct(string $key)
+	{
+		$this->_key = $key;
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        $alg = JWA::deriveAlgorithmName($header, $jwk);
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException("Unsupported algorithm '{$alg}'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$alg];
-        return new $cls($jwk->key());
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		$alg = JWA::deriveAlgorithmName($header, $jwk);
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException("Unsupported algorithm '{$alg}'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$alg];
+		return new $cls($jwk->key());
+	}
 
-    /**
-     * {@inheritdoc}
-     *
-     * @throws \RuntimeException For generic errors
-     */
-    public function computeSignature(string $data): string
-    {
-        $result = @hash_hmac($this->_hashAlgo(), $data, $this->_key, true);
-        if (false === $result) {
-            $err = error_get_last();
-            $msg = isset($err) && __FILE__ === $err['file'] ? $err['message'] : null;
-            throw new \RuntimeException($msg ?? 'hash_hmac() failed.');
-        }
-        return $result;
-    }
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @throws \RuntimeException For generic errors
+	 */
+	public function computeSignature(string $data): string
+	{
+		$result = @hash_hmac($this->_hashAlgo(), $data, $this->_key, true);
+		if (false === $result) {
+			$err = error_get_last();
+			$msg = isset($err) && __FILE__ === $err['file'] ? $err['message'] : null;
+			throw new \RuntimeException($msg ?? 'hash_hmac() failed.');
+		}
+		return $result;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        return $this->computeSignature($data) === $signature;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		return $this->computeSignature($data) === $signature;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            [AlgorithmParameter::fromAlgorithm($this)]);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			[AlgorithmParameter::fromAlgorithm($this)]);
+	}
 
-    /**
-     * Get algorithm name recognized by the Hash extension.
-     *
-     * @return string
-     */
-    abstract protected function _hashAlgo(): string;
+	/**
+	 * Get algorithm name recognized by the Hash extension.
+	 *
+	 * @return string
+	 */
+	abstract protected function _hashAlgo(): string;
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/ES512Algorithm.php

Indentation +21 added lines, -21 removed lines

@@ -14,27 +14,27 @@
  */
 class ES512Algorithm extends ECDSAAlgorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_ES512;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_ES512;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _curveName(): string
-    {
-        return CurveParameter::CURVE_P521;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _curveName(): string
+	{
+		return CurveParameter::CURVE_P521;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): int
-    {
-        return OPENSSL_ALGO_SHA512;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): int
+	{
+		return OPENSSL_ALGO_SHA512;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/HS256Algorithm.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
  */
 class HS256Algorithm extends HMACAlgorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_HS256;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_HS256;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo(): string
-    {
-        return 'sha256';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo(): string
+	{
+		return 'sha256';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/JWS/Algorithm/RS256Algorithm.php

Indentation +14 added lines, -14 removed lines

@@ -13,19 +13,19 @@
  */
 class RS256Algorithm extends RSASSAPKCS1Algorithm
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_RS256;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_RS256;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function _mdMethod(): int
-    {
-        return OPENSSL_ALGO_SHA256;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _mdMethod(): int
+	{
+		return OPENSSL_ALGO_SHA256;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\JWS\Algorithm;
 

lib/JWX/Util/UUIDv4.php

Indentation +55 added lines, -55 removed lines

@@ -28,40 +28,40 @@ 
  */
 class UUIDv4
 {
-    /**
-     * UUID.
-     *
-     * @var string
-     */
-    protected $_uuid;
+	/**
+	 * UUID.
+	 *
+	 * @var string
+	 */
+	protected $_uuid;
 
-    /**
-     * Constructor.
-     *
-     * @param string $uuid UUIDv4 in canonical hexadecimal format
-     */
-    public function __construct(string $uuid)
-    {
-        // @todo Check that UUID is version 4
-        $this->_uuid = $uuid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uuid UUIDv4 in canonical hexadecimal format
+	 */
+	public function __construct(string $uuid)
+	{
+		// @todo Check that UUID is version 4
+		$this->_uuid = $uuid;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->canonical();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->canonical();
+	}
 
-    /**
-     * Create new random UUIDv4.
-     *
-     * @return self
-     */
-    public static function createRandom(): self
-    {
-        /*
+	/**
+	 * Create new random UUIDv4.
+	 *
+	 * @return self
+	 */
+	public static function createRandom(): self
+	{
+		/*
          1. Set the two most significant bits (bits 6 and 7) of
          the clock_seq_hi_and_reserved to zero and one, respectively.
 
@@ -72,29 +72,29 @@ 
          3. Set all the other bits to randomly (or pseudo-randomly)
          chosen values.
          */
-        $uuid = sprintf('%04x%04x-%04x-%04x-%02x%02x-%04x%04x%04x',
-            // time_low
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
-            // time_mid
-            mt_rand(0, 0xffff),
-            // time_hi_and_version
-            mt_rand(0, 0x0fff) | 0x4000,
-            // clk_seq_hi_res
-            mt_rand(0, 0x3f) | 0x80,
-            // clk_seq_low
-            mt_rand(0, 0xff),
-            // node
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
-        return new self($uuid);
-    }
+		$uuid = sprintf('%04x%04x-%04x-%04x-%02x%02x-%04x%04x%04x',
+			// time_low
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+			// time_mid
+			mt_rand(0, 0xffff),
+			// time_hi_and_version
+			mt_rand(0, 0x0fff) | 0x4000,
+			// clk_seq_hi_res
+			mt_rand(0, 0x3f) | 0x80,
+			// clk_seq_low
+			mt_rand(0, 0xff),
+			// node
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+		return new self($uuid);
+	}
 
-    /**
-     * Get UUIDv4 in canonical form.
-     *
-     * @return string
-     */
-    public function canonical(): string
-    {
-        return $this->_uuid;
-    }
+	/**
+	 * Get UUIDv4 in canonical form.
+	 *
+	 * @return string
+	 */
+	public function canonical(): string
+	{
+		return $this->_uuid;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\Util;
 
@@ -78,9 +78,9 @@ 
             // time_mid
             mt_rand(0, 0xffff),
             // time_hi_and_version
-            mt_rand(0, 0x0fff) | 0x4000,
+            mt_rand(0, 0x0fff)|0x4000,
             // clk_seq_hi_res
-            mt_rand(0, 0x3f) | 0x80,
+            mt_rand(0, 0x3f)|0x80,
             // clk_seq_low
             mt_rand(0, 0xff),
             // node

lib/JWX/Util/BigInt.php

Indentation +76 added lines, -76 removed lines

@@ -9,87 +9,87 @@
  */
 class BigInt
 {
-    /**
-     * Number.
-     *
-     * @var \GMP
-     */
-    protected $_num;
+	/**
+	 * Number.
+	 *
+	 * @var \GMP
+	 */
+	protected $_num;
 
-    /**
-     * Constructor.
-     *
-     * @param \GMP $num GMP number
-     */
-    protected function __construct(\GMP $num)
-    {
-        $this->_num = $num;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \GMP $num GMP number
+	 */
+	protected function __construct(\GMP $num)
+	{
+		$this->_num = $num;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->base10();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->base10();
+	}
 
-    /**
-     * Initialize from a base10 number.
-     *
-     * @param int|string $number
-     *
-     * @return self
-     */
-    public static function fromBase10($number): self
-    {
-        $num = gmp_init($number, 10);
-        return new self($num);
-    }
+	/**
+	 * Initialize from a base10 number.
+	 *
+	 * @param int|string $number
+	 *
+	 * @return self
+	 */
+	public static function fromBase10($number): self
+	{
+		$num = gmp_init($number, 10);
+		return new self($num);
+	}
 
-    /**
-     * Initialize from a base256 number.
-     *
-     * Base64 number is an octet string of big endian, most significant word
-     * first integer.
-     *
-     * @param string $octets
-     *
-     * @return self
-     */
-    public static function fromBase256(string $octets): self
-    {
-        $num = gmp_import($octets, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        return new self($num);
-    }
+	/**
+	 * Initialize from a base256 number.
+	 *
+	 * Base64 number is an octet string of big endian, most significant word
+	 * first integer.
+	 *
+	 * @param string $octets
+	 *
+	 * @return self
+	 */
+	public static function fromBase256(string $octets): self
+	{
+		$num = gmp_import($octets, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		return new self($num);
+	}
 
-    /**
-     * Convert to base10 string.
-     *
-     * @return string
-     */
-    public function base10(): string
-    {
-        return gmp_strval($this->_num, 10);
-    }
+	/**
+	 * Convert to base10 string.
+	 *
+	 * @return string
+	 */
+	public function base10(): string
+	{
+		return gmp_strval($this->_num, 10);
+	}
 
-    /**
-     * Convert to base16 string.
-     *
-     * @return string
-     */
-    public function base16(): string
-    {
-        return gmp_strval($this->_num, 16);
-    }
+	/**
+	 * Convert to base16 string.
+	 *
+	 * @return string
+	 */
+	public function base16(): string
+	{
+		return gmp_strval($this->_num, 16);
+	}
 
-    /**
-     * Convert to base256 string.
-     *
-     * @return string
-     */
-    public function base256(): string
-    {
-        return gmp_export($this->_num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-    }
+	/**
+	 * Convert to base256 string.
+	 *
+	 * @return string
+	 */
+	public function base256(): string
+	{
+		return gmp_export($this->_num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\Util;
 
@@ -59,7 +59,7 @@ 
      */
     public static function fromBase256(string $octets): self
     {
-        $num = gmp_import($octets, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+        $num = gmp_import($octets, 1, GMP_MSW_FIRST|GMP_BIG_ENDIAN);
         return new self($num);
     }
 
@@ -90,6 +90,6 @@ 
      */
     public function base256(): string
     {
-        return gmp_export($this->_num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+        return gmp_export($this->_num, 1, GMP_MSW_FIRST|GMP_BIG_ENDIAN);
     }
 }

lib/JWX/Util/Base64.php

Indentation +102 added lines, -102 removed lines

@@ -9,111 +9,111 @@
  */
 class Base64
 {
-    /**
-     * Encode a string using base64url variant.
-     *
-     * @see https://en.wikipedia.org/wiki/Base64#URL_applications
-     *
-     * @param string $data
-     *
-     * @return string
-     */
-    public static function urlEncode(string $data): string
-    {
-        return strtr(rtrim(self::encode($data), '='), '+/', '-_');
-    }
+	/**
+	 * Encode a string using base64url variant.
+	 *
+	 * @see https://en.wikipedia.org/wiki/Base64#URL_applications
+	 *
+	 * @param string $data
+	 *
+	 * @return string
+	 */
+	public static function urlEncode(string $data): string
+	{
+		return strtr(rtrim(self::encode($data), '='), '+/', '-_');
+	}
 
-    /**
-     * Decode a string using base64url variant.
-     *
-     * @see https://en.wikipedia.org/wiki/Base64#URL_applications
-     *
-     * @param string $data
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return string
-     */
-    public static function urlDecode(string $data): string
-    {
-        $data = strtr($data, '-_', '+/');
-        switch (strlen($data) % 4) {
-            case 0:
-                break;
-            case 2:
-                $data .= '==';
-                break;
-            case 3:
-                $data .= '=';
-                break;
-            default:
-                throw new \UnexpectedValueException(
-                    'Malformed base64url encoding.');
-        }
-        return self::decode($data);
-    }
+	/**
+	 * Decode a string using base64url variant.
+	 *
+	 * @see https://en.wikipedia.org/wiki/Base64#URL_applications
+	 *
+	 * @param string $data
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return string
+	 */
+	public static function urlDecode(string $data): string
+	{
+		$data = strtr($data, '-_', '+/');
+		switch (strlen($data) % 4) {
+			case 0:
+				break;
+			case 2:
+				$data .= '==';
+				break;
+			case 3:
+				$data .= '=';
+				break;
+			default:
+				throw new \UnexpectedValueException(
+					'Malformed base64url encoding.');
+		}
+		return self::decode($data);
+	}
 
-    /**
-     * Check whether string is validly base64url encoded.
-     *
-     * @see https://en.wikipedia.org/wiki/Base64#URL_applications
-     *
-     * @param string $data
-     *
-     * @return bool
-     */
-    public static function isValidURLEncoding(string $data): bool
-    {
-        return 1 === preg_match('#^[A-Za-z0-9\-_]*$#', $data);
-    }
+	/**
+	 * Check whether string is validly base64url encoded.
+	 *
+	 * @see https://en.wikipedia.org/wiki/Base64#URL_applications
+	 *
+	 * @param string $data
+	 *
+	 * @return bool
+	 */
+	public static function isValidURLEncoding(string $data): bool
+	{
+		return 1 === preg_match('#^[A-Za-z0-9\-_]*$#', $data);
+	}
 
-    /**
-     * Encode a string in base64.
-     *
-     * @see https://tools.ietf.org/html/rfc4648#section-4
-     *
-     * @param string $data
-     *
-     * @return string
-     */
-    public static function encode(string $data): string
-    {
-        return base64_encode($data);
-    }
+	/**
+	 * Encode a string in base64.
+	 *
+	 * @see https://tools.ietf.org/html/rfc4648#section-4
+	 *
+	 * @param string $data
+	 *
+	 * @return string
+	 */
+	public static function encode(string $data): string
+	{
+		return base64_encode($data);
+	}
 
-    /**
-     * Decode a string from base64 encoding.
-     *
-     * @see https://tools.ietf.org/html/rfc4648#section-4
-     *
-     * @param string $data
-     *
-     * @throws \RuntimeException If decoding fails
-     *
-     * @return string
-     */
-    public static function decode(string $data): string
-    {
-        $ret = base64_decode($data, true);
-        if (!is_string($ret)) {
-            $err = error_get_last();
-            $msg = isset($err) && __FILE__ === $err['file'] ? $err['message'] : null;
-            throw new \RuntimeException($msg ?? 'base64_decode() failed.');
-        }
-        return $ret;
-    }
+	/**
+	 * Decode a string from base64 encoding.
+	 *
+	 * @see https://tools.ietf.org/html/rfc4648#section-4
+	 *
+	 * @param string $data
+	 *
+	 * @throws \RuntimeException If decoding fails
+	 *
+	 * @return string
+	 */
+	public static function decode(string $data): string
+	{
+		$ret = base64_decode($data, true);
+		if (!is_string($ret)) {
+			$err = error_get_last();
+			$msg = isset($err) && __FILE__ === $err['file'] ? $err['message'] : null;
+			throw new \RuntimeException($msg ?? 'base64_decode() failed.');
+		}
+		return $ret;
+	}
 
-    /**
-     * Check whether string is validly base64 encoded.
-     *
-     * @see https://tools.ietf.org/html/rfc4648#section-4
-     *
-     * @param string $data
-     *
-     * @return bool
-     */
-    public static function isValid(string $data): bool
-    {
-        return 1 === preg_match('#^[A-Za-z0-9+/]*={0,2}$#', $data);
-    }
+	/**
+	 * Check whether string is validly base64 encoded.
+	 *
+	 * @see https://tools.ietf.org/html/rfc4648#section-4
+	 *
+	 * @param string $data
+	 *
+	 * @return bool
+	 */
+	public static function isValid(string $data): bool
+	{
+		return 1 === preg_match('#^[A-Za-z0-9+/]*={0,2}$#', $data);
+	}
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -38,17 +38,17 @@
     {
         $data = strtr($data, '-_', '+/');
         switch (strlen($data) % 4) {
-            case 0:
-                break;
-            case 2:
-                $data .= '==';
-                break;
-            case 3:
-                $data .= '=';
-                break;
-            default:
-                throw new \UnexpectedValueException(
-                    'Malformed base64url encoding.');
+        case 0:
+            break;
+        case 2:
+            $data .= '==';
+            break;
+        case 3:
+            $data .= '=';
+            break;
+        default:
+            throw new \UnexpectedValueException(
+                'Malformed base64url encoding.');
         }
         return self::decode($data);
     }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\JWX\Util;