sop / jwx

lib/JWX/JWK/Parameter/CurveParameter.php

Indentation +104 added lines, -104 removed lines

@@ -13,117 +13,117 @@
  */
 class CurveParameter extends JWKParameter
 {
-    use StringParameterValue;
+	use StringParameterValue;
 
-    /**
-     * P-256 Curve.
-     *
-     * @var string
-     */
-    const CURVE_P256 = 'P-256';
+	/**
+	 * P-256 Curve.
+	 *
+	 * @var string
+	 */
+	const CURVE_P256 = 'P-256';
 
-    /**
-     * P-384 Curve.
-     *
-     * @var string
-     */
-    const CURVE_P384 = 'P-384';
+	/**
+	 * P-384 Curve.
+	 *
+	 * @var string
+	 */
+	const CURVE_P384 = 'P-384';
 
-    /**
-     * P-521 Curve.
-     *
-     * @var string
-     */
-    const CURVE_P521 = 'P-521';
+	/**
+	 * P-521 Curve.
+	 *
+	 * @var string
+	 */
+	const CURVE_P521 = 'P-521';
 
-    /**
-     * Mapping from curve OID to curve name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_CURVE = [
-        '1.2.840.10045.3.1.7' => self::CURVE_P256,
-        '1.3.132.0.34' => self::CURVE_P384,
-        '1.3.132.0.35' => self::CURVE_P521,
-    ];
+	/**
+	 * Mapping from curve OID to curve name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_CURVE = [
+		'1.2.840.10045.3.1.7' => self::CURVE_P256,
+		'1.3.132.0.34' => self::CURVE_P384,
+		'1.3.132.0.35' => self::CURVE_P521,
+	];
 
-    /**
-     * Mapping from curve name to bit size.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_CURVE_TO_SIZE = [
-        self::CURVE_P256 => 256,
-        self::CURVE_P384 => 384,
-        self::CURVE_P521 => 521,
-    ];
+	/**
+	 * Mapping from curve name to bit size.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_CURVE_TO_SIZE = [
+		self::CURVE_P256 => 256,
+		self::CURVE_P384 => 384,
+		self::CURVE_P521 => 521,
+	];
 
-    /**
-     * Constructor.
-     *
-     * @param string $curve Curve name
-     */
-    public function __construct(string $curve)
-    {
-        parent::__construct(self::PARAM_CURVE, $curve);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $curve Curve name
+	 */
+	public function __construct(string $curve)
+	{
+		parent::__construct(self::PARAM_CURVE, $curve);
+	}
 
-    /**
-     * Initialize from curve OID.
-     *
-     * @param string $oid Object identifier in dotted format
-     *
-     * @throws \UnexpectedValueException If the curve is not supported
-     *
-     * @return self
-     */
-    public static function fromOID(string $oid): self
-    {
-        if (!array_key_exists($oid, self::MAP_OID_TO_CURVE)) {
-            throw new \UnexpectedValueException("OID {$oid} not supported.");
-        }
-        $curve = self::MAP_OID_TO_CURVE[$oid];
-        return new self($curve);
-    }
+	/**
+	 * Initialize from curve OID.
+	 *
+	 * @param string $oid Object identifier in dotted format
+	 *
+	 * @throws \UnexpectedValueException If the curve is not supported
+	 *
+	 * @return self
+	 */
+	public static function fromOID(string $oid): self
+	{
+		if (!array_key_exists($oid, self::MAP_OID_TO_CURVE)) {
+			throw new \UnexpectedValueException("OID {$oid} not supported.");
+		}
+		$curve = self::MAP_OID_TO_CURVE[$oid];
+		return new self($curve);
+	}
 
-    /**
-     * Get key size in bits for the curve.
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return int
-     */
-    public function keySizeBits(): int
-    {
-        if (!array_key_exists($this->_value, self::MAP_CURVE_TO_SIZE)) {
-            throw new \UnexpectedValueException(
-                'Curve ' . $this->_value . ' not supported.');
-        }
-        return self::MAP_CURVE_TO_SIZE[$this->_value];
-    }
+	/**
+	 * Get key size in bits for the curve.
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return int
+	 */
+	public function keySizeBits(): int
+	{
+		if (!array_key_exists($this->_value, self::MAP_CURVE_TO_SIZE)) {
+			throw new \UnexpectedValueException(
+				'Curve ' . $this->_value . ' not supported.');
+		}
+		return self::MAP_CURVE_TO_SIZE[$this->_value];
+	}
 
-    /**
-     * Get the curve OID by curve name.
-     *
-     * @param string $name Curve parameter name
-     *
-     * @throws \UnexpectedValueException If the curve is not supported
-     *
-     * @return string OID in dotted format
-     */
-    public static function nameToOID(string $name): string
-    {
-        static $reverseMap;
-        if (!isset($reverseMap)) {
-            $reverseMap = array_flip(self::MAP_OID_TO_CURVE);
-        }
-        if (!isset($reverseMap[$name])) {
-            throw new \UnexpectedValueException("Curve {$name} not supported.");
-        }
-        return $reverseMap[$name];
-    }
+	/**
+	 * Get the curve OID by curve name.
+	 *
+	 * @param string $name Curve parameter name
+	 *
+	 * @throws \UnexpectedValueException If the curve is not supported
+	 *
+	 * @return string OID in dotted format
+	 */
+	public static function nameToOID(string $name): string
+	{
+		static $reverseMap;
+		if (!isset($reverseMap)) {
+			$reverseMap = array_flip(self::MAP_OID_TO_CURVE);
+		}
+		if (!isset($reverseMap[$name])) {
+			throw new \UnexpectedValueException("Curve {$name} not supported.");
+		}
+		return $reverseMap[$name];
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWK/TypedJWK.php

Indentation +590 added lines, -590 removed lines

@@ -11,594 +11,594 @@
  */
 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;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWK/JWK.php

Indentation +193 added lines, -193 removed lines

@@ -14,197 +14,197 @@
  */
 class JWK implements \Countable, \IteratorAggregate
 {
-    use TypedJWK;
-
-    /**
-     * Parameters.
-     *
-     * @var JWKParameter[]
-     */
-    protected $_parameters;
-
-    /**
-     * Constructor.
-     *
-     * @param JWKParameter ...$params
-     */
-    public function __construct(JWKParameter ...$params)
-    {
-        $this->_parameters = [];
-        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 = [];
-        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 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 all parameters.
-     *
-     * @return JWKParameter[]
-     */
-    public function parameters(): array
-    {
-        return array_values($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));
-    }
-
-    /**
-     * 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];
-    }
-
-    /**
-     * Convert to array.
-     *
-     * @return array Parameter values keyed by parameter names
-     */
-    public function toArray(): array
-    {
-        $a = [];
-        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);
-    }
-
-    /**
-     * 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);
-    }
+	use TypedJWK;
+
+	/**
+	 * Parameters.
+	 *
+	 * @var JWKParameter[]
+	 */
+	protected $_parameters;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param JWKParameter ...$params
+	 */
+	public function __construct(JWKParameter ...$params)
+	{
+		$this->_parameters = [];
+		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 = [];
+		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 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 all parameters.
+	 *
+	 * @return JWKParameter[]
+	 */
+	public function parameters(): array
+	{
+		return array_values($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));
+	}
+
+	/**
+	 * 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];
+	}
+
+	/**
+	 * Convert to array.
+	 *
+	 * @return array Parameter values keyed by parameter names
+	 */
+	public function toArray(): array
+	{
+		$a = [];
+		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);
+	}
+
+	/**
+	 * 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);
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWK/Asymmetric/PublicKeyJWK.php

Indentation +36 added lines, -36 removed lines

@@ -18,42 +18,42 @@
  */
 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());
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWK/Asymmetric/PrivateKeyJWK.php

Indentation +42 added lines, -42 removed lines

@@ -18,49 +18,49 @@
  */
 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());
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWK/EC/ECPublicKeyJWK.php

Indentation +77 added lines, -77 removed lines

@@ -23,85 +23,85 @@
  */
 class ECPublicKeyJWK extends PublicKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = [
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_CURVE,
-        JWKParameter::PARAM_X_COORDINATE,
-    ];
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = [
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_CURVE,
+		JWKParameter::PARAM_X_COORDINATE,
+	];
 
-    /**
-     * 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_EC !== $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_EC !== $this->keyTypeParameter()->value()) {
+			throw new \UnexpectedValueException('Invalid key type.');
+		}
+	}
 
-    /**
-     * Initialize from ECPublicKey.
-     *
-     * @param ECPublicKey $pk
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromECPublicKey(ECPublicKey $pk): self
-    {
-        if (!$pk->hasNamedCurve()) {
-            throw new \UnexpectedValueException('No curve name.');
-        }
-        $curve = CurveParameter::fromOID($pk->namedCurve());
-        [$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): self
+	{
+		if (!$pk->hasNamedCurve()) {
+			throw new \UnexpectedValueException('No curve name.');
+		}
+		$curve = CurveParameter::fromOID($pk->namedCurve());
+		[$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): self
-    {
-        return self::fromECPublicKey(ECPublicKey::fromPEM($pem));
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 *
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem): self
+	{
+		return self::fromECPublicKey(ECPublicKey::fromPEM($pem));
+	}
 
-    /**
-     * Convert EC public 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());
-        $ec = ECPublicKey::fromCoordinates($x, $y, $curve_oid);
-        return $ec->publicKeyInfo()->toPEM();
-    }
+	/**
+	 * Convert EC public 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());
+		$ec = ECPublicKey::fromCoordinates($x, $y, $curve_oid);
+		return $ec->publicKeyInfo()->toPEM();
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWK/EC/ECPrivateKeyJWK.php

Indentation +100 added lines, -100 removed lines

@@ -26,109 +26,109 @@
  */
 class ECPrivateKeyJWK extends PrivateKeyJWK
 {
-    /**
-     * Parameter names managed by this class.
-     *
-     * @internal
-     *
-     * @var string[]
-     */
-    const MANAGED_PARAMS = [
-        JWKParameter::PARAM_KEY_TYPE,
-        JWKParameter::PARAM_CURVE,
-        JWKParameter::PARAM_X_COORDINATE,
-        JWKParameter::PARAM_ECC_PRIVATE_KEY,
-    ];
+	/**
+	 * Parameter names managed by this class.
+	 *
+	 * @internal
+	 *
+	 * @var string[]
+	 */
+	const MANAGED_PARAMS = [
+		JWKParameter::PARAM_KEY_TYPE,
+		JWKParameter::PARAM_CURVE,
+		JWKParameter::PARAM_X_COORDINATE,
+		JWKParameter::PARAM_ECC_PRIVATE_KEY,
+	];
 
-    /**
-     * 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_EC !== $this->keyTypeParameter()->value()) {
-            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 (KeyTypeParameter::TYPE_EC !== $this->keyTypeParameter()->value()) {
+			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();
-        [$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();
+		[$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();
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWS/SignatureAlgorithm.php

Indentation +63 added lines, -63 removed lines

@@ -16,72 +16,72 @@
  */
 abstract class SignatureAlgorithm implements AlgorithmParameterValue, HeaderParameters
 {
-    /**
-     * ID of the key used by the algorithm.
-     *
-     * If set, KeyID parameter shall be automatically inserted into JWS's
-     * header.
-     *
-     * @var null|string
-     */
-    protected $_keyID;
+	/**
+	 * ID of the key used by the algorithm.
+	 *
+	 * If set, KeyID parameter shall be automatically inserted into JWS's
+	 * header.
+	 *
+	 * @var null|string
+	 */
+	protected $_keyID;
 
-    /**
-     * Compute signature.
-     *
-     * @param string $data Data for which the signature is computed
-     *
-     * @return string
-     */
-    abstract public function computeSignature(string $data): string;
+	/**
+	 * Compute signature.
+	 *
+	 * @param string $data Data for which the signature is computed
+	 *
+	 * @return string
+	 */
+	abstract public function computeSignature(string $data): string;
 
-    /**
-     * Validate signature.
-     *
-     * @param string $data      Data to validate
-     * @param string $signature Signature to compare
-     *
-     * @return bool
-     */
-    abstract public function validateSignature(string $data, string $signature): bool;
+	/**
+	 * Validate signature.
+	 *
+	 * @param string $data      Data to validate
+	 * @param string $signature Signature to compare
+	 *
+	 * @return bool
+	 */
+	abstract public function validateSignature(string $data, string $signature): bool;
 
-    /**
-     * Initialize signature algorithm from a JWK and a header.
-     *
-     * @param JWK    $jwk    JSON Web Key
-     * @param Header $header Header
-     *
-     * @return SignatureAlgorithm
-     */
-    public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
-    {
-        $factory = new SignatureAlgorithmFactory($header);
-        return $factory->algoByKey($jwk);
-    }
+	/**
+	 * Initialize signature algorithm from a JWK and a header.
+	 *
+	 * @param JWK    $jwk    JSON Web Key
+	 * @param Header $header Header
+	 *
+	 * @return SignatureAlgorithm
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): SignatureAlgorithm
+	{
+		$factory = new SignatureAlgorithmFactory($header);
+		return $factory->algoByKey($jwk);
+	}
 
-    /**
-     * Get self with key ID.
-     *
-     * @param null|string $id Key ID or null to remove
-     *
-     * @return self
-     */
-    public function withKeyID(?string $id): self
-    {
-        $obj = clone $this;
-        $obj->_keyID = $id;
-        return $obj;
-    }
+	/**
+	 * Get self with key ID.
+	 *
+	 * @param null|string $id Key ID or null to remove
+	 *
+	 * @return self
+	 */
+	public function withKeyID(?string $id): self
+	{
+		$obj = clone $this;
+		$obj->_keyID = $id;
+		return $obj;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function headerParameters(): array
-    {
-        $params = [];
-        if (isset($this->_keyID)) {
-            $params[] = new KeyIDParameter($this->_keyID);
-        }
-        return $params;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function headerParameters(): array
+	{
+		$params = [];
+		if (isset($this->_keyID)) {
+			$params[] = new KeyIDParameter($this->_keyID);
+		}
+		return $params;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/JWX/JWS/JWS.php

Indentation +263 added lines, -263 removed lines

@@ -21,287 +21,287 @@
  */
 class JWS
 {
-    /**
-     * Protected header.
-     *
-     * @var Header
-     */
-    protected $_protectedHeader;
+	/**
+	 * Protected header.
+	 *
+	 * @var Header
+	 */
+	protected $_protectedHeader;
 
-    /**
-     * Payload.
-     *
-     * @var string
-     */
-    protected $_payload;
+	/**
+	 * Payload.
+	 *
+	 * @var string
+	 */
+	protected $_payload;
 
-    /**
-     * Input value for the signature computation.
-     *
-     * @var string
-     */
-    protected $_signatureInput;
+	/**
+	 * Input value for the signature computation.
+	 *
+	 * @var string
+	 */
+	protected $_signatureInput;
 
-    /**
-     * Signature.
-     *
-     * @var string
-     */
-    protected $_signature;
+	/**
+	 * Signature.
+	 *
+	 * @var string
+	 */
+	protected $_signature;
 
-    /**
-     * Constructor.
-     *
-     * @param Header $protected_header JWS Protected Header
-     * @param string $payload          JWS Payload
-     * @param string $signature_input  Input value for the signature computation
-     * @param string $signature        JWS Signature
-     */
-    protected function __construct(Header $protected_header, string $payload,
-        string $signature_input, string $signature)
-    {
-        $this->_protectedHeader = $protected_header;
-        $this->_payload = $payload;
-        $this->_signatureInput = $signature_input;
-        $this->_signature = $signature;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Header $protected_header JWS Protected Header
+	 * @param string $payload          JWS Payload
+	 * @param string $signature_input  Input value for the signature computation
+	 * @param string $signature        JWS Signature
+	 */
+	protected function __construct(Header $protected_header, string $payload,
+		string $signature_input, string $signature)
+	{
+		$this->_protectedHeader = $protected_header;
+		$this->_payload = $payload;
+		$this->_signatureInput = $signature_input;
+		$this->_signature = $signature;
+	}
 
-    /**
-     * Convert JWS to string.
-     *
-     * @return string
-     */
-    public function __toString(): string
-    {
-        return $this->toCompact();
-    }
+	/**
+	 * Convert JWS to string.
+	 *
+	 * @return string
+	 */
+	public function __toString(): string
+	{
+		return $this->toCompact();
+	}
 
-    /**
-     * Initialize from a compact serialization.
-     *
-     * @param string $data
-     *
-     * @return self
-     */
-    public static function fromCompact(string $data): self
-    {
-        return self::fromParts(explode('.', $data));
-    }
+	/**
+	 * Initialize from a compact serialization.
+	 *
+	 * @param string $data
+	 *
+	 * @return self
+	 */
+	public static function fromCompact(string $data): self
+	{
+		return self::fromParts(explode('.', $data));
+	}
 
-    /**
-     * Initialize from the parts of a compact serialization.
-     *
-     * @param array $parts
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return self
-     */
-    public static function fromParts(array $parts): self
-    {
-        if (3 !== count($parts)) {
-            throw new \UnexpectedValueException(
-                'Invalid JWS compact serialization.');
-        }
-        $header = Header::fromJSON(Base64::urlDecode($parts[0]));
-        $b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
-        $payload = $b64 ? Base64::urlDecode($parts[1]) : $parts[1];
-        $signature_input = $parts[0] . '.' . $parts[1];
-        $signature = Base64::urlDecode($parts[2]);
-        return new self($header, $payload, $signature_input, $signature);
-    }
+	/**
+	 * Initialize from the parts of a compact serialization.
+	 *
+	 * @param array $parts
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return self
+	 */
+	public static function fromParts(array $parts): self
+	{
+		if (3 !== count($parts)) {
+			throw new \UnexpectedValueException(
+				'Invalid JWS compact serialization.');
+		}
+		$header = Header::fromJSON(Base64::urlDecode($parts[0]));
+		$b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
+		$payload = $b64 ? Base64::urlDecode($parts[1]) : $parts[1];
+		$signature_input = $parts[0] . '.' . $parts[1];
+		$signature = Base64::urlDecode($parts[2]);
+		return new self($header, $payload, $signature_input, $signature);
+	}
 
-    /**
-     * Initialize by signing the payload with given algorithm.
-     *
-     * @param string             $payload JWS Payload
-     * @param SignatureAlgorithm $algo    Signature algorithm
-     * @param null|Header        $header  Desired header. Algorithm specific
-     *                                    parameters are added automatically.
-     *
-     * @throws \RuntimeException If signature computation fails
-     *
-     * @return self
-     */
-    public static function sign(string $payload, SignatureAlgorithm $algo,
-        ?Header $header = null): self
-    {
-        if (!isset($header)) {
-            $header = new Header();
-        }
-        $header = $header->withParameters(...$algo->headerParameters());
-        // ensure that if b64 parameter is used, it's marked critical
-        if ($header->hasB64Payload()) {
-            if (!$header->hasCritical()) {
-                $crit = new CriticalParameter(JWTParameter::P_B64);
-            } else {
-                $crit = $header->critical()->withParamName(JWTParameter::P_B64);
-            }
-            $header = $header->withParameters($crit);
-        }
-        $signature_input = self::_generateSignatureInput($payload, $header);
-        $signature = $algo->computeSignature($signature_input);
-        return new self($header, $payload, $signature_input, $signature);
-    }
+	/**
+	 * Initialize by signing the payload with given algorithm.
+	 *
+	 * @param string             $payload JWS Payload
+	 * @param SignatureAlgorithm $algo    Signature algorithm
+	 * @param null|Header        $header  Desired header. Algorithm specific
+	 *                                    parameters are added automatically.
+	 *
+	 * @throws \RuntimeException If signature computation fails
+	 *
+	 * @return self
+	 */
+	public static function sign(string $payload, SignatureAlgorithm $algo,
+		?Header $header = null): self
+	{
+		if (!isset($header)) {
+			$header = new Header();
+		}
+		$header = $header->withParameters(...$algo->headerParameters());
+		// ensure that if b64 parameter is used, it's marked critical
+		if ($header->hasB64Payload()) {
+			if (!$header->hasCritical()) {
+				$crit = new CriticalParameter(JWTParameter::P_B64);
+			} else {
+				$crit = $header->critical()->withParamName(JWTParameter::P_B64);
+			}
+			$header = $header->withParameters($crit);
+		}
+		$signature_input = self::_generateSignatureInput($payload, $header);
+		$signature = $algo->computeSignature($signature_input);
+		return new self($header, $payload, $signature_input, $signature);
+	}
 
-    /**
-     * Get JOSE header.
-     *
-     * @return JOSE
-     */
-    public function header(): JOSE
-    {
-        return new JOSE($this->_protectedHeader);
-    }
+	/**
+	 * Get JOSE header.
+	 *
+	 * @return JOSE
+	 */
+	public function header(): JOSE
+	{
+		return new JOSE($this->_protectedHeader);
+	}
 
-    /**
-     * Get the signature algorithm name.
-     *
-     * @return string
-     */
-    public function algorithmName(): string
-    {
-        return $this->header()->algorithm()->value();
-    }
+	/**
+	 * Get the signature algorithm name.
+	 *
+	 * @return string
+	 */
+	public function algorithmName(): string
+	{
+		return $this->header()->algorithm()->value();
+	}
 
-    /**
-     * Check whether JWS is unsecured, that is, contains no signature.
-     *
-     * @return bool
-     */
-    public function isUnsecured(): bool
-    {
-        return JWA::ALGO_NONE === $this->algorithmName();
-    }
+	/**
+	 * Check whether JWS is unsecured, that is, contains no signature.
+	 *
+	 * @return bool
+	 */
+	public function isUnsecured(): bool
+	{
+		return JWA::ALGO_NONE === $this->algorithmName();
+	}
 
-    /**
-     * Get the payload.
-     *
-     * @return string
-     */
-    public function payload(): string
-    {
-        return $this->_payload;
-    }
+	/**
+	 * Get the payload.
+	 *
+	 * @return string
+	 */
+	public function payload(): string
+	{
+		return $this->_payload;
+	}
 
-    /**
-     * Get the signature.
-     *
-     * @return string
-     */
-    public function signature(): string
-    {
-        return $this->_signature;
-    }
+	/**
+	 * Get the signature.
+	 *
+	 * @return string
+	 */
+	public function signature(): string
+	{
+		return $this->_signature;
+	}
 
-    /**
-     * Validate the signature using explicit algorithm.
-     *
-     * @param SignatureAlgorithm $algo
-     *
-     * @throws \UnexpectedValueException If using different signature algorithm
-     *                                   then specified by the header
-     * @throws \RuntimeException         If signature computation fails
-     *
-     * @return bool True if signature is valid
-     */
-    public function validate(SignatureAlgorithm $algo): bool
-    {
-        if ($algo->algorithmParamValue() !== $this->algorithmName()) {
-            throw new \UnexpectedValueException('Invalid signature algorithm.');
-        }
-        return $algo->validateSignature($this->_signatureInput, $this->_signature);
-    }
+	/**
+	 * Validate the signature using explicit algorithm.
+	 *
+	 * @param SignatureAlgorithm $algo
+	 *
+	 * @throws \UnexpectedValueException If using different signature algorithm
+	 *                                   then specified by the header
+	 * @throws \RuntimeException         If signature computation fails
+	 *
+	 * @return bool True if signature is valid
+	 */
+	public function validate(SignatureAlgorithm $algo): bool
+	{
+		if ($algo->algorithmParamValue() !== $this->algorithmName()) {
+			throw new \UnexpectedValueException('Invalid signature algorithm.');
+		}
+		return $algo->validateSignature($this->_signatureInput, $this->_signature);
+	}
 
-    /**
-     * Validate the signature using the given JWK.
-     *
-     * Signature algorithm is determined from the header.
-     *
-     * @param JWK $jwk JSON Web Key
-     *
-     * @throws \RuntimeException If algorithm initialization fails
-     *
-     * @return bool True if signature is valid
-     */
-    public function validateWithJWK(JWK $jwk): bool
-    {
-        $algo = SignatureAlgorithm::fromJWK($jwk, $this->header());
-        return $this->validate($algo);
-    }
+	/**
+	 * Validate the signature using the given JWK.
+	 *
+	 * Signature algorithm is determined from the header.
+	 *
+	 * @param JWK $jwk JSON Web Key
+	 *
+	 * @throws \RuntimeException If algorithm initialization fails
+	 *
+	 * @return bool True if signature is valid
+	 */
+	public function validateWithJWK(JWK $jwk): bool
+	{
+		$algo = SignatureAlgorithm::fromJWK($jwk, $this->header());
+		return $this->validate($algo);
+	}
 
-    /**
-     * Validate the signature using a key from the given JWK set.
-     *
-     * Correct key shall be sought by the key ID indicated by the header.
-     *
-     * @param JWKSet $set Set of JSON Web Keys
-     *
-     * @throws \RuntimeException If algorithm initialization fails
-     *
-     * @return bool True if signature is valid
-     */
-    public function validateWithJWKSet(JWKSet $set): bool
-    {
-        if (!count($set)) {
-            throw new \RuntimeException('No keys.');
-        }
-        $factory = new SignatureAlgorithmFactory($this->header());
-        $algo = $factory->algoByKeys($set);
-        return $this->validate($algo);
-    }
+	/**
+	 * Validate the signature using a key from the given JWK set.
+	 *
+	 * Correct key shall be sought by the key ID indicated by the header.
+	 *
+	 * @param JWKSet $set Set of JSON Web Keys
+	 *
+	 * @throws \RuntimeException If algorithm initialization fails
+	 *
+	 * @return bool True if signature is valid
+	 */
+	public function validateWithJWKSet(JWKSet $set): bool
+	{
+		if (!count($set)) {
+			throw new \RuntimeException('No keys.');
+		}
+		$factory = new SignatureAlgorithmFactory($this->header());
+		$algo = $factory->algoByKeys($set);
+		return $this->validate($algo);
+	}
 
-    /**
-     * Convert to compact serialization.
-     *
-     * @return string
-     */
-    public function toCompact(): string
-    {
-        return Base64::urlEncode($this->_protectedHeader->toJSON()) . '.' .
-             $this->_encodedPayload() . '.' .
-             Base64::urlEncode($this->_signature);
-    }
+	/**
+	 * Convert to compact serialization.
+	 *
+	 * @return string
+	 */
+	public function toCompact(): string
+	{
+		return Base64::urlEncode($this->_protectedHeader->toJSON()) . '.' .
+			 $this->_encodedPayload() . '.' .
+			 Base64::urlEncode($this->_signature);
+	}
 
-    /**
-     * Convert to compact serialization with payload detached.
-     *
-     * @return string
-     */
-    public function toCompactDetached(): string
-    {
-        return Base64::urlEncode($this->_protectedHeader->toJSON()) . '..' .
-             Base64::urlEncode($this->_signature);
-    }
+	/**
+	 * Convert to compact serialization with payload detached.
+	 *
+	 * @return string
+	 */
+	public function toCompactDetached(): string
+	{
+		return Base64::urlEncode($this->_protectedHeader->toJSON()) . '..' .
+			 Base64::urlEncode($this->_signature);
+	}
 
-    /**
-     * Get the payload encoded for serialization.
-     *
-     * @return string
-     */
-    protected function _encodedPayload(): string
-    {
-        $b64 = true;
-        if ($this->_protectedHeader->hasB64Payload()) {
-            $b64 = $this->_protectedHeader->B64Payload()->value();
-        }
-        return $b64 ? Base64::urlEncode($this->_payload) : $this->_payload;
-    }
+	/**
+	 * Get the payload encoded for serialization.
+	 *
+	 * @return string
+	 */
+	protected function _encodedPayload(): string
+	{
+		$b64 = true;
+		if ($this->_protectedHeader->hasB64Payload()) {
+			$b64 = $this->_protectedHeader->B64Payload()->value();
+		}
+		return $b64 ? Base64::urlEncode($this->_payload) : $this->_payload;
+	}
 
-    /**
-     * Generate input for the signature computation.
-     *
-     * @param string $payload Payload
-     * @param Header $header  Protected header
-     *
-     * @return string
-     */
-    protected static function _generateSignatureInput(string $payload,
-        Header $header): string
-    {
-        $b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
-        $data = Base64::urlEncode($header->toJSON()) . '.';
-        $data .= $b64 ? Base64::urlEncode($payload) : $payload;
-        return $data;
-    }
+	/**
+	 * Generate input for the signature computation.
+	 *
+	 * @param string $payload Payload
+	 * @param Header $header  Protected header
+	 *
+	 * @return string
+	 */
+	protected static function _generateSignatureInput(string $payload,
+		Header $header): string
+	{
+		$b64 = $header->hasB64Payload() ? $header->B64Payload()->value() : true;
+		$data = Base64::urlEncode($header->toJSON()) . '.';
+		$data .= $b64 ? Base64::urlEncode($payload) : $payload;
+		return $data;
+	}
 }

Spacing +1 added lines, -1 removed lines

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