sop / jwx

lib/JWX/JWK/Symmetric/SymmetricKeyJWK.php

Indentation +54 added lines, -54 removed lines

@@ -17,61 +17,61 @@
  */
 class SymmetricKeyJWK extends JWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = [
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_KEY_VALUE,
-    ];
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = [
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_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 (KeyTypeParameter::TYPE_OCT !== $this->keyTypeParameter()->value()) {
-            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 (KeyTypeParameter::TYPE_OCT !== $this->keyTypeParameter()->value()) {
+			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/JWKSet.php

Indentation +235 added lines, -235 removed lines

@@ -13,239 +13,239 @@
  */
 class JWKSet implements \Countable, \IteratorAggregate
 {
-    /**
-     * JWK objects.
-     *
-     * @var JWK[]
-     */
-    protected $_jwks;
-
-    /**
-     * Additional members.
-     *
-     * @var array
-     */
-    protected $_additional;
-
-    /**
-     * JWK mappings.
-     *
-     * @var array
-     */
-    private $_mappings = [];
-
-    /**
-     * Constructor.
-     *
-     * @param JWK ...$jwks
-     */
-    public function __construct(JWK ...$jwks)
-    {
-        $this->_jwks = $jwks;
-        $this->_additional = [];
-    }
-
-    /**
-     * Reset internal cache variables on clone.
-     */
-    public function __clone()
-    {
-        $this->_mappings = [];
-    }
-
-    /**
-     * Initialize from an array representing a JSON object.
-     *
-     * @param array $members
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromArray(array $members): self
-    {
-        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(string $json): self
-    {
-        $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): self
-    {
-        $obj = clone $this;
-        $obj->_jwks = array_merge($obj->_jwks, $keys);
-        return $obj;
-    }
-
-    /**
-     * Get all JWK's in a set.
-     *
-     * @return JWK[]
-     */
-    public function keys(): array
-    {
-        return $this->_jwks;
-    }
-
-    /**
-     * Get the first JWK in the set.
-     *
-     * @throws \LogicException
-     *
-     * @return JWK
-     */
-    public function first(): JWK
-    {
-        if (!count($this->_jwks)) {
-            throw new \LogicException('No keys.');
-        }
-        return $this->_jwks[0];
-    }
-
-    /**
-     * Check whether set has a JWK with a given key ID.
-     *
-     * @param string $id
-     *
-     * @return bool
-     */
-    public function hasKeyID(string $id): bool
-    {
-        return null !== $this->_getKeyByID($id);
-    }
-
-    /**
-     * Get a JWK by a key ID.
-     *
-     * @param string $id
-     *
-     * @throws \LogicException
-     *
-     * @return JWK
-     */
-    public function keyByID(string $id): JWK
-    {
-        $jwk = $this->_getKeyByID($id);
-        if (!$jwk) {
-            throw new \LogicException("No key ID {$id}.");
-        }
-        return $jwk;
-    }
-
-    /**
-     * Convert to array.
-     *
-     * @return array
-     */
-    public function toArray(): array
-    {
-        $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(): string
-    {
-        return json_encode((object) $this->toArray(), JSON_UNESCAPED_SLASHES);
-    }
-
-    /**
-     * Get the number of keys.
-     *
-     * @see \Countable::count()
-     */
-    public function count(): int
-    {
-        return count($this->_jwks);
-    }
-
-    /**
-     * Get iterator for JWK objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_jwks);
-    }
-
-    /**
-     * Get JWK by key ID.
-     *
-     * @param string $id
-     *
-     * @return null|JWK Null if not found
-     */
-    protected function _getKeyByID(string $id): ?JWK
-    {
-        $map = $this->_getMapping(JWKParameter::PARAM_KEY_ID);
-        return isset($map[$id]) ? $map[$id] : null;
-    }
-
-    /**
-     * 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(string $name): array
-    {
-        if (!isset($this->_mappings[$name])) {
-            $mapping = [];
-            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];
-    }
+	/**
+	 * JWK objects.
+	 *
+	 * @var JWK[]
+	 */
+	protected $_jwks;
+
+	/**
+	 * Additional members.
+	 *
+	 * @var array
+	 */
+	protected $_additional;
+
+	/**
+	 * JWK mappings.
+	 *
+	 * @var array
+	 */
+	private $_mappings = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param JWK ...$jwks
+	 */
+	public function __construct(JWK ...$jwks)
+	{
+		$this->_jwks = $jwks;
+		$this->_additional = [];
+	}
+
+	/**
+	 * Reset internal cache variables on clone.
+	 */
+	public function __clone()
+	{
+		$this->_mappings = [];
+	}
+
+	/**
+	 * Initialize from an array representing a JSON object.
+	 *
+	 * @param array $members
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	public static function fromArray(array $members): self
+	{
+		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(string $json): self
+	{
+		$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): self
+	{
+		$obj = clone $this;
+		$obj->_jwks = array_merge($obj->_jwks, $keys);
+		return $obj;
+	}
+
+	/**
+	 * Get all JWK's in a set.
+	 *
+	 * @return JWK[]
+	 */
+	public function keys(): array
+	{
+		return $this->_jwks;
+	}
+
+	/**
+	 * Get the first JWK in the set.
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return JWK
+	 */
+	public function first(): JWK
+	{
+		if (!count($this->_jwks)) {
+			throw new \LogicException('No keys.');
+		}
+		return $this->_jwks[0];
+	}
+
+	/**
+	 * Check whether set has a JWK with a given key ID.
+	 *
+	 * @param string $id
+	 *
+	 * @return bool
+	 */
+	public function hasKeyID(string $id): bool
+	{
+		return null !== $this->_getKeyByID($id);
+	}
+
+	/**
+	 * Get a JWK by a key ID.
+	 *
+	 * @param string $id
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return JWK
+	 */
+	public function keyByID(string $id): JWK
+	{
+		$jwk = $this->_getKeyByID($id);
+		if (!$jwk) {
+			throw new \LogicException("No key ID {$id}.");
+		}
+		return $jwk;
+	}
+
+	/**
+	 * Convert to array.
+	 *
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		$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(): string
+	{
+		return json_encode((object) $this->toArray(), JSON_UNESCAPED_SLASHES);
+	}
+
+	/**
+	 * Get the number of keys.
+	 *
+	 * @see \Countable::count()
+	 */
+	public function count(): int
+	{
+		return count($this->_jwks);
+	}
+
+	/**
+	 * Get iterator for JWK objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_jwks);
+	}
+
+	/**
+	 * Get JWK by key ID.
+	 *
+	 * @param string $id
+	 *
+	 * @return null|JWK Null if not found
+	 */
+	protected function _getKeyByID(string $id): ?JWK
+	{
+		$map = $this->_getMapping(JWKParameter::PARAM_KEY_ID);
+		return isset($map[$id]) ? $map[$id] : null;
+	}
+
+	/**
+	 * 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(string $name): array
+	{
+		if (!isset($this->_mappings[$name])) {
+			$mapping = [];
+			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];
+	}
 }

lib/JWX/JWK/RSA/RSAPublicKeyJWK.php

Indentation +69 added lines, -69 removed lines

@@ -22,77 +22,77 @@
  */
 class RSAPublicKeyJWK extends PublicKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = [
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_MODULUS,
-        JWKParameter::PARAM_EXPONENT,
-    ];
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = [
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_MODULUS,
+		JWKParameter::PARAM_EXPONENT,
+	];
 
-    /**
-     * 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 (KeyTypeParameter::TYPE_RSA !== $this->keyTypeParameter()->value()) {
-            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 (KeyTypeParameter::TYPE_RSA !== $this->keyTypeParameter()->value()) {
+			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/RSA/RSAPrivateKeyJWK.php

Indentation +103 added lines, -103 removed lines

@@ -29,112 +29,112 @@
  */
 class RSAPrivateKeyJWK extends PrivateKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = [
-        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,
-    ];
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = [
+		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,
+	];
 
-    /**
-     * 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 (KeyTypeParameter::TYPE_RSA !== $this->keyTypeParameter()->value()) {
-            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 (KeyTypeParameter::TYPE_RSA !== $this->keyTypeParameter()->value()) {
+			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/Parameter/X509CertificateChainParameter.php

Indentation +16 added lines, -16 removed lines

@@ -14,21 +14,21 @@
  */
 class X509CertificateChainParameter extends JWKParameter
 {
-    use ArrayParameterValue;
+	use ArrayParameterValue;
 
-    /**
-     * Constructor.
-     *
-     * @param string ...$certs Base64 encoded DER certificates
-     */
-    public function __construct(string ...$certs)
-    {
-        foreach ($certs as $cert) {
-            if (!Base64::isValid($cert)) {
-                throw new \UnexpectedValueException(
-                    'Certificate must be base64 encoded.');
-            }
-        }
-        parent::__construct(self::PARAM_X509_CERTIFICATE_CHAIN, $certs);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string ...$certs Base64 encoded DER certificates
+	 */
+	public function __construct(string ...$certs)
+	{
+		foreach ($certs as $cert) {
+			if (!Base64::isValid($cert)) {
+				throw new \UnexpectedValueException(
+					'Certificate must be base64 encoded.');
+			}
+		}
+		parent::__construct(self::PARAM_X509_CERTIFICATE_CHAIN, $certs);
+	}
 }

lib/JWX/JWK/Parameter/KeyOperationsParameter.php

Indentation +18 added lines, -18 removed lines

@@ -13,24 +13,24 @@
  */
 class KeyOperationsParameter extends JWKParameter
 {
-    use ArrayParameterValue;
+	use ArrayParameterValue;
 
-    const OP_SIGN = 'sign';
-    const OP_VERIFY = 'verify';
-    const OP_ENCRYPT = 'encrypt';
-    const OP_DECRYPT = 'decrypt';
-    const OP_WRAP_KEY = 'wrapKey';
-    const OP_UNWRAP_KEY = 'unwrapKey';
-    const OP_DERIVE_KEY = 'deriveKey';
-    const OP_DERIVE_BITS = 'deriveBits';
+	const OP_SIGN = 'sign';
+	const OP_VERIFY = 'verify';
+	const OP_ENCRYPT = 'encrypt';
+	const OP_DECRYPT = 'decrypt';
+	const OP_WRAP_KEY = 'wrapKey';
+	const OP_UNWRAP_KEY = 'unwrapKey';
+	const OP_DERIVE_KEY = 'deriveKey';
+	const OP_DERIVE_BITS = 'deriveBits';
 
-    /**
-     * Constructor.
-     *
-     * @param string ...$ops Key operations
-     */
-    public function __construct(string ...$ops)
-    {
-        parent::__construct(self::PARAM_KEY_OPERATIONS, $ops);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string ...$ops Key operations
+	 */
+	public function __construct(string ...$ops)
+	{
+		parent::__construct(self::PARAM_KEY_OPERATIONS, $ops);
+	}
 }

lib/JWX/JWK/Parameter/PublicKeyUseParameter.php

Indentation +12 added lines, -12 removed lines

@@ -13,18 +13,18 @@
  */
 class PublicKeyUseParameter extends JWKParameter
 {
-    use StringParameterValue;
+	use StringParameterValue;
 
-    const USE_SIGNATURE = 'sig';
-    const USE_ENCRYPTION = 'enc';
+	const USE_SIGNATURE = 'sig';
+	const USE_ENCRYPTION = 'enc';
 
-    /**
-     * Constructor.
-     *
-     * @param string $use Intended use of the public key
-     */
-    public function __construct(string $use)
-    {
-        parent::__construct(self::PARAM_PUBLIC_KEY_USE, $use);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $use Intended use of the public key
+	 */
+	public function __construct(string $use)
+	{
+		parent::__construct(self::PARAM_PUBLIC_KEY_USE, $use);
+	}
 }

lib/JWX/JWK/Parameter/KeyTypeParameter.php

Indentation +26 added lines, -26 removed lines

@@ -13,30 +13,30 @@
  */
 class KeyTypeParameter extends JWKParameter
 {
-    use StringParameterValue;
-
-    /**
-     * Octet sequence key type.
-     */
-    const TYPE_OCT = 'oct';
-
-    /**
-     * RSA key type.
-     */
-    const TYPE_RSA = 'RSA';
-
-    /**
-     * Elliptic curve key type.
-     */
-    const TYPE_EC = 'EC';
-
-    /**
-     * Constructor.
-     *
-     * @param string $type Key type
-     */
-    public function __construct(string $type)
-    {
-        parent::__construct(self::PARAM_KEY_TYPE, $type);
-    }
+	use StringParameterValue;
+
+	/**
+	 * Octet sequence key type.
+	 */
+	const TYPE_OCT = 'oct';
+
+	/**
+	 * RSA key type.
+	 */
+	const TYPE_RSA = 'RSA';
+
+	/**
+	 * Elliptic curve key type.
+	 */
+	const TYPE_EC = 'EC';
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $type Key type
+	 */
+	public function __construct(string $type)
+	{
+		parent::__construct(self::PARAM_KEY_TYPE, $type);
+	}
 }

lib/JWX/JWK/Parameter/JWKParameter.php

Indentation +122 added lines, -122 removed lines

@@ -14,131 +14,131 @@
  */
 class JWKParameter extends Parameter
 {
-    // registered parameter names
-    const PARAM_KEY_TYPE = 'kty';
-    const PARAM_PUBLIC_KEY_USE = 'use';
-    const PARAM_KEY_OPERATIONS = 'key_ops';
-    const PARAM_ALGORITHM = 'alg';
-    const PARAM_KEY_ID = 'kid';
-    const PARAM_X509_URL = 'x5u';
-    const PARAM_X509_CERTIFICATE_CHAIN = 'x5c';
-    const PARAM_X509_CERTIFICATE_SHA1_THUMBPRINT = 'x5t';
-    const PARAM_X509_CERTIFICATE_SHA256_THUMBPRINT = 'x5t#S256';
-    const PARAM_CURVE = 'crv';
-    const PARAM_X_COORDINATE = 'x';
-    const PARAM_Y_COORDINATE = 'y';
-    const PARAM_ECC_PRIVATE_KEY = 'd';
-    const PARAM_MODULUS = 'n';
-    const PARAM_EXPONENT = 'e';
-    const PARAM_PRIVATE_EXPONENT = 'd';
-    const PARAM_FIRST_PRIME_FACTOR = 'p';
-    const PARAM_SECOND_PRIME_FACTOR = 'q';
-    const PARAM_FIRST_FACTOR_CRT_EXPONENT = 'dp';
-    const PARAM_SECOND_FACTOR_CRT_EXPONENT = 'dq';
-    const PARAM_FIRST_CRT_COEFFICIENT = 'qi';
-    const PARAM_OTHER_PRIMES_INFO = 'oth';
-    const PARAM_KEY_VALUE = 'k';
+	// registered parameter names
+	const PARAM_KEY_TYPE = 'kty';
+	const PARAM_PUBLIC_KEY_USE = 'use';
+	const PARAM_KEY_OPERATIONS = 'key_ops';
+	const PARAM_ALGORITHM = 'alg';
+	const PARAM_KEY_ID = 'kid';
+	const PARAM_X509_URL = 'x5u';
+	const PARAM_X509_CERTIFICATE_CHAIN = 'x5c';
+	const PARAM_X509_CERTIFICATE_SHA1_THUMBPRINT = 'x5t';
+	const PARAM_X509_CERTIFICATE_SHA256_THUMBPRINT = 'x5t#S256';
+	const PARAM_CURVE = 'crv';
+	const PARAM_X_COORDINATE = 'x';
+	const PARAM_Y_COORDINATE = 'y';
+	const PARAM_ECC_PRIVATE_KEY = 'd';
+	const PARAM_MODULUS = 'n';
+	const PARAM_EXPONENT = 'e';
+	const PARAM_PRIVATE_EXPONENT = 'd';
+	const PARAM_FIRST_PRIME_FACTOR = 'p';
+	const PARAM_SECOND_PRIME_FACTOR = 'q';
+	const PARAM_FIRST_FACTOR_CRT_EXPONENT = 'dp';
+	const PARAM_SECOND_FACTOR_CRT_EXPONENT = 'dq';
+	const PARAM_FIRST_CRT_COEFFICIENT = 'qi';
+	const PARAM_OTHER_PRIMES_INFO = 'oth';
+	const PARAM_KEY_VALUE = 'k';
 
-    // shorthand aliases for parameter names
-    const P_KTY = self::PARAM_KEY_TYPE;
-    const P_USE = self::PARAM_PUBLIC_KEY_USE;
-    const P_KEY_OPS = self::PARAM_KEY_OPERATIONS;
-    const P_ALG = self::PARAM_ALGORITHM;
-    const P_KID = self::PARAM_KEY_ID;
-    const P_X5U = self::PARAM_X509_URL;
-    const P_X5C = self::PARAM_X509_CERTIFICATE_CHAIN;
-    const P_X5T = self::PARAM_X509_CERTIFICATE_SHA1_THUMBPRINT;
-    const P_X5TS256 = self::PARAM_X509_CERTIFICATE_SHA256_THUMBPRINT;
-    const P_CRV = self::PARAM_CURVE;
-    const P_X = self::PARAM_X_COORDINATE;
-    const P_Y = self::PARAM_Y_COORDINATE;
-    const P_ECC_D = self::PARAM_ECC_PRIVATE_KEY;
-    const P_N = self::PARAM_MODULUS;
-    const P_E = self::PARAM_EXPONENT;
-    const P_RSA_D = self::PARAM_PRIVATE_EXPONENT;
-    const P_P = self::PARAM_FIRST_PRIME_FACTOR;
-    const P_Q = self::PARAM_SECOND_PRIME_FACTOR;
-    const P_DP = self::PARAM_FIRST_FACTOR_CRT_EXPONENT;
-    const P_DQ = self::PARAM_SECOND_FACTOR_CRT_EXPONENT;
-    const P_QI = self::PARAM_FIRST_CRT_COEFFICIENT;
-    const P_OTH = self::PARAM_OTHER_PRIMES_INFO;
-    const P_K = self::PARAM_KEY_VALUE;
+	// shorthand aliases for parameter names
+	const P_KTY = self::PARAM_KEY_TYPE;
+	const P_USE = self::PARAM_PUBLIC_KEY_USE;
+	const P_KEY_OPS = self::PARAM_KEY_OPERATIONS;
+	const P_ALG = self::PARAM_ALGORITHM;
+	const P_KID = self::PARAM_KEY_ID;
+	const P_X5U = self::PARAM_X509_URL;
+	const P_X5C = self::PARAM_X509_CERTIFICATE_CHAIN;
+	const P_X5T = self::PARAM_X509_CERTIFICATE_SHA1_THUMBPRINT;
+	const P_X5TS256 = self::PARAM_X509_CERTIFICATE_SHA256_THUMBPRINT;
+	const P_CRV = self::PARAM_CURVE;
+	const P_X = self::PARAM_X_COORDINATE;
+	const P_Y = self::PARAM_Y_COORDINATE;
+	const P_ECC_D = self::PARAM_ECC_PRIVATE_KEY;
+	const P_N = self::PARAM_MODULUS;
+	const P_E = self::PARAM_EXPONENT;
+	const P_RSA_D = self::PARAM_PRIVATE_EXPONENT;
+	const P_P = self::PARAM_FIRST_PRIME_FACTOR;
+	const P_Q = self::PARAM_SECOND_PRIME_FACTOR;
+	const P_DP = self::PARAM_FIRST_FACTOR_CRT_EXPONENT;
+	const P_DQ = self::PARAM_SECOND_FACTOR_CRT_EXPONENT;
+	const P_QI = self::PARAM_FIRST_CRT_COEFFICIENT;
+	const P_OTH = self::PARAM_OTHER_PRIMES_INFO;
+	const P_K = self::PARAM_KEY_VALUE;
 
-    /**
-     * Mapping from registered JWK parameter name to class name.
-     *
-     * Note that ECC private key and RSA private key cannot be mapped since
-     * they share the same parameter name 'd'.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_NAME_TO_CLASS = [
-        self::P_KTY => KeyTypeParameter::class,
-        self::P_USE => PublicKeyUseParameter::class,
-        self::P_KEY_OPS => KeyOperationsParameter::class,
-        self::P_ALG => AlgorithmParameter::class,
-        self::P_KID => KeyIDParameter::class,
-        self::P_X5U => X509URLParameter::class,
-        self::P_X5C => X509CertificateChainParameter::class,
-        self::P_X5T => X509CertificateSHA1ThumbprintParameter::class,
-        self::P_X5TS256 => X509CertificateSHA256ThumbprintParameter::class,
-        self::P_CRV => CurveParameter::class,
-        self::P_X => XCoordinateParameter::class,
-        self::P_Y => YCoordinateParameter::class,
-        self::P_N => ModulusParameter::class,
-        self::P_E => ExponentParameter::class,
-        self::P_P => FirstPrimeFactorParameter::class,
-        self::P_Q => SecondPrimeFactorParameter::class,
-        self::P_DP => FirstFactorCRTExponentParameter::class,
-        self::P_DQ => SecondFactorCRTExponentParameter::class,
-        self::P_QI => FirstCRTCoefficientParameter::class,
-        self::P_OTH => OtherPrimesInfoParameter::class,
-        self::P_K => KeyValueParameter::class,
-    ];
+	/**
+	 * Mapping from registered JWK parameter name to class name.
+	 *
+	 * Note that ECC private key and RSA private key cannot be mapped since
+	 * they share the same parameter name 'd'.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_NAME_TO_CLASS = [
+		self::P_KTY => KeyTypeParameter::class,
+		self::P_USE => PublicKeyUseParameter::class,
+		self::P_KEY_OPS => KeyOperationsParameter::class,
+		self::P_ALG => AlgorithmParameter::class,
+		self::P_KID => KeyIDParameter::class,
+		self::P_X5U => X509URLParameter::class,
+		self::P_X5C => X509CertificateChainParameter::class,
+		self::P_X5T => X509CertificateSHA1ThumbprintParameter::class,
+		self::P_X5TS256 => X509CertificateSHA256ThumbprintParameter::class,
+		self::P_CRV => CurveParameter::class,
+		self::P_X => XCoordinateParameter::class,
+		self::P_Y => YCoordinateParameter::class,
+		self::P_N => ModulusParameter::class,
+		self::P_E => ExponentParameter::class,
+		self::P_P => FirstPrimeFactorParameter::class,
+		self::P_Q => SecondPrimeFactorParameter::class,
+		self::P_DP => FirstFactorCRTExponentParameter::class,
+		self::P_DQ => SecondFactorCRTExponentParameter::class,
+		self::P_QI => FirstCRTCoefficientParameter::class,
+		self::P_OTH => OtherPrimesInfoParameter::class,
+		self::P_K => KeyValueParameter::class,
+	];
 
-    /**
-     * Constructor.
-     *
-     * @param string $name  Parameter name
-     * @param mixed  $value Parameter value
-     */
-    public function __construct(string $name, $value)
-    {
-        $this->_name = $name;
-        $this->_value = $value;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name  Parameter name
+	 * @param mixed  $value Parameter value
+	 */
+	public function __construct(string $name, $value)
+	{
+		$this->_name = $name;
+		$this->_value = $value;
+	}
 
-    /**
-     * Initialize from a name and a value.
-     *
-     * Returns a parameter specific object if one is implemented.
-     *
-     * @param string $name  Parameter name
-     * @param mixed  $value Parameter value
-     *
-     * @return self
-     */
-    public static function fromNameAndValue(string $name, $value): self
-    {
-        if (array_key_exists($name, self::MAP_NAME_TO_CLASS)) {
-            $cls = self::MAP_NAME_TO_CLASS[$name];
-            return $cls::fromJSONValue($value);
-        }
-        return new self($name, $value);
-    }
+	/**
+	 * Initialize from a name and a value.
+	 *
+	 * Returns a parameter specific object if one is implemented.
+	 *
+	 * @param string $name  Parameter name
+	 * @param mixed  $value Parameter value
+	 *
+	 * @return self
+	 */
+	public static function fromNameAndValue(string $name, $value): self
+	{
+		if (array_key_exists($name, self::MAP_NAME_TO_CLASS)) {
+			$cls = self::MAP_NAME_TO_CLASS[$name];
+			return $cls::fromJSONValue($value);
+		}
+		return new self($name, $value);
+	}
 
-    /**
-     * Initialize from a JSON value.
-     *
-     * @param mixed $value
-     *
-     * @return JWKParameter
-     */
-    public static function fromJSONValue($value): Parameter
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . ' must be implemented in a derived class.');
-    }
+	/**
+	 * Initialize from a JSON value.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return JWKParameter
+	 */
+	public static function fromJSONValue($value): Parameter
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . ' must be implemented in a derived class.');
+	}
 }