sop / jwx

lib/JWX/Util/BigInt.php

Indentation +75 added lines, -75 removed lines

@@ -9,86 +9,86 @@
  */
 class BigInt
 {
-    /**
-     * Number.
-     *
-     * @var resource|\GMP $_num
-     */
-    protected $_num;
+	/**
+	 * Number.
+	 *
+	 * @var resource|\GMP $_num
+	 */
+	protected $_num;
     
-    /**
-     * Constructor.
-     *
-     * @param resource|\GMP $num GMP number
-     */
-    protected function __construct($num)
-    {
-        $this->_num = $num;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param resource|\GMP $num GMP number
+	 */
+	protected function __construct($num)
+	{
+		$this->_num = $num;
+	}
     
-    /**
-     * Initialize from a base10 number.
-     *
-     * @param string|int $number
-     * @return self
-     */
-    public static function fromBase10($number): self
-    {
-        $num = gmp_init($number, 10);
-        return new self($num);
-    }
+	/**
+	 * Initialize from a base10 number.
+	 *
+	 * @param string|int $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);
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->base10();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->base10();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,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);
     }
     
@@ -80,7 +80,7 @@ 
      */
     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/JWK/Asymmetric/PrivateKeyJWK.php

Indentation +39 added lines, -39 removed lines

@@ -18,46 +18,46 @@
  */
 abstract class PrivateKeyJWK extends JWK
 {
-    /**
-     * Get the public key component of the asymmetric key pair.
-     *
-     * @return PublicKeyJWK
-     */
-    abstract public function publicKey(): PublicKeyJWK;
+	/**
+	 * Get the public key component of the asymmetric key pair.
+	 *
+	 * @return PublicKeyJWK
+	 */
+	abstract public function publicKey(): PublicKeyJWK;
     
-    /**
-     * Convert private key to PEM.
-     *
-     * @return PEM
-     */
-    abstract public function toPEM(): PEM;
+	/**
+	 * Convert private key to PEM.
+	 *
+	 * @return PEM
+	 */
+	abstract public function toPEM(): PEM;
     
-    /**
-     * Initialize from a PrivateKey object.
-     *
-     * @param PrivateKey $priv_key Private key
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromPrivateKey(PrivateKey $priv_key): PrivateKeyJWK
-    {
-        if ($priv_key instanceof RSAPrivateKey) {
-            return RSAPrivateKeyJWK::fromRSAPrivateKey($priv_key);
-        }
-        if ($priv_key instanceof ECPrivateKey) {
-            return ECPrivateKeyJWK::fromECPrivateKey($priv_key);
-        }
-        throw new \UnexpectedValueException("Unsupported private key.");
-    }
+	/**
+	 * Initialize from a PrivateKey object.
+	 *
+	 * @param PrivateKey $priv_key Private key
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromPrivateKey(PrivateKey $priv_key): PrivateKeyJWK
+	{
+		if ($priv_key instanceof RSAPrivateKey) {
+			return RSAPrivateKeyJWK::fromRSAPrivateKey($priv_key);
+		}
+		if ($priv_key instanceof ECPrivateKey) {
+			return ECPrivateKeyJWK::fromECPrivateKey($priv_key);
+		}
+		throw new \UnexpectedValueException("Unsupported private key.");
+	}
     
-    /**
-     * Initialize from a PrivateKeyInfo object.
-     *
-     * @param PrivateKeyInfo $pki PrivateKeyInfo
-     * @return self
-     */
-    public static function fromPrivateKeyInfo(PrivateKeyInfo $pki): PrivateKeyJWK
-    {
-        return self::fromPrivateKey($pki->privateKey());
-    }
+	/**
+	 * Initialize from a PrivateKeyInfo object.
+	 *
+	 * @param PrivateKeyInfo $pki PrivateKeyInfo
+	 * @return self
+	 */
+	public static function fromPrivateKeyInfo(PrivateKeyInfo $pki): PrivateKeyJWK
+	{
+		return self::fromPrivateKey($pki->privateKey());
+	}
 }

lib/JWX/JWK/Asymmetric/PublicKeyJWK.php

Indentation +33 added lines, -33 removed lines

@@ -18,39 +18,39 @@
  */
 abstract class PublicKeyJWK extends JWK
 {
-    /**
-     * Convert public key to PEM.
-     *
-     * @return PEM
-     */
-    abstract public function toPEM(): PEM;
+	/**
+	 * Convert public key to PEM.
+	 *
+	 * @return PEM
+	 */
+	abstract public function toPEM(): PEM;
     
-    /**
-     * Initialize from a PublicKey object.
-     *
-     * @param PublicKey $pub_key Public key
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromPublicKey(PublicKey $pub_key): PublicKeyJWK
-    {
-        if ($pub_key instanceof RSAPublicKey) {
-            return RSAPublicKeyJWK::fromRSAPublicKey($pub_key);
-        }
-        if ($pub_key instanceof ECPublicKey) {
-            return ECPublicKeyJWK::fromECPublicKey($pub_key);
-        }
-        throw new \UnexpectedValueException("Unsupported public key.");
-    }
+	/**
+	 * Initialize from a PublicKey object.
+	 *
+	 * @param PublicKey $pub_key Public key
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromPublicKey(PublicKey $pub_key): PublicKeyJWK
+	{
+		if ($pub_key instanceof RSAPublicKey) {
+			return RSAPublicKeyJWK::fromRSAPublicKey($pub_key);
+		}
+		if ($pub_key instanceof ECPublicKey) {
+			return ECPublicKeyJWK::fromECPublicKey($pub_key);
+		}
+		throw new \UnexpectedValueException("Unsupported public key.");
+	}
     
-    /**
-     * Initialize from a PublicKeyInfo object.
-     *
-     * @param PublicKeyInfo $pki Public key info
-     * @return self
-     */
-    public static function fromPublicKeyInfo(PublicKeyInfo $pki): PublicKeyJWK
-    {
-        return self::fromPublicKey($pki->publicKey());
-    }
+	/**
+	 * Initialize from a PublicKeyInfo object.
+	 *
+	 * @param PublicKeyInfo $pki Public key info
+	 * @return self
+	 */
+	public static function fromPublicKeyInfo(PublicKeyInfo $pki): PublicKeyJWK
+	{
+		return self::fromPublicKey($pki->publicKey());
+	}
 }

lib/JWX/JWK/JWK.php

Indentation +169 added lines, -169 removed lines

@@ -14,187 +14,187 @@
  */
 class JWK implements \Countable, \IteratorAggregate
 {
-    use TypedJWK;
+	use TypedJWK;
     
-    /**
-     * Parameters.
-     *
-     * @var JWKParameter[] $_parameters
-     */
-    protected $_parameters;
+	/**
+	 * Parameters.
+	 *
+	 * @var JWKParameter[] $_parameters
+	 */
+	protected $_parameters;
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        $this->_parameters = array();
-        foreach ($params as $param) {
-            $this->_parameters[$param->name()] = $param;
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		$this->_parameters = array();
+		foreach ($params as $param) {
+			$this->_parameters[$param->name()] = $param;
+		}
+	}
     
-    /**
-     * Initialize from an array representing a JSON object.
-     *
-     * @param array $members
-     * @return self
-     */
-    public static function fromArray(array $members): self
-    {
-        $params = array();
-        foreach ($members as $name => $value) {
-            $params[] = JWKParameter::fromNameAndValue($name, $value);
-        }
-        return new static(...$params);
-    }
+	/**
+	 * Initialize from an array representing a JSON object.
+	 *
+	 * @param array $members
+	 * @return self
+	 */
+	public static function fromArray(array $members): self
+	{
+		$params = array();
+		foreach ($members as $name => $value) {
+			$params[] = JWKParameter::fromNameAndValue($name, $value);
+		}
+		return new static(...$params);
+	}
     
-    /**
-     * Initialize from a JSON string.
-     *
-     * @param string $json
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJSON(string $json): self
-    {
-        $members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
-        if (!is_array($members)) {
-            throw new \UnexpectedValueException("Invalid JSON.");
-        }
-        return static::fromArray($members);
-    }
+	/**
+	 * Initialize from a JSON string.
+	 *
+	 * @param string $json
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJSON(string $json): self
+	{
+		$members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
+		if (!is_array($members)) {
+			throw new \UnexpectedValueException("Invalid JSON.");
+		}
+		return static::fromArray($members);
+	}
     
-    /**
-     * Initialize from another JWK.
-     *
-     * Allows casting to subclass by late static binding.
-     *
-     * @param JWK $jwk
-     * @return self
-     */
-    public static function fromJWK(JWK $jwk): self
-    {
-        return new static(...array_values($jwk->_parameters));
-    }
+	/**
+	 * Initialize from another JWK.
+	 *
+	 * Allows casting to subclass by late static binding.
+	 *
+	 * @param JWK $jwk
+	 * @return self
+	 */
+	public static function fromJWK(JWK $jwk): self
+	{
+		return new static(...array_values($jwk->_parameters));
+	}
     
-    /**
-     * Get self with parameters added.
-     *
-     * @param JWKParameter ...$params
-     * @return self
-     */
-    public function withParameters(JWKParameter ...$params): self
-    {
-        $obj = clone $this;
-        foreach ($params as $param) {
-            $obj->_parameters[$param->name()] = $param;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with parameters added.
+	 *
+	 * @param JWKParameter ...$params
+	 * @return self
+	 */
+	public function withParameters(JWKParameter ...$params): self
+	{
+		$obj = clone $this;
+		foreach ($params as $param) {
+			$obj->_parameters[$param->name()] = $param;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get all parameters.
-     *
-     * @return JWKParameter[]
-     */
-    public function parameters(): array
-    {
-        return $this->_parameters;
-    }
+	/**
+	 * Get all parameters.
+	 *
+	 * @return JWKParameter[]
+	 */
+	public function parameters(): array
+	{
+		return $this->_parameters;
+	}
     
-    /**
-     * Get self with given key ID added to parameters.
-     *
-     * @param string $id Key ID as a string
-     * @return self
-     */
-    public function withKeyID(string $id): self
-    {
-        return $this->withParameters(new KeyIDParameter($id));
-    }
+	/**
+	 * Get self with given key ID added to parameters.
+	 *
+	 * @param string $id Key ID as a string
+	 * @return self
+	 */
+	public function withKeyID(string $id): self
+	{
+		return $this->withParameters(new KeyIDParameter($id));
+	}
     
-    /**
-     * Whether parameters are present.
-     *
-     * Returns false if any of the given parameters is not set.
-     *
-     * @param string ...$names Parameter names
-     * @return bool
-     */
-    public function has(string ...$names): bool
-    {
-        foreach ($names as $name) {
-            if (!isset($this->_parameters[$name])) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Whether parameters are present.
+	 *
+	 * Returns false if any of the given parameters is not set.
+	 *
+	 * @param string ...$names Parameter names
+	 * @return bool
+	 */
+	public function has(string ...$names): bool
+	{
+		foreach ($names as $name) {
+			if (!isset($this->_parameters[$name])) {
+				return false;
+			}
+		}
+		return true;
+	}
     
-    /**
-     * Get a parameter.
-     *
-     * @param string $name Parameter name
-     * @throws \LogicException
-     * @return JWKParameter
-     */
-    public function get(string $name): JWKParameter
-    {
-        if (!$this->has($name)) {
-            throw new \LogicException("Parameter $name doesn't exists.");
-        }
-        return $this->_parameters[$name];
-    }
+	/**
+	 * Get a parameter.
+	 *
+	 * @param string $name Parameter name
+	 * @throws \LogicException
+	 * @return JWKParameter
+	 */
+	public function get(string $name): JWKParameter
+	{
+		if (!$this->has($name)) {
+			throw new \LogicException("Parameter $name doesn't exists.");
+		}
+		return $this->_parameters[$name];
+	}
     
-    /**
-     * Convert to array.
-     *
-     * @return array Parameter values keyed by parameter names
-     */
-    public function toArray(): array
-    {
-        $a = array();
-        foreach ($this->_parameters as $param) {
-            $a[$param->name()] = $param->value();
-        }
-        return $a;
-    }
+	/**
+	 * Convert to array.
+	 *
+	 * @return array Parameter values keyed by parameter names
+	 */
+	public function toArray(): array
+	{
+		$a = array();
+		foreach ($this->_parameters as $param) {
+			$a[$param->name()] = $param->value();
+		}
+		return $a;
+	}
     
-    /**
-     * Convert to JSON.
-     *
-     * @return string
-     */
-    public function toJSON(): string
-    {
-        $data = $this->toArray();
-        if (empty($data)) {
-            return "";
-        }
-        return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
-    }
+	/**
+	 * Convert to JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON(): string
+	{
+		$data = $this->toArray();
+		if (empty($data)) {
+			return "";
+		}
+		return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
+	}
     
-    /**
-     * Get the number of parameters.
-     *
-     * @see \Countable::count()
-     */
-    public function count(): int
-    {
-        return count($this->_parameters);
-    }
+	/**
+	 * Get the number of parameters.
+	 *
+	 * @see \Countable::count()
+	 */
+	public function count(): int
+	{
+		return count($this->_parameters);
+	}
     
-    /**
-     * Get iterator for the parameters.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_parameters);
-    }
+	/**
+	 * Get iterator for the parameters.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_parameters);
+	}
 }

lib/JWX/JWK/RSA/RSAPrivateKeyJWK.php

Indentation +117 added lines, -117 removed lines

@@ -29,126 +29,126 @@
  */
 class RSAPrivateKeyJWK extends PrivateKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = array(
-        /* @formatter:off */
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_MODULUS,
-        JWKParameter::PARAM_EXPONENT,
-        JWKParameter::PARAM_PRIVATE_EXPONENT,
-        JWKParameter::PARAM_FIRST_PRIME_FACTOR,
-        JWKParameter::PARAM_SECOND_PRIME_FACTOR,
-        JWKParameter::PARAM_FIRST_FACTOR_CRT_EXPONENT,
-        JWKParameter::PARAM_SECOND_FACTOR_CRT_EXPONENT,
-        JWKParameter::PARAM_FIRST_CRT_COEFFICIENT
-        /* @formatter:on */
-    );
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = array(
+		/* @formatter:off */
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_MODULUS,
+		JWKParameter::PARAM_EXPONENT,
+		JWKParameter::PARAM_PRIVATE_EXPONENT,
+		JWKParameter::PARAM_FIRST_PRIME_FACTOR,
+		JWKParameter::PARAM_SECOND_PRIME_FACTOR,
+		JWKParameter::PARAM_FIRST_FACTOR_CRT_EXPONENT,
+		JWKParameter::PARAM_SECOND_FACTOR_CRT_EXPONENT,
+		JWKParameter::PARAM_FIRST_CRT_COEFFICIENT
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     * @throws \UnexpectedValueException If missing required parameter
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        parent::__construct(...$params);
-        foreach (self::MANAGED_PARAMS as $name) {
-            if (!$this->has($name)) {
-                throw new \UnexpectedValueException("Missing '$name' parameter.");
-            }
-        }
-        if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_RSA) {
-            throw new \UnexpectedValueException("Invalid key type.");
-        }
-        // cast private exponent to correct class
-        $key = JWKParameter::PARAM_PRIVATE_EXPONENT;
-        $this->_parameters[$key] = new PrivateExponentParameter(
-            $this->_parameters[$key]->value());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 * @throws \UnexpectedValueException If missing required parameter
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		parent::__construct(...$params);
+		foreach (self::MANAGED_PARAMS as $name) {
+			if (!$this->has($name)) {
+				throw new \UnexpectedValueException("Missing '$name' parameter.");
+			}
+		}
+		if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_RSA) {
+			throw new \UnexpectedValueException("Invalid key type.");
+		}
+		// cast private exponent to correct class
+		$key = JWKParameter::PARAM_PRIVATE_EXPONENT;
+		$this->_parameters[$key] = new PrivateExponentParameter(
+			$this->_parameters[$key]->value());
+	}
     
-    /**
-     * Initialize from RSAPrivateKey.
-     *
-     * @param RSAPrivateKey $pk
-     * @return self
-     */
-    public static function fromRSAPrivateKey(RSAPrivateKey $pk): self
-    {
-        $n = ModulusParameter::fromNumber($pk->modulus());
-        $e = ExponentParameter::fromNumber($pk->publicExponent());
-        $d = PrivateExponentParameter::fromNumber($pk->privateExponent());
-        $p = FirstPrimeFactorParameter::fromNumber($pk->prime1());
-        $q = SecondPrimeFactorParameter::fromNumber($pk->prime2());
-        $dp = FirstFactorCRTExponentParameter::fromNumber($pk->exponent1());
-        $dq = SecondFactorCRTExponentParameter::fromNumber($pk->exponent2());
-        $qi = FirstCRTCoefficientParameter::fromNumber($pk->coefficient());
-        $key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_RSA);
-        return new self($key_type, $n, $e, $d, $p, $q, $dp, $dq, $qi);
-    }
+	/**
+	 * Initialize from RSAPrivateKey.
+	 *
+	 * @param RSAPrivateKey $pk
+	 * @return self
+	 */
+	public static function fromRSAPrivateKey(RSAPrivateKey $pk): self
+	{
+		$n = ModulusParameter::fromNumber($pk->modulus());
+		$e = ExponentParameter::fromNumber($pk->publicExponent());
+		$d = PrivateExponentParameter::fromNumber($pk->privateExponent());
+		$p = FirstPrimeFactorParameter::fromNumber($pk->prime1());
+		$q = SecondPrimeFactorParameter::fromNumber($pk->prime2());
+		$dp = FirstFactorCRTExponentParameter::fromNumber($pk->exponent1());
+		$dq = SecondFactorCRTExponentParameter::fromNumber($pk->exponent2());
+		$qi = FirstCRTCoefficientParameter::fromNumber($pk->coefficient());
+		$key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_RSA);
+		return new self($key_type, $n, $e, $d, $p, $q, $dp, $dq, $qi);
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @return self
-     */
-    public static function fromPEM(PEM $pem): self
-    {
-        return self::fromRSAPrivateKey(RSAPrivateKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem): self
+	{
+		return self::fromRSAPrivateKey(RSAPrivateKey::fromPEM($pem));
+	}
     
-    /**
-     * Get public key component.
-     *
-     * @return RSAPublicKeyJWK
-     */
-    public function publicKey(): PublicKeyJWK
-    {
-        $kty = $this->keyTypeParameter();
-        $n = $this->modulusParameter();
-        $e = $this->exponentParameter();
-        return new RSAPublicKeyJWK($kty, $n, $e);
-    }
+	/**
+	 * Get public key component.
+	 *
+	 * @return RSAPublicKeyJWK
+	 */
+	public function publicKey(): PublicKeyJWK
+	{
+		$kty = $this->keyTypeParameter();
+		$n = $this->modulusParameter();
+		$e = $this->exponentParameter();
+		return new RSAPublicKeyJWK($kty, $n, $e);
+	}
     
-    /**
-     * Convert JWK to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM(): PEM
-    {
-        $n = $this->modulusParameter()
-            ->number()
-            ->base10();
-        $e = $this->exponentParameter()
-            ->number()
-            ->base10();
-        $d = $this->privateExponentParameter()
-            ->number()
-            ->base10();
-        $p = $this->firstPrimeFactorParameter()
-            ->number()
-            ->base10();
-        $q = $this->secondPrimeFactorParameter()
-            ->number()
-            ->base10();
-        $dp = $this->firstFactorCRTExponentParameter()
-            ->number()
-            ->base10();
-        $dq = $this->secondFactorCRTExponentParameter()
-            ->number()
-            ->base10();
-        $qi = $this->firstCRTCoefficientParameter()
-            ->number()
-            ->base10();
-        $pk = new RSAPrivateKey($n, $e, $d, $p, $q, $dp, $dq, $qi);
-        return PrivateKeyInfo::fromPrivateKey($pk)->toPEM();
-    }
+	/**
+	 * Convert JWK to PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM(): PEM
+	{
+		$n = $this->modulusParameter()
+			->number()
+			->base10();
+		$e = $this->exponentParameter()
+			->number()
+			->base10();
+		$d = $this->privateExponentParameter()
+			->number()
+			->base10();
+		$p = $this->firstPrimeFactorParameter()
+			->number()
+			->base10();
+		$q = $this->secondPrimeFactorParameter()
+			->number()
+			->base10();
+		$dp = $this->firstFactorCRTExponentParameter()
+			->number()
+			->base10();
+		$dq = $this->secondFactorCRTExponentParameter()
+			->number()
+			->base10();
+		$qi = $this->firstCRTCoefficientParameter()
+			->number()
+			->base10();
+		$pk = new RSAPrivateKey($n, $e, $d, $p, $q, $dp, $dq, $qi);
+		return PrivateKeyInfo::fromPrivateKey($pk)->toPEM();
+	}
 }

lib/JWX/JWK/RSA/RSAPublicKeyJWK.php

Indentation +71 added lines, -71 removed lines

@@ -22,79 +22,79 @@
  */
 class RSAPublicKeyJWK extends PublicKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = array(
-        /* @formatter:off */
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_MODULUS,
-        JWKParameter::PARAM_EXPONENT
-        /* @formatter:on */
-    );
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = array(
+		/* @formatter:off */
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_MODULUS,
+		JWKParameter::PARAM_EXPONENT
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     * @throws \UnexpectedValueException If missing required parameter
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        parent::__construct(...$params);
-        foreach (self::MANAGED_PARAMS as $name) {
-            if (!$this->has($name)) {
-                throw new \UnexpectedValueException("Missing '$name' parameter.");
-            }
-        }
-        if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_RSA) {
-            throw new \UnexpectedValueException("Invalid key type.");
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 * @throws \UnexpectedValueException If missing required parameter
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		parent::__construct(...$params);
+		foreach (self::MANAGED_PARAMS as $name) {
+			if (!$this->has($name)) {
+				throw new \UnexpectedValueException("Missing '$name' parameter.");
+			}
+		}
+		if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_RSA) {
+			throw new \UnexpectedValueException("Invalid key type.");
+		}
+	}
     
-    /**
-     * Initialize from RSAPublicKey.
-     *
-     * @param RSAPublicKey $pk
-     * @return self
-     */
-    public static function fromRSAPublicKey(RSAPublicKey $pk): self
-    {
-        $n = ModulusParameter::fromNumber($pk->modulus());
-        $e = ExponentParameter::fromNumber($pk->publicExponent());
-        $key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_RSA);
-        return new self($key_type, $n, $e);
-    }
+	/**
+	 * Initialize from RSAPublicKey.
+	 *
+	 * @param RSAPublicKey $pk
+	 * @return self
+	 */
+	public static function fromRSAPublicKey(RSAPublicKey $pk): self
+	{
+		$n = ModulusParameter::fromNumber($pk->modulus());
+		$e = ExponentParameter::fromNumber($pk->publicExponent());
+		$key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_RSA);
+		return new self($key_type, $n, $e);
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @return self
-     */
-    public static function fromPEM(PEM $pem): self
-    {
-        return self::fromRSAPublicKey(RSAPublicKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem): self
+	{
+		return self::fromRSAPublicKey(RSAPublicKey::fromPEM($pem));
+	}
     
-    /**
-     * Convert JWK to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM(): PEM
-    {
-        $n = $this->modulusParameter()
-            ->number()
-            ->base10();
-        $e = $this->exponentParameter()
-            ->number()
-            ->base10();
-        $pk = new RSAPublicKey($n, $e);
-        return PublicKeyInfo::fromPublicKey($pk)->toPEM();
-    }
+	/**
+	 * Convert JWK to PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM(): PEM
+	{
+		$n = $this->modulusParameter()
+			->number()
+			->base10();
+		$e = $this->exponentParameter()
+			->number()
+			->base10();
+		$pk = new RSAPublicKey($n, $e);
+		return PublicKeyInfo::fromPublicKey($pk)->toPEM();
+	}
 }

lib/JWX/JWK/TypedJWK.php

Indentation +563 added lines, -563 removed lines

@@ -11,567 +11,567 @@
  */
 trait TypedJWK
 {
-    /**
-     * Whether parameters are present.
-     *
-     * @param string ...$names Parameter names
-     * @return bool
-     */
-    abstract public function has(string ...$names): bool;
-    
-    /**
-     * Get a parameter.
-     *
-     * @param string $name Parameter name
-     * @return JWKParameter
-     */
-    abstract public function get(string $name): JWKParameter;
-    
-    /**
-     * Check whether the algorithm parameter is present.
-     *
-     * @return bool
-     */
-    public function hasAlgorithmParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_ALG);
-    }
-    
-    /**
-     * Get the algorithm parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\AlgorithmParameter
-     */
-    public function algorithmParameter(): Parameter\AlgorithmParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_ALG),
-            Parameter\AlgorithmParameter::class);
-    }
-    
-    /**
-     * Check whether the curve parameter is present.
-     *
-     * @return bool
-     */
-    public function hasCurveParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_CRV);
-    }
-    
-    /**
-     * Get the curve parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\CurveParameter
-     */
-    public function curveParameter(): Parameter\CurveParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_CRV),
-            Parameter\CurveParameter::class);
-    }
-    
-    /**
-     * Check whether the ECC private key parameter is present.
-     *
-     * @return bool
-     */
-    public function hasECCPrivateKeyParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_ECC_D);
-    }
-    
-    /**
-     * Get the ECC private key parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\ECCPrivateKeyParameter
-     */
-    public function ECCPrivateKeyParameter(): Parameter\ECCPrivateKeyParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_ECC_D),
-            Parameter\ECCPrivateKeyParameter::class);
-    }
-    
-    /**
-     * Check whether the exponent parameter is present.
-     *
-     * @return bool
-     */
-    public function hasExponentParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_E);
-    }
-    
-    /**
-     * Get the exponent parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\ExponentParameter
-     */
-    public function exponentParameter(): Parameter\ExponentParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_E),
-            Parameter\ExponentParameter::class);
-    }
-    
-    /**
-     * Check whether the first CRT coefficient parameter is present.
-     *
-     * @return bool
-     */
-    public function hasFirstCRTCoefficientParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_QI);
-    }
-    
-    /**
-     * Get the first CRT coefficient parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\FirstCRTCoefficientParameter
-     */
-    public function firstCRTCoefficientParameter(): Parameter\FirstCRTCoefficientParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_QI),
-            Parameter\FirstCRTCoefficientParameter::class);
-    }
-    
-    /**
-     * Check whether the first factor CRT exponent parameter is present.
-     *
-     * @return bool
-     */
-    public function hasFirstFactorCRTExponentParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_DP);
-    }
-    
-    /**
-     * Get the first factor CRT exponent parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\FirstFactorCRTExponentParameter
-     */
-    public function firstFactorCRTExponentParameter(): Parameter\FirstFactorCRTExponentParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_DP),
-            Parameter\FirstFactorCRTExponentParameter::class);
-    }
-    
-    /**
-     * Check whether the first prime factor parameter is present.
-     *
-     * @return bool
-     */
-    public function hasFirstPrimeFactorParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_P);
-    }
-    
-    /**
-     * Get the first prime factor parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\FirstPrimeFactorParameter
-     */
-    public function firstPrimeFactorParameter(): Parameter\FirstPrimeFactorParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_P),
-            Parameter\FirstPrimeFactorParameter::class);
-    }
-    
-    /**
-     * Check whether the key ID parameter is present.
-     *
-     * @return bool
-     */
-    public function hasKeyIDParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_KID);
-    }
-    
-    /**
-     * Get the key ID parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\KeyIDParameter
-     */
-    public function keyIDParameter(): Parameter\KeyIDParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_KID),
-            Parameter\KeyIDParameter::class);
-    }
-    
-    /**
-     * Check whether the key operations parameter is present.
-     *
-     * @return bool
-     */
-    public function hasKeyOperationsParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_KEY_OPS);
-    }
-    
-    /**
-     * Get the key operations parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\KeyOperationsParameter
-     */
-    public function keyOperationsParameter(): Parameter\KeyOperationsParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_KEY_OPS),
-            Parameter\KeyOperationsParameter::class);
-    }
-    
-    /**
-     * Check whether the key type parameter is present.
-     *
-     * @return bool
-     */
-    public function hasKeyTypeParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_KTY);
-    }
-    
-    /**
-     * Get the key type parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\KeyTypeParameter
-     */
-    public function keyTypeParameter(): Parameter\KeyTypeParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_KTY),
-            Parameter\KeyTypeParameter::class);
-    }
-    
-    /**
-     * Check whether the key value parameter is present.
-     *
-     * @return bool
-     */
-    public function hasKeyValueParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_K);
-    }
-    
-    /**
-     * Get the key value parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\KeyValueParameter
-     */
-    public function keyValueParameter(): Parameter\KeyValueParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_K),
-            Parameter\KeyValueParameter::class);
-    }
-    
-    /**
-     * Check whether the modulus parameter is present.
-     *
-     * @return bool
-     */
-    public function hasModulusParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_N);
-    }
-    
-    /**
-     * Get the modulus parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\ModulusParameter
-     */
-    public function modulusParameter(): Parameter\ModulusParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_N),
-            Parameter\ModulusParameter::class);
-    }
-    
-    /**
-     * Check whether the other primes info parameter is present.
-     *
-     * @return bool
-     */
-    public function hasOtherPrimesInfoParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_OTH);
-    }
-    
-    /**
-     * Get the other primes info parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\OtherPrimesInfoParameter
-     */
-    public function otherPrimesInfoParameter(): Parameter\OtherPrimesInfoParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_OTH),
-            Parameter\OtherPrimesInfoParameter::class);
-    }
-    
-    /**
-     * Check whether the private exponent parameter is present.
-     *
-     * @return bool
-     */
-    public function hasPrivateExponentParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_RSA_D);
-    }
-    
-    /**
-     * Get the private exponent parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\PrivateExponentParameter
-     */
-    public function privateExponentParameter(): Parameter\PrivateExponentParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_RSA_D),
-            Parameter\PrivateExponentParameter::class);
-    }
-    
-    /**
-     * Check whether the public key use parameter is present.
-     *
-     * @return bool
-     */
-    public function hasPublicKeyUseParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_USE);
-    }
-    
-    /**
-     * Get the public key use parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\PublicKeyUseParameter
-     */
-    public function publicKeyUseParameter(): Parameter\PublicKeyUseParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_USE),
-            Parameter\PublicKeyUseParameter::class);
-    }
-    
-    /**
-     * Check whether the second factor CRT exponent parameter is present.
-     *
-     * @return bool
-     */
-    public function hasSecondFactorCRTExponentParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_DQ);
-    }
-    
-    /**
-     * Get the second factor CRT exponent parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\SecondFactorCRTExponentParameter
-     */
-    public function secondFactorCRTExponentParameter(): Parameter\SecondFactorCRTExponentParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_DQ),
-            Parameter\SecondFactorCRTExponentParameter::class);
-    }
-    
-    /**
-     * Check whether the second prime factor parameter is present.
-     *
-     * @return bool
-     */
-    public function hasSecondPrimeFactorParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_Q);
-    }
-    
-    /**
-     * Get the second prime factor parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\SecondPrimeFactorParameter
-     */
-    public function secondPrimeFactorParameter(): Parameter\SecondPrimeFactorParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_Q),
-            Parameter\SecondPrimeFactorParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 certificate chain parameter is present.
-     *
-     * @return bool
-     */
-    public function hasX509CertificateChainParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_X5C);
-    }
-    
-    /**
-     * Get the X.509 certificate chain parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\X509CertificateChainParameter
-     */
-    public function X509CertificateChainParameter(): Parameter\X509CertificateChainParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_X5C),
-            Parameter\X509CertificateChainParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 certificate SHA-1 thumbprint parameter is
-     * present.
-     *
-     * @return bool
-     */
-    public function hasX509CertificateSHA1ThumbprintParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_X5T);
-    }
-    
-    /**
-     * Get the X.509 certificate SHA-1 thumbprint parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\X509CertificateSHA1ThumbprintParameter
-     */
-    public function X509CertificateSHA1ThumbprintParameter(): Parameter\X509CertificateSHA1ThumbprintParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_X5T),
-            Parameter\X509CertificateSHA1ThumbprintParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 certificate SHA-256 thumbprint parameter is
-     * present.
-     *
-     * @return bool
-     */
-    public function hasX509CertificateSHA256ThumbprintParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_X5TS256);
-    }
-    
-    /**
-     * Get the X.509 certificate SHA-256 thumbprint parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\X509CertificateSHA256ThumbprintParameter
-     */
-    public function X509CertificateSHA256ThumbprintParameter(): Parameter\X509CertificateSHA256ThumbprintParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_X5TS256),
-            Parameter\X509CertificateSHA256ThumbprintParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 URL parameter is present.
-     *
-     * @return bool
-     */
-    public function hasX509URLParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_X5U);
-    }
-    
-    /**
-     * Get the X.509 URL parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\X509URLParameter
-     */
-    public function X509URLParameter(): Parameter\X509URLParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_X5U),
-            Parameter\X509URLParameter::class);
-    }
-    
-    /**
-     * Check whether the X coordinate parameter is present.
-     *
-     * @return bool
-     */
-    public function hasXCoordinateParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_X);
-    }
-    
-    /**
-     * Get the X coordinate parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\XCoordinateParameter
-     */
-    public function XCoordinateParameter(): Parameter\XCoordinateParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_X),
-            Parameter\XCoordinateParameter::class);
-    }
-    
-    /**
-     * Check whether the Y coordinate parameter is present.
-     *
-     * @return bool
-     */
-    public function hasYCoordinateParameter(): bool
-    {
-        return $this->has(Parameter\JWKParameter::P_Y);
-    }
-    
-    /**
-     * Get the Y coordinate parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return Parameter\YCoordinateParameter
-     */
-    public function YCoordinateParameter(): Parameter\YCoordinateParameter
-    {
-        return self::_checkType($this->get(Parameter\JWKParameter::P_Y),
-            Parameter\YCoordinateParameter::class);
-    }
-    
-    /**
-     * Check that the parameter is an instance of the given class.
-     *
-     * @param Parameter\JWKParameter $param Parameter
-     * @param string $cls Class name
-     * @throws \UnexpectedValueException
-     * @return Parameter\JWKParameter
-     */
-    private static function _checkType(Parameter\JWKParameter $param, string $cls): Parameter\JWKParameter
-    {
-        if (!$param instanceof $cls) {
-            throw new \UnexpectedValueException(
-                "$cls expected, got " . get_class($param));
-        }
-        return $param;
-    }
+	/**
+	 * Whether parameters are present.
+	 *
+	 * @param string ...$names Parameter names
+	 * @return bool
+	 */
+	abstract public function has(string ...$names): bool;
+    
+	/**
+	 * Get a parameter.
+	 *
+	 * @param string $name Parameter name
+	 * @return JWKParameter
+	 */
+	abstract public function get(string $name): JWKParameter;
+    
+	/**
+	 * Check whether the algorithm parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAlgorithmParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_ALG);
+	}
+    
+	/**
+	 * Get the algorithm parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\AlgorithmParameter
+	 */
+	public function algorithmParameter(): Parameter\AlgorithmParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_ALG),
+			Parameter\AlgorithmParameter::class);
+	}
+    
+	/**
+	 * Check whether the curve parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCurveParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_CRV);
+	}
+    
+	/**
+	 * Get the curve parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\CurveParameter
+	 */
+	public function curveParameter(): Parameter\CurveParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_CRV),
+			Parameter\CurveParameter::class);
+	}
+    
+	/**
+	 * Check whether the ECC private key parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasECCPrivateKeyParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_ECC_D);
+	}
+    
+	/**
+	 * Get the ECC private key parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\ECCPrivateKeyParameter
+	 */
+	public function ECCPrivateKeyParameter(): Parameter\ECCPrivateKeyParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_ECC_D),
+			Parameter\ECCPrivateKeyParameter::class);
+	}
+    
+	/**
+	 * Check whether the exponent parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasExponentParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_E);
+	}
+    
+	/**
+	 * Get the exponent parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\ExponentParameter
+	 */
+	public function exponentParameter(): Parameter\ExponentParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_E),
+			Parameter\ExponentParameter::class);
+	}
+    
+	/**
+	 * Check whether the first CRT coefficient parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasFirstCRTCoefficientParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_QI);
+	}
+    
+	/**
+	 * Get the first CRT coefficient parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\FirstCRTCoefficientParameter
+	 */
+	public function firstCRTCoefficientParameter(): Parameter\FirstCRTCoefficientParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_QI),
+			Parameter\FirstCRTCoefficientParameter::class);
+	}
+    
+	/**
+	 * Check whether the first factor CRT exponent parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasFirstFactorCRTExponentParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_DP);
+	}
+    
+	/**
+	 * Get the first factor CRT exponent parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\FirstFactorCRTExponentParameter
+	 */
+	public function firstFactorCRTExponentParameter(): Parameter\FirstFactorCRTExponentParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_DP),
+			Parameter\FirstFactorCRTExponentParameter::class);
+	}
+    
+	/**
+	 * Check whether the first prime factor parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasFirstPrimeFactorParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_P);
+	}
+    
+	/**
+	 * Get the first prime factor parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\FirstPrimeFactorParameter
+	 */
+	public function firstPrimeFactorParameter(): Parameter\FirstPrimeFactorParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_P),
+			Parameter\FirstPrimeFactorParameter::class);
+	}
+    
+	/**
+	 * Check whether the key ID parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyIDParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_KID);
+	}
+    
+	/**
+	 * Get the key ID parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\KeyIDParameter
+	 */
+	public function keyIDParameter(): Parameter\KeyIDParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_KID),
+			Parameter\KeyIDParameter::class);
+	}
+    
+	/**
+	 * Check whether the key operations parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyOperationsParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_KEY_OPS);
+	}
+    
+	/**
+	 * Get the key operations parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\KeyOperationsParameter
+	 */
+	public function keyOperationsParameter(): Parameter\KeyOperationsParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_KEY_OPS),
+			Parameter\KeyOperationsParameter::class);
+	}
+    
+	/**
+	 * Check whether the key type parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyTypeParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_KTY);
+	}
+    
+	/**
+	 * Get the key type parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\KeyTypeParameter
+	 */
+	public function keyTypeParameter(): Parameter\KeyTypeParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_KTY),
+			Parameter\KeyTypeParameter::class);
+	}
+    
+	/**
+	 * Check whether the key value parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyValueParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_K);
+	}
+    
+	/**
+	 * Get the key value parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\KeyValueParameter
+	 */
+	public function keyValueParameter(): Parameter\KeyValueParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_K),
+			Parameter\KeyValueParameter::class);
+	}
+    
+	/**
+	 * Check whether the modulus parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasModulusParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_N);
+	}
+    
+	/**
+	 * Get the modulus parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\ModulusParameter
+	 */
+	public function modulusParameter(): Parameter\ModulusParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_N),
+			Parameter\ModulusParameter::class);
+	}
+    
+	/**
+	 * Check whether the other primes info parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasOtherPrimesInfoParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_OTH);
+	}
+    
+	/**
+	 * Get the other primes info parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\OtherPrimesInfoParameter
+	 */
+	public function otherPrimesInfoParameter(): Parameter\OtherPrimesInfoParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_OTH),
+			Parameter\OtherPrimesInfoParameter::class);
+	}
+    
+	/**
+	 * Check whether the private exponent parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPrivateExponentParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_RSA_D);
+	}
+    
+	/**
+	 * Get the private exponent parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\PrivateExponentParameter
+	 */
+	public function privateExponentParameter(): Parameter\PrivateExponentParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_RSA_D),
+			Parameter\PrivateExponentParameter::class);
+	}
+    
+	/**
+	 * Check whether the public key use parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPublicKeyUseParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_USE);
+	}
+    
+	/**
+	 * Get the public key use parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\PublicKeyUseParameter
+	 */
+	public function publicKeyUseParameter(): Parameter\PublicKeyUseParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_USE),
+			Parameter\PublicKeyUseParameter::class);
+	}
+    
+	/**
+	 * Check whether the second factor CRT exponent parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasSecondFactorCRTExponentParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_DQ);
+	}
+    
+	/**
+	 * Get the second factor CRT exponent parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\SecondFactorCRTExponentParameter
+	 */
+	public function secondFactorCRTExponentParameter(): Parameter\SecondFactorCRTExponentParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_DQ),
+			Parameter\SecondFactorCRTExponentParameter::class);
+	}
+    
+	/**
+	 * Check whether the second prime factor parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasSecondPrimeFactorParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_Q);
+	}
+    
+	/**
+	 * Get the second prime factor parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\SecondPrimeFactorParameter
+	 */
+	public function secondPrimeFactorParameter(): Parameter\SecondPrimeFactorParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_Q),
+			Parameter\SecondPrimeFactorParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 certificate chain parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509CertificateChainParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_X5C);
+	}
+    
+	/**
+	 * Get the X.509 certificate chain parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\X509CertificateChainParameter
+	 */
+	public function X509CertificateChainParameter(): Parameter\X509CertificateChainParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_X5C),
+			Parameter\X509CertificateChainParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 certificate SHA-1 thumbprint parameter is
+	 * present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509CertificateSHA1ThumbprintParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_X5T);
+	}
+    
+	/**
+	 * Get the X.509 certificate SHA-1 thumbprint parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\X509CertificateSHA1ThumbprintParameter
+	 */
+	public function X509CertificateSHA1ThumbprintParameter(): Parameter\X509CertificateSHA1ThumbprintParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_X5T),
+			Parameter\X509CertificateSHA1ThumbprintParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 certificate SHA-256 thumbprint parameter is
+	 * present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509CertificateSHA256ThumbprintParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_X5TS256);
+	}
+    
+	/**
+	 * Get the X.509 certificate SHA-256 thumbprint parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\X509CertificateSHA256ThumbprintParameter
+	 */
+	public function X509CertificateSHA256ThumbprintParameter(): Parameter\X509CertificateSHA256ThumbprintParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_X5TS256),
+			Parameter\X509CertificateSHA256ThumbprintParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 URL parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509URLParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_X5U);
+	}
+    
+	/**
+	 * Get the X.509 URL parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\X509URLParameter
+	 */
+	public function X509URLParameter(): Parameter\X509URLParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_X5U),
+			Parameter\X509URLParameter::class);
+	}
+    
+	/**
+	 * Check whether the X coordinate parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasXCoordinateParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_X);
+	}
+    
+	/**
+	 * Get the X coordinate parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\XCoordinateParameter
+	 */
+	public function XCoordinateParameter(): Parameter\XCoordinateParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_X),
+			Parameter\XCoordinateParameter::class);
+	}
+    
+	/**
+	 * Check whether the Y coordinate parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasYCoordinateParameter(): bool
+	{
+		return $this->has(Parameter\JWKParameter::P_Y);
+	}
+    
+	/**
+	 * Get the Y coordinate parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return Parameter\YCoordinateParameter
+	 */
+	public function YCoordinateParameter(): Parameter\YCoordinateParameter
+	{
+		return self::_checkType($this->get(Parameter\JWKParameter::P_Y),
+			Parameter\YCoordinateParameter::class);
+	}
+    
+	/**
+	 * Check that the parameter is an instance of the given class.
+	 *
+	 * @param Parameter\JWKParameter $param Parameter
+	 * @param string $cls Class name
+	 * @throws \UnexpectedValueException
+	 * @return Parameter\JWKParameter
+	 */
+	private static function _checkType(Parameter\JWKParameter $param, string $cls): Parameter\JWKParameter
+	{
+		if (!$param instanceof $cls) {
+			throw new \UnexpectedValueException(
+				"$cls expected, got " . get_class($param));
+		}
+		return $param;
+	}
 }

lib/JWX/JWK/Symmetric/SymmetricKeyJWK.php

Indentation +53 added lines, -53 removed lines

@@ -17,60 +17,60 @@
  */
 class SymmetricKeyJWK extends JWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = array(
-        /* @formatter:off */
-        JWKParameter::PARAM_KEY_TYPE, 
-        JWKParameter::PARAM_KEY_VALUE
-        /* @formatter:on */
-    );
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = array(
+		/* @formatter:off */
+		JWKParameter::PARAM_KEY_TYPE, 
+		JWKParameter::PARAM_KEY_VALUE
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     * @throws \UnexpectedValueException If missing required parameter
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        parent::__construct(...$params);
-        foreach (self::MANAGED_PARAMS as $name) {
-            if (!$this->has($name)) {
-                throw new \UnexpectedValueException("Missing '$name' parameter.");
-            }
-        }
-        if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_OCT) {
-            throw new \UnexpectedValueException("Invalid key type.");
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 * @throws \UnexpectedValueException If missing required parameter
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		parent::__construct(...$params);
+		foreach (self::MANAGED_PARAMS as $name) {
+			if (!$this->has($name)) {
+				throw new \UnexpectedValueException("Missing '$name' parameter.");
+			}
+		}
+		if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_OCT) {
+			throw new \UnexpectedValueException("Invalid key type.");
+		}
+	}
     
-    /**
-     * Initialize from a key string.
-     *
-     * @param string $key Symmetric key
-     * @param JWKParameter ...$params Optional additional parameters
-     * @return self
-     */
-    public static function fromKey(string $key, JWKParameter ...$params): self
-    {
-        $params[] = new KeyTypeParameter(KeyTypeParameter::TYPE_OCT);
-        $params[] = KeyValueParameter::fromString($key);
-        return new self(...$params);
-    }
+	/**
+	 * Initialize from a key string.
+	 *
+	 * @param string $key Symmetric key
+	 * @param JWKParameter ...$params Optional additional parameters
+	 * @return self
+	 */
+	public static function fromKey(string $key, JWKParameter ...$params): self
+	{
+		$params[] = new KeyTypeParameter(KeyTypeParameter::TYPE_OCT);
+		$params[] = KeyValueParameter::fromString($key);
+		return new self(...$params);
+	}
     
-    /**
-     * Get the symmetric key.
-     *
-     * @return string
-     */
-    public function key(): string
-    {
-        return Base64::urlDecode($this->keyValueParameter()->value());
-    }
+	/**
+	 * Get the symmetric key.
+	 *
+	 * @return string
+	 */
+	public function key(): string
+	{
+		return Base64::urlDecode($this->keyValueParameter()->value());
+	}
 }

lib/JWX/JWK/EC/ECPrivateKeyJWK.php

Indentation +98 added lines, -98 removed lines

@@ -26,107 +26,107 @@
  */
 class ECPrivateKeyJWK extends PrivateKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = array(
-        /* @formatter:off */
-        JWKParameter::PARAM_KEY_TYPE, 
-        JWKParameter::PARAM_CURVE, 
-        JWKParameter::PARAM_X_COORDINATE, 
-        JWKParameter::PARAM_ECC_PRIVATE_KEY
-        /* @formatter:on */
-    );
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = array(
+		/* @formatter:off */
+		JWKParameter::PARAM_KEY_TYPE, 
+		JWKParameter::PARAM_CURVE, 
+		JWKParameter::PARAM_X_COORDINATE, 
+		JWKParameter::PARAM_ECC_PRIVATE_KEY
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     * @throws \UnexpectedValueException If missing required parameter
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        parent::__construct(...$params);
-        foreach (self::MANAGED_PARAMS as $name) {
-            if (!$this->has($name)) {
-                throw new \UnexpectedValueException("Missing '$name' parameter.");
-            }
-        }
-        if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_EC) {
-            throw new \UnexpectedValueException("Invalid key type.");
-        }
-        // cast ECC private key parameter to correct class
-        $key = JWKParameter::PARAM_ECC_PRIVATE_KEY;
-        $this->_parameters[$key] = new ECCPrivateKeyParameter(
-            $this->_parameters[$key]->value());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 * @throws \UnexpectedValueException If missing required parameter
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		parent::__construct(...$params);
+		foreach (self::MANAGED_PARAMS as $name) {
+			if (!$this->has($name)) {
+				throw new \UnexpectedValueException("Missing '$name' parameter.");
+			}
+		}
+		if ($this->keyTypeParameter()->value() != KeyTypeParameter::TYPE_EC) {
+			throw new \UnexpectedValueException("Invalid key type.");
+		}
+		// cast ECC private key parameter to correct class
+		$key = JWKParameter::PARAM_ECC_PRIVATE_KEY;
+		$this->_parameters[$key] = new ECCPrivateKeyParameter(
+			$this->_parameters[$key]->value());
+	}
     
-    /**
-     * Initialize from ECPrivateKey.
-     *
-     * @param ECPrivateKey $pk
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromECPrivateKey(ECPrivateKey $pk): self
-    {
-        if (!$pk->hasNamedCurve()) {
-            throw new \UnexpectedValueException("No curve name.");
-        }
-        $curve = CurveParameter::fromOID($pk->namedCurve());
-        $pubkey = $pk->publicKey();
-        list($x, $y) = $pubkey->curvePointOctets();
-        $xcoord = XCoordinateParameter::fromString($x);
-        $ycoord = YCoordinateParameter::fromString($y);
-        $priv = ECCPrivateKeyParameter::fromString($pk->privateKeyOctets());
-        $key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_EC);
-        return new self($key_type, $curve, $xcoord, $ycoord, $priv);
-    }
+	/**
+	 * Initialize from ECPrivateKey.
+	 *
+	 * @param ECPrivateKey $pk
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromECPrivateKey(ECPrivateKey $pk): self
+	{
+		if (!$pk->hasNamedCurve()) {
+			throw new \UnexpectedValueException("No curve name.");
+		}
+		$curve = CurveParameter::fromOID($pk->namedCurve());
+		$pubkey = $pk->publicKey();
+		list($x, $y) = $pubkey->curvePointOctets();
+		$xcoord = XCoordinateParameter::fromString($x);
+		$ycoord = YCoordinateParameter::fromString($y);
+		$priv = ECCPrivateKeyParameter::fromString($pk->privateKeyOctets());
+		$key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_EC);
+		return new self($key_type, $curve, $xcoord, $ycoord, $priv);
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @return self
-     */
-    public static function fromPEM(PEM $pem): self
-    {
-        return self::fromECPrivateKey(ECPrivateKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem): self
+	{
+		return self::fromECPrivateKey(ECPrivateKey::fromPEM($pem));
+	}
     
-    /**
-     * Get the public key component of the EC private key.
-     *
-     * @return ECPublicKeyJWK
-     */
-    public function publicKey(): PublicKeyJWK
-    {
-        $kty = $this->keyTypeParameter();
-        $curve = $this->curveParameter();
-        $xcoord = $this->XCoordinateParameter();
-        $ycoord = $this->YCoordinateParameter();
-        return new ECPublicKeyJWK($kty, $curve, $xcoord, $ycoord);
-    }
+	/**
+	 * Get the public key component of the EC private key.
+	 *
+	 * @return ECPublicKeyJWK
+	 */
+	public function publicKey(): PublicKeyJWK
+	{
+		$kty = $this->keyTypeParameter();
+		$curve = $this->curveParameter();
+		$xcoord = $this->XCoordinateParameter();
+		$ycoord = $this->YCoordinateParameter();
+		return new ECPublicKeyJWK($kty, $curve, $xcoord, $ycoord);
+	}
     
-    /**
-     * Convert EC private key to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM(): PEM
-    {
-        $curve_oid = CurveParameter::nameToOID($this->curveParameter()->value());
-        $x = ECConversion::octetsToNumber(
-            $this->XCoordinateParameter()->coordinateOctets());
-        $y = ECConversion::octetsToNumber(
-            $this->YCoordinateParameter()->coordinateOctets());
-        $pubkey = ECPublicKey::fromCoordinates($x, $y, $curve_oid);
-        $priv = $this->ECCPrivateKeyParameter()->privateKeyOctets();
-        $ec = new ECPrivateKey($priv, $curve_oid, $pubkey->ECPoint());
-        return $ec->privateKeyInfo()->toPEM();
-    }
+	/**
+	 * Convert EC private key to PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM(): PEM
+	{
+		$curve_oid = CurveParameter::nameToOID($this->curveParameter()->value());
+		$x = ECConversion::octetsToNumber(
+			$this->XCoordinateParameter()->coordinateOctets());
+		$y = ECConversion::octetsToNumber(
+			$this->YCoordinateParameter()->coordinateOctets());
+		$pubkey = ECPublicKey::fromCoordinates($x, $y, $curve_oid);
+		$priv = $this->ECCPrivateKeyParameter()->privateKeyOctets();
+		$ec = new ECPrivateKey($priv, $curve_oid, $pubkey->ECPoint());
+		return $ec->privateKeyInfo()->toPEM();
+	}
 }