sop / jwx

lib/JWX/JWE/KeyAlgorithm/RSAESOAEPAlgorithm.php

Indentation +16 added lines, -16 removed lines

@@ -11,21 +11,21 @@
  */
 class RSAESOAEPAlgorithm extends RSAESKeyAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _paddingScheme()
-    {
-        return OPENSSL_PKCS1_OAEP_PADDING;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _paddingScheme()
+	{
+		return OPENSSL_PKCS1_OAEP_PADDING;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue()
-    {
-        return JWA::ALGO_RSA_OAEP;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue()
+	{
+		return JWA::ALGO_RSA_OAEP;
+	}
 }

lib/JWX/JWE/ContentEncryptionAlgorithm.php

Indentation +35 added lines, -35 removed lines

@@ -9,43 +9,43 @@
  * Interface for algorithms that may be used to encrypt and decrypt JWE payload.
  */
 interface ContentEncryptionAlgorithm extends 
-    EncryptionAlgorithmParameterValue,
-    HeaderParameters
+	EncryptionAlgorithmParameterValue,
+	HeaderParameters
 {
-    /**
-     * Encrypt plaintext.
-     *
-     * @param string $plaintext Data to encrypt
-     * @param string $key Encryption key
-     * @param string $iv Initialization vector
-     * @param string $aad Additional authenticated data
-     * @return array Tuple of ciphertext and authentication tag
-     */
-    public function encrypt($plaintext, $key, $iv, $aad);
+	/**
+	 * Encrypt plaintext.
+	 *
+	 * @param string $plaintext Data to encrypt
+	 * @param string $key Encryption key
+	 * @param string $iv Initialization vector
+	 * @param string $aad Additional authenticated data
+	 * @return array Tuple of ciphertext and authentication tag
+	 */
+	public function encrypt($plaintext, $key, $iv, $aad);
     
-    /**
-     * Decrypt ciphertext.
-     *
-     * @param string $ciphertext Data to decrypt
-     * @param string $key Encryption key
-     * @param string $iv Initialization vector
-     * @param string $aad Additional authenticated data
-     * @param string $auth_tag Authentication tag to compare
-     * @return string Plaintext
-     */
-    public function decrypt($ciphertext, $key, $iv, $aad, $auth_tag);
+	/**
+	 * Decrypt ciphertext.
+	 *
+	 * @param string $ciphertext Data to decrypt
+	 * @param string $key Encryption key
+	 * @param string $iv Initialization vector
+	 * @param string $aad Additional authenticated data
+	 * @param string $auth_tag Authentication tag to compare
+	 * @return string Plaintext
+	 */
+	public function decrypt($ciphertext, $key, $iv, $aad, $auth_tag);
     
-    /**
-     * Get the required key size in bytes.
-     *
-     * @return int
-     */
-    public function keySize();
+	/**
+	 * Get the required key size in bytes.
+	 *
+	 * @return int
+	 */
+	public function keySize();
     
-    /**
-     * Get the required IV size in bytes.
-     *
-     * @return int
-     */
-    public function ivSize();
+	/**
+	 * Get the required IV size in bytes.
+	 *
+	 * @return int
+	 */
+	public function ivSize();
 }

lib/JWX/JWE/KeyManagementAlgorithm.php

Indentation +109 added lines, -109 removed lines

@@ -14,122 +14,122 @@
  * algorithms.
  */
 abstract class KeyManagementAlgorithm implements 
-    AlgorithmParameterValue,
-    HeaderParameters
+	AlgorithmParameterValue,
+	HeaderParameters
 {
-    /**
-     * ID of the key used by the algorithm.
-     *
-     * If set, KeyID parameter shall be automatically inserted into JWE's
-     * header.
-     *
-     * @var string|null $_keyID
-     */
-    protected $_keyID;
+	/**
+	 * ID of the key used by the algorithm.
+	 *
+	 * If set, KeyID parameter shall be automatically inserted into JWE's
+	 * header.
+	 *
+	 * @var string|null $_keyID
+	 */
+	protected $_keyID;
     
-    /**
-     * Encrypt a key.
-     *
-     * @param string $key Key to be encrypted
-     * @param Header $header Reference to the Header variable, that shall
-     *        be updated to contain parameters specific to the encryption
-     * @return string Ciphertext
-     */
-    abstract protected function _encryptKey($key, Header &$header);
+	/**
+	 * Encrypt a key.
+	 *
+	 * @param string $key Key to be encrypted
+	 * @param Header $header Reference to the Header variable, that shall
+	 *        be updated to contain parameters specific to the encryption
+	 * @return string Ciphertext
+	 */
+	abstract protected function _encryptKey($key, Header &$header);
     
-    /**
-     * Decrypt a key.
-     *
-     * @param string $ciphertext Ciphertext of the encrypted key
-     * @param Header $header Header possibly containing encoding specific
-     *        parameters
-     * @return string Plaintext key
-     */
-    abstract protected function _decryptKey($ciphertext, Header $header);
+	/**
+	 * Decrypt a key.
+	 *
+	 * @param string $ciphertext Ciphertext of the encrypted key
+	 * @param Header $header Header possibly containing encoding specific
+	 *        parameters
+	 * @return string Plaintext key
+	 */
+	abstract protected function _decryptKey($ciphertext, Header $header);
     
-    /**
-     * Encrypt a key to be inserted into JWE header.
-     *
-     * @param string $cek Content encryption key
-     * @param Header|null $header Optional reference to the Header variable,
-     *        which may be updated to contain parameters specific to this
-     *        encrypt invocation. If the variable is referenced, but is a null,
-     *        it shall be initialized to an empty Header.
-     * @throws \RuntimeException For generic errors
-     * @return string Encrypted key
-     */
-    final public function encrypt($cek, Header &$header = null)
-    {
-        if (!isset($header)) {
-            $header = new Header();
-        }
-        return $this->_encryptKey($cek, $header);
-    }
+	/**
+	 * Encrypt a key to be inserted into JWE header.
+	 *
+	 * @param string $cek Content encryption key
+	 * @param Header|null $header Optional reference to the Header variable,
+	 *        which may be updated to contain parameters specific to this
+	 *        encrypt invocation. If the variable is referenced, but is a null,
+	 *        it shall be initialized to an empty Header.
+	 * @throws \RuntimeException For generic errors
+	 * @return string Encrypted key
+	 */
+	final public function encrypt($cek, Header &$header = null)
+	{
+		if (!isset($header)) {
+			$header = new Header();
+		}
+		return $this->_encryptKey($cek, $header);
+	}
     
-    /**
-     * Decrypt a CEK from the encrypted data.
-     *
-     * @param string $data Encrypted key
-     * @param Header|null Optional header containing parameters required to
-     *        decrypt the key.
-     * @throws \RuntimeException For generic errors
-     * @return string Content encryption key
-     */
-    final public function decrypt($data, Header $header = null)
-    {
-        if (!isset($header)) {
-            $header = new Header();
-        }
-        return $this->_decryptKey($data, $header);
-    }
+	/**
+	 * Decrypt a CEK from the encrypted data.
+	 *
+	 * @param string $data Encrypted key
+	 * @param Header|null Optional header containing parameters required to
+	 *        decrypt the key.
+	 * @throws \RuntimeException For generic errors
+	 * @return string Content encryption key
+	 */
+	final public function decrypt($data, Header $header = null)
+	{
+		if (!isset($header)) {
+			$header = new Header();
+		}
+		return $this->_decryptKey($data, $header);
+	}
     
-    /**
-     * Get content encryption key for the encryption.
-     *
-     * Returned key may be random depending on the key management algorithm.
-     *
-     * @param int $length Required key size in bytes
-     * @return string
-     */
-    abstract public function cekForEncryption($length);
+	/**
+	 * Get content encryption key for the encryption.
+	 *
+	 * Returned key may be random depending on the key management algorithm.
+	 *
+	 * @param int $length Required key size in bytes
+	 * @return string
+	 */
+	abstract public function cekForEncryption($length);
     
-    /**
-     * Initialize key management algorithm from a JWK and a header.
-     *
-     * @param JWK $jwk
-     * @param Header $header
-     * @return KeyManagementAlgorithm
-     */
-    public static function fromJWK(JWK $jwk, Header $header)
-    {
-        $factory = new KeyAlgorithmFactory($header);
-        return $factory->algoByKey($jwk);
-    }
+	/**
+	 * Initialize key management algorithm from a JWK and a header.
+	 *
+	 * @param JWK $jwk
+	 * @param Header $header
+	 * @return KeyManagementAlgorithm
+	 */
+	public static function fromJWK(JWK $jwk, Header $header)
+	{
+		$factory = new KeyAlgorithmFactory($header);
+		return $factory->algoByKey($jwk);
+	}
     
-    /**
-     * Get self with key ID.
-     *
-     * @param string|null $id Key ID or null to remove
-     * @return self
-     */
-    public function withKeyID($id)
-    {
-        $obj = clone $this;
-        $obj->_keyID = $id;
-        return $obj;
-    }
+	/**
+	 * Get self with key ID.
+	 *
+	 * @param string|null $id Key ID or null to remove
+	 * @return self
+	 */
+	public function withKeyID($id)
+	{
+		$obj = clone $this;
+		$obj->_keyID = $id;
+		return $obj;
+	}
     
-    /**
-     *
-     * @see \JWX\JWT\Header\HeaderParameters::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters()
-    {
-        $params = array();
-        if (isset($this->_keyID)) {
-            $params[] = new KeyIDParameter($this->_keyID);
-        }
-        return $params;
-    }
+	/**
+	 *
+	 * @see \JWX\JWT\Header\HeaderParameters::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters()
+	{
+		$params = array();
+		if (isset($this->_keyID)) {
+			$params[] = new KeyIDParameter($this->_keyID);
+		}
+		return $params;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
      *        be updated to contain parameters specific to the encryption
      * @return string Ciphertext
      */
-    abstract protected function _encryptKey($key, Header &$header);
+    abstract protected function _encryptKey($key, Header&$header);
     
     /**
      * Decrypt a key.
@@ -58,7 +58,7 @@ 
      * @throws \RuntimeException For generic errors
      * @return string Encrypted key
      */
-    final public function encrypt($cek, Header &$header = null)
+    final public function encrypt($cek, Header&$header = null)
     {
         if (!isset($header)) {
             $header = new Header();

lib/JWX/JWK/RSA/RSAPublicKeyJWK.php

Indentation +71 added lines, -71 removed lines

@@ -20,79 +20,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)
-    {
-        $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)
+	{
+		$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)
-    {
-        return self::fromRSAPublicKey(RSAPublicKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem)
+	{
+		return self::fromRSAPublicKey(RSAPublicKey::fromPEM($pem));
+	}
     
-    /**
-     * Convert JWK to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM()
-    {
-        $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()
+	{
+		$n = $this->modulusParameter()
+			->number()
+			->base10();
+		$e = $this->exponentParameter()
+			->number()
+			->base10();
+		$pk = new RSAPublicKey($n, $e);
+		return PublicKeyInfo::fromPublicKey($pk)->toPEM();
+	}
 }

lib/JWX/JWK/RSA/RSAPrivateKeyJWK.php

Indentation +117 added lines, -117 removed lines

@@ -26,126 +26,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)
-    {
-        $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)
+	{
+		$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)
-    {
-        return self::fromRSAPrivateKey(RSAPrivateKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem)
+	{
+		return self::fromRSAPrivateKey(RSAPrivateKey::fromPEM($pem));
+	}
     
-    /**
-     * Get public key component.
-     *
-     * @return RSAPublicKeyJWK
-     */
-    public function publicKey()
-    {
-        $kty = $this->keyTypeParameter();
-        $n = $this->modulusParameter();
-        $e = $this->exponentParameter();
-        return new RSAPublicKeyJWK($kty, $n, $e);
-    }
+	/**
+	 * Get public key component.
+	 *
+	 * @return RSAPublicKeyJWK
+	 */
+	public function publicKey()
+	{
+		$kty = $this->keyTypeParameter();
+		$n = $this->modulusParameter();
+		$e = $this->exponentParameter();
+		return new RSAPublicKeyJWK($kty, $n, $e);
+	}
     
-    /**
-     * Convert JWK to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM()
-    {
-        $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()
+	{
+		$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/JWK.php

Indentation +169 added lines, -169 removed lines

@@ -12,187 +12,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)
-    {
-        $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)
+	{
+		$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($json)
-    {
-        $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($json)
+	{
+		$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)
-    {
-        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)
+	{
+		return new static(...array_values($jwk->_parameters));
+	}
     
-    /**
-     * Get self with parameters added.
-     *
-     * @param JWKParameter ...$params
-     * @return self
-     */
-    public function withParameters(JWKParameter ...$params)
-    {
-        $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)
+	{
+		$obj = clone $this;
+		foreach ($params as $param) {
+			$obj->_parameters[$param->name()] = $param;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get all parameters.
-     *
-     * @return JWKParameter[]
-     */
-    public function parameters()
-    {
-        return $this->_parameters;
-    }
+	/**
+	 * Get all parameters.
+	 *
+	 * @return JWKParameter[]
+	 */
+	public function parameters()
+	{
+		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($id)
-    {
-        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($id)
+	{
+		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(...$names)
-    {
-        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(...$names)
+	{
+		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($name)
-    {
-        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($name)
+	{
+		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()
-    {
-        $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()
+	{
+		$a = array();
+		foreach ($this->_parameters as $param) {
+			$a[$param->name()] = $param->value();
+		}
+		return $a;
+	}
     
-    /**
-     * Convert to JSON.
-     *
-     * @return string
-     */
-    public function toJSON()
-    {
-        $data = $this->toArray();
-        if (empty($data)) {
-            return "";
-        }
-        return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
-    }
+	/**
+	 * Convert to JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON()
+	{
+		$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()
-    {
-        return count($this->_parameters);
-    }
+	/**
+	 * Get the number of parameters.
+	 *
+	 * @see \Countable::count()
+	 */
+	public function count()
+	{
+		return count($this->_parameters);
+	}
     
-    /**
-     * Get iterator for the parameters.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_parameters);
-    }
+	/**
+	 * Get iterator for the parameters.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_parameters);
+	}
 }

lib/JWX/JWK/EC/ECPrivateKeyJWK.php

Indentation +98 added lines, -98 removed lines

@@ -23,107 +23,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)
-    {
-        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)
+	{
+		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)
-    {
-        return self::fromECPrivateKey(ECPrivateKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem)
+	{
+		return self::fromECPrivateKey(ECPrivateKey::fromPEM($pem));
+	}
     
-    /**
-     * Get the public key component of the EC private key.
-     *
-     * @return ECPublicKeyJWK
-     */
-    public function publicKey()
-    {
-        $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()
+	{
+		$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()
-    {
-        $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()
+	{
+		$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();
+	}
 }

lib/JWX/JWK/EC/ECPublicKeyJWK.php

Indentation +74 added lines, -74 removed lines

@@ -21,82 +21,82 @@
  */
 class ECPublicKeyJWK extends PublicKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = array(
-        /* @formatter:off */
-        JWKParameter::PARAM_KEY_TYPE, 
-        JWKParameter::PARAM_CURVE, 
-        JWKParameter::PARAM_X_COORDINATE
-        /* @formatter:on */
-    );
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = array(
+		/* @formatter:off */
+		JWKParameter::PARAM_KEY_TYPE, 
+		JWKParameter::PARAM_CURVE, 
+		JWKParameter::PARAM_X_COORDINATE
+		/* @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.");
-        }
-    }
+	/**
+	 * 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.");
+		}
+	}
     
-    /**
-     * Initialize from ECPublicKey.
-     *
-     * @param ECPublicKey $pk
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromECPublicKey(ECPublicKey $pk)
-    {
-        if (!$pk->hasNamedCurve()) {
-            throw new \UnexpectedValueException("No curve name.");
-        }
-        $curve = CurveParameter::fromOID($pk->namedCurve());
-        list($x, $y) = $pk->curvePointOctets();
-        $xcoord = XCoordinateParameter::fromString($x);
-        $ycoord = YCoordinateParameter::fromString($y);
-        $key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_EC);
-        return new self($key_type, $curve, $xcoord, $ycoord);
-    }
+	/**
+	 * Initialize from ECPublicKey.
+	 *
+	 * @param ECPublicKey $pk
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromECPublicKey(ECPublicKey $pk)
+	{
+		if (!$pk->hasNamedCurve()) {
+			throw new \UnexpectedValueException("No curve name.");
+		}
+		$curve = CurveParameter::fromOID($pk->namedCurve());
+		list($x, $y) = $pk->curvePointOctets();
+		$xcoord = XCoordinateParameter::fromString($x);
+		$ycoord = YCoordinateParameter::fromString($y);
+		$key_type = new KeyTypeParameter(KeyTypeParameter::TYPE_EC);
+		return new self($key_type, $curve, $xcoord, $ycoord);
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @return self
-     */
-    public static function fromPEM(PEM $pem)
-    {
-        return self::fromECPublicKey(ECPublicKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem)
+	{
+		return self::fromECPublicKey(ECPublicKey::fromPEM($pem));
+	}
     
-    /**
-     * Convert EC public key to PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM()
-    {
-        $curve_oid = CurveParameter::nameToOID($this->curveParameter()->value());
-        $x = ECConversion::octetsToNumber(
-            $this->XCoordinateParameter()->coordinateOctets());
-        $y = ECConversion::octetsToNumber(
-            $this->YCoordinateParameter()->coordinateOctets());
-        $ec = ECPublicKey::fromCoordinates($x, $y, $curve_oid);
-        return $ec->publicKeyInfo()->toPEM();
-    }
+	/**
+	 * Convert EC public key to PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM()
+	{
+		$curve_oid = CurveParameter::nameToOID($this->curveParameter()->value());
+		$x = ECConversion::octetsToNumber(
+			$this->XCoordinateParameter()->coordinateOctets());
+		$y = ECConversion::octetsToNumber(
+			$this->YCoordinateParameter()->coordinateOctets());
+		$ec = ECPublicKey::fromCoordinates($x, $y, $curve_oid);
+		return $ec->publicKeyInfo()->toPEM();
+	}
 }

lib/JWX/JWK/JWKSet.php

Indentation +223 added lines, -223 removed lines

@@ -11,227 +11,227 @@
  */
 class JWKSet implements \Countable, \IteratorAggregate
 {
-    /**
-     * JWK objects.
-     *
-     * @var JWK[] $_jwks
-     */
-    protected $_jwks;
-    
-    /**
-     * Additional members.
-     *
-     * @var array $_additional
-     */
-    protected $_additional;
-    
-    /**
-     * JWK mappings.
-     *
-     * @var array
-     */
-    private $_mappings = array();
-    
-    /**
-     * Constructor.
-     *
-     * @param JWK ...$jwks
-     */
-    public function __construct(JWK ...$jwks)
-    {
-        $this->_jwks = $jwks;
-        $this->_additional = array();
-    }
-    
-    /**
-     * Reset internal cache variables on clone.
-     */
-    public function __clone()
-    {
-        $this->_mappings = array();
-    }
-    
-    /**
-     * Initialize from an array representing a JSON object.
-     *
-     * @param array $members
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromArray(array $members)
-    {
-        if (!isset($members["keys"]) || !is_array($members["keys"])) {
-            throw new \UnexpectedValueException(
-                "JWK Set must have a 'keys' member.");
-        }
-        $jwks = array_map(
-            function ($jwkdata) {
-                return JWK::fromArray($jwkdata);
-            }, $members["keys"]);
-        unset($members["keys"]);
-        $obj = new self(...$jwks);
-        $obj->_additional = $members;
-        return $obj;
-    }
-    
-    /**
-     * Initialize from a JSON string.
-     *
-     * @param string $json
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromJSON($json)
-    {
-        $members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
-        if (!is_array($members)) {
-            throw new \UnexpectedValueException("Invalid JSON.");
-        }
-        return self::fromArray($members);
-    }
-    
-    /**
-     * Get self with keys added.
-     *
-     * @param JWK ...$keys JWK objects
-     * @return self
-     */
-    public function withKeys(JWK ...$keys)
-    {
-        $obj = clone $this;
-        $obj->_jwks = array_merge($obj->_jwks, $keys);
-        return $obj;
-    }
-    
-    /**
-     * Get all JWK's in a set.
-     *
-     * @return JWK[]
-     */
-    public function keys()
-    {
-        return $this->_jwks;
-    }
-    
-    /**
-     * Get the first JWK in the set.
-     *
-     * @throws \LogicException
-     * @return JWK
-     */
-    public function first()
-    {
-        if (!count($this->_jwks)) {
-            throw new \LogicException("No keys.");
-        }
-        return $this->_jwks[0];
-    }
-    
-    /**
-     * Get JWK by key ID.
-     *
-     * @param string $id
-     * @return JWK|null Null if not found
-     */
-    protected function _getKeyByID($id)
-    {
-        $map = $this->_getMapping(JWKParameter::PARAM_KEY_ID);
-        return isset($map[$id]) ? $map[$id] : null;
-    }
-    
-    /**
-     * Check whether set has a JWK with a given key ID.
-     *
-     * @param string $id
-     * @return bool
-     */
-    public function hasKeyID($id)
-    {
-        return $this->_getKeyByID($id) !== null;
-    }
-    
-    /**
-     * Get a JWK by a key ID.
-     *
-     * @param string $id
-     * @throws \LogicException
-     * @return JWK
-     */
-    public function keyByID($id)
-    {
-        $jwk = $this->_getKeyByID($id);
-        if (!$jwk) {
-            throw new \LogicException("No key ID $id.");
-        }
-        return $jwk;
-    }
-    
-    /**
-     * Get mapping from parameter values of given parameter name to JWK.
-     *
-     * Later duplicate value shall override earlier JWK.
-     *
-     * @param string $name Parameter name
-     * @return array
-     */
-    protected function _getMapping($name)
-    {
-        if (!isset($this->_mappings[$name])) {
-            $mapping = array();
-            foreach ($this->_jwks as $jwk) {
-                if ($jwk->has($name)) {
-                    $key = (string) $jwk->get($name)->value();
-                    $mapping[$key] = $jwk;
-                }
-            }
-            $this->_mappings[$name] = $mapping;
-        }
-        return $this->_mappings[$name];
-    }
-    
-    /**
-     * Convert to array.
-     *
-     * @return array
-     */
-    public function toArray()
-    {
-        $data = $this->_additional;
-        $data["keys"] = array_map(
-            function (JWK $jwk) {
-                return $jwk->toArray();
-            }, $this->_jwks);
-        return $data;
-    }
-    
-    /**
-     * Convert to JSON.
-     *
-     * @return string
-     */
-    public function toJSON()
-    {
-        return json_encode((object) $this->toArray(), JSON_UNESCAPED_SLASHES);
-    }
-    
-    /**
-     * Get the number of keys.
-     *
-     * @see \Countable::count()
-     */
-    public function count()
-    {
-        return count($this->_jwks);
-    }
-    
-    /**
-     * Get iterator for JWK objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_jwks);
-    }
+	/**
+	 * JWK objects.
+	 *
+	 * @var JWK[] $_jwks
+	 */
+	protected $_jwks;
+    
+	/**
+	 * Additional members.
+	 *
+	 * @var array $_additional
+	 */
+	protected $_additional;
+    
+	/**
+	 * JWK mappings.
+	 *
+	 * @var array
+	 */
+	private $_mappings = array();
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param JWK ...$jwks
+	 */
+	public function __construct(JWK ...$jwks)
+	{
+		$this->_jwks = $jwks;
+		$this->_additional = array();
+	}
+    
+	/**
+	 * Reset internal cache variables on clone.
+	 */
+	public function __clone()
+	{
+		$this->_mappings = array();
+	}
+    
+	/**
+	 * Initialize from an array representing a JSON object.
+	 *
+	 * @param array $members
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromArray(array $members)
+	{
+		if (!isset($members["keys"]) || !is_array($members["keys"])) {
+			throw new \UnexpectedValueException(
+				"JWK Set must have a 'keys' member.");
+		}
+		$jwks = array_map(
+			function ($jwkdata) {
+				return JWK::fromArray($jwkdata);
+			}, $members["keys"]);
+		unset($members["keys"]);
+		$obj = new self(...$jwks);
+		$obj->_additional = $members;
+		return $obj;
+	}
+    
+	/**
+	 * Initialize from a JSON string.
+	 *
+	 * @param string $json
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromJSON($json)
+	{
+		$members = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
+		if (!is_array($members)) {
+			throw new \UnexpectedValueException("Invalid JSON.");
+		}
+		return self::fromArray($members);
+	}
+    
+	/**
+	 * Get self with keys added.
+	 *
+	 * @param JWK ...$keys JWK objects
+	 * @return self
+	 */
+	public function withKeys(JWK ...$keys)
+	{
+		$obj = clone $this;
+		$obj->_jwks = array_merge($obj->_jwks, $keys);
+		return $obj;
+	}
+    
+	/**
+	 * Get all JWK's in a set.
+	 *
+	 * @return JWK[]
+	 */
+	public function keys()
+	{
+		return $this->_jwks;
+	}
+    
+	/**
+	 * Get the first JWK in the set.
+	 *
+	 * @throws \LogicException
+	 * @return JWK
+	 */
+	public function first()
+	{
+		if (!count($this->_jwks)) {
+			throw new \LogicException("No keys.");
+		}
+		return $this->_jwks[0];
+	}
+    
+	/**
+	 * Get JWK by key ID.
+	 *
+	 * @param string $id
+	 * @return JWK|null Null if not found
+	 */
+	protected function _getKeyByID($id)
+	{
+		$map = $this->_getMapping(JWKParameter::PARAM_KEY_ID);
+		return isset($map[$id]) ? $map[$id] : null;
+	}
+    
+	/**
+	 * Check whether set has a JWK with a given key ID.
+	 *
+	 * @param string $id
+	 * @return bool
+	 */
+	public function hasKeyID($id)
+	{
+		return $this->_getKeyByID($id) !== null;
+	}
+    
+	/**
+	 * Get a JWK by a key ID.
+	 *
+	 * @param string $id
+	 * @throws \LogicException
+	 * @return JWK
+	 */
+	public function keyByID($id)
+	{
+		$jwk = $this->_getKeyByID($id);
+		if (!$jwk) {
+			throw new \LogicException("No key ID $id.");
+		}
+		return $jwk;
+	}
+    
+	/**
+	 * Get mapping from parameter values of given parameter name to JWK.
+	 *
+	 * Later duplicate value shall override earlier JWK.
+	 *
+	 * @param string $name Parameter name
+	 * @return array
+	 */
+	protected function _getMapping($name)
+	{
+		if (!isset($this->_mappings[$name])) {
+			$mapping = array();
+			foreach ($this->_jwks as $jwk) {
+				if ($jwk->has($name)) {
+					$key = (string) $jwk->get($name)->value();
+					$mapping[$key] = $jwk;
+				}
+			}
+			$this->_mappings[$name] = $mapping;
+		}
+		return $this->_mappings[$name];
+	}
+    
+	/**
+	 * Convert to array.
+	 *
+	 * @return array
+	 */
+	public function toArray()
+	{
+		$data = $this->_additional;
+		$data["keys"] = array_map(
+			function (JWK $jwk) {
+				return $jwk->toArray();
+			}, $this->_jwks);
+		return $data;
+	}
+    
+	/**
+	 * Convert to JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON()
+	{
+		return json_encode((object) $this->toArray(), JSON_UNESCAPED_SLASHES);
+	}
+    
+	/**
+	 * Get the number of keys.
+	 *
+	 * @see \Countable::count()
+	 */
+	public function count()
+	{
+		return count($this->_jwks);
+	}
+    
+	/**
+	 * Get iterator for JWK objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_jwks);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
                 "JWK Set must have a 'keys' member.");
         }
         $jwks = array_map(
-            function ($jwkdata) {
+            function($jwkdata) {
                 return JWK::fromArray($jwkdata);
             }, $members["keys"]);
         unset($members["keys"]);
@@ -198,7 +198,7 @@ 
     {
         $data = $this->_additional;
         $data["keys"] = array_map(
-            function (JWK $jwk) {
+            function(JWK $jwk) {
                 return $jwk->toArray();
             }, $this->_jwks);
         return $data;