sop / jwx

lib/JWX/JWT/Claim/Feature/ReferenceTimeValidation.php

Indentation +31 added lines, -31 removed lines

@@ -11,36 +11,36 @@
  */
 trait ReferenceTimeValidation
 {
-    /**
-     * Validate the claim against given constraint.
-     *
-     * @param mixed $constraint
-     * @return bool
-     */
-    abstract public function validate($constraint): bool;
+	/**
+	 * Validate the claim against given constraint.
+	 *
+	 * @param mixed $constraint
+	 * @return bool
+	 */
+	abstract public function validate($constraint): bool;
     
-    /**
-     * Override default Claim validation.
-     *
-     * Uses reference time of the validation context as a constraint.
-     *
-     * @see \JWX\JWT\Claim\Claim::validateWithContext()
-     * @param ValidationContext $ctx
-     * @return bool
-     */
-    public function validateWithContext(ValidationContext $ctx): bool
-    {
-        if ($ctx->hasReferenceTime()) {
-            // try to validate with leeway added
-            if ($this->validate($ctx->referenceTime() + $ctx->leeway())) {
-                return true;
-            }
-            // try to validate with leeway substracted
-            if ($this->validate($ctx->referenceTime() - $ctx->leeway())) {
-                return true;
-            }
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Override default Claim validation.
+	 *
+	 * Uses reference time of the validation context as a constraint.
+	 *
+	 * @see \JWX\JWT\Claim\Claim::validateWithContext()
+	 * @param ValidationContext $ctx
+	 * @return bool
+	 */
+	public function validateWithContext(ValidationContext $ctx): bool
+	{
+		if ($ctx->hasReferenceTime()) {
+			// try to validate with leeway added
+			if ($this->validate($ctx->referenceTime() + $ctx->leeway())) {
+				return true;
+			}
+			// try to validate with leeway substracted
+			if ($this->validate($ctx->referenceTime() - $ctx->leeway())) {
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
 }

lib/JWX/JWT/Claim/Feature/NumericDateClaim.php

Indentation +83 added lines, -83 removed lines

@@ -9,93 +9,93 @@
  */
 trait NumericDateClaim
 {
-    /**
-     * Constructor.
-     *
-     * @param int $timestamp Unix timestamp
-     */
-    abstract public function __construct(int $timestamp);
+	/**
+	 * Constructor.
+	 *
+	 * @param int $timestamp Unix timestamp
+	 */
+	abstract public function __construct(int $timestamp);
     
-    /**
-     * Get the parameter value.
-     *
-     * @return string
-     */
-    abstract public function value();
+	/**
+	 * Get the parameter value.
+	 *
+	 * @return string
+	 */
+	abstract public function value();
     
-    /**
-     * Initialize instance from date/time string.
-     *
-     * @param string $time <code>strtotime</code> compatible time string
-     * @param string $tz Default timezone
-     * @throws \RuntimeException
-     * @return static
-     */
-    public static function fromString(string $time, string $tz = "UTC")
-    {
-        try {
-            $dt = new \DateTimeImmutable($time, self::_createTimeZone($tz));
-            return new static($dt->getTimestamp());
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                "Failed to create DateTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
-        }
-    }
+	/**
+	 * Initialize instance from date/time string.
+	 *
+	 * @param string $time <code>strtotime</code> compatible time string
+	 * @param string $tz Default timezone
+	 * @throws \RuntimeException
+	 * @return static
+	 */
+	public static function fromString(string $time, string $tz = "UTC")
+	{
+		try {
+			$dt = new \DateTimeImmutable($time, self::_createTimeZone($tz));
+			return new static($dt->getTimestamp());
+		} catch (\Exception $e) {
+			throw new \RuntimeException(
+				"Failed to create DateTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
+		}
+	}
     
-    /**
-     * Get date as a unix timestamp.
-     *
-     * @return int
-     */
-    public function timestamp(): int
-    {
-        return (int) $this->value();
-    }
+	/**
+	 * Get date as a unix timestamp.
+	 *
+	 * @return int
+	 */
+	public function timestamp(): int
+	{
+		return (int) $this->value();
+	}
     
-    /**
-     * Get date as a datetime object.
-     *
-     * @param string $tz Timezone
-     * @throws \RuntimeException
-     * @return \DateTimeImmutable
-     */
-    public function dateTime(string $tz = "UTC"): \DateTimeImmutable
-    {
-        $dt = \DateTimeImmutable::createFromFormat("!U", strval($this->value()),
-            self::_createTimeZone($tz));
-        if (false === $dt) {
-            throw new \RuntimeException(
-                "Failed to create DateTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr());
-        }
-        return $dt;
-    }
+	/**
+	 * Get date as a datetime object.
+	 *
+	 * @param string $tz Timezone
+	 * @throws \RuntimeException
+	 * @return \DateTimeImmutable
+	 */
+	public function dateTime(string $tz = "UTC"): \DateTimeImmutable
+	{
+		$dt = \DateTimeImmutable::createFromFormat("!U", strval($this->value()),
+			self::_createTimeZone($tz));
+		if (false === $dt) {
+			throw new \RuntimeException(
+				"Failed to create DateTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr());
+		}
+		return $dt;
+	}
     
-    /**
-     * Create DateTimeZone object from string.
-     *
-     * @param string $tz
-     * @throws \UnexpectedValueException
-     * @return \DateTimeZone
-     */
-    private static function _createTimeZone(string $tz): \DateTimeZone
-    {
-        try {
-            return new \DateTimeZone($tz);
-        } catch (\Exception $e) {
-            throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
-        }
-    }
+	/**
+	 * Create DateTimeZone object from string.
+	 *
+	 * @param string $tz
+	 * @throws \UnexpectedValueException
+	 * @return \DateTimeZone
+	 */
+	private static function _createTimeZone(string $tz): \DateTimeZone
+	{
+		try {
+			return new \DateTimeZone($tz);
+		} catch (\Exception $e) {
+			throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
+		}
+	}
     
-    /**
-     * Get last error caused by DateTimeImmutable.
-     *
-     * @return string
-     */
-    private static function _getLastDateTimeImmutableErrorsStr(): string
-    {
-        $errors = \DateTimeImmutable::getLastErrors()["errors"];
-        return implode(", ", $errors);
-    }
+	/**
+	 * Get last error caused by DateTimeImmutable.
+	 *
+	 * @return string
+	 */
+	private static function _getLastDateTimeImmutableErrorsStr(): string
+	{
+		$errors = \DateTimeImmutable::getLastErrors()["errors"];
+		return implode(", ", $errors);
+	}
 }

lib/JWX/JWT/Header/HeaderParameters.php

Indentation +6 added lines, -6 removed lines

@@ -9,10 +9,10 @@
  */
 interface HeaderParameters
 {
-    /**
-     * Get an array of JOSE header parameters representing this object.
-     *
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array;
+	/**
+	 * Get an array of JOSE header parameters representing this object.
+	 *
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array;
 }

lib/JWX/JWT/Header/TypedHeader.php

Indentation +449 added lines, -449 removed lines

@@ -13,453 +13,453 @@
  */
 trait TypedHeader
 {
-    /**
-     * 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
-     * @throws \LogicException If the parameter is not present
-     * @return JWTParameter
-     */
-    abstract public function get(string $name): JWTParameter;
-    
-    /**
-     * Check whether the algorithm parameter is present.
-     *
-     * @return bool
-     */
-    public function hasAlgorithm(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_ALG);
-    }
-    
-    /**
-     * Get the algorithm parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\AlgorithmParameter
-     */
-    public function algorithm(): Parameter\AlgorithmParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_ALG),
-            Parameter\AlgorithmParameter::class);
-    }
-    
-    /**
-     * Check whether the authentication tag parameter is present.
-     *
-     * @return bool
-     */
-    public function hasAuthenticationTag(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_TAG);
-    }
-    
-    /**
-     * Get the authentication tag parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\AuthenticationTagParameter
-     */
-    public function authenticationTag(): Parameter\AuthenticationTagParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_TAG),
-            Parameter\AuthenticationTagParameter::class);
-    }
-    
-    /**
-     * Check whether the 'base64url-encode payload' parameter is present.
-     *
-     * @return bool
-     */
-    public function hasB64Payload(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_B64);
-    }
-    
-    /**
-     * Get the 'base64url-encode payload' parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\B64PayloadParameter
-     */
-    public function B64Payload(): Parameter\B64PayloadParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_B64),
-            Parameter\B64PayloadParameter::class);
-    }
-    
-    /**
-     * Check whether the compression algorithm parameter is present.
-     *
-     * @return bool
-     */
-    public function hasCompressionAlgorithm(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_ZIP);
-    }
-    
-    /**
-     * Get the compression algorithm parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\CompressionAlgorithmParameter
-     */
-    public function compressionAlgorithm(): Parameter\CompressionAlgorithmParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_ZIP),
-            Parameter\CompressionAlgorithmParameter::class);
-    }
-    
-    /**
-     * Check whether the content type parameter is present.
-     *
-     * @return bool
-     */
-    public function hasContentType(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_CTY);
-    }
-    
-    /**
-     * Get the content type parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\ContentTypeParameter
-     */
-    public function contentType(): Parameter\ContentTypeParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_CTY),
-            Parameter\ContentTypeParameter::class);
-    }
-    
-    /**
-     * Check whether the critical parameter is present.
-     *
-     * @return bool
-     */
-    public function hasCritical(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_CRIT);
-    }
-    
-    /**
-     * Get the critical parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\CriticalParameter
-     */
-    public function critical(): Parameter\CriticalParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_CRIT),
-            Parameter\CriticalParameter::class);
-    }
-    
-    /**
-     * Check whether the encryption algorithm parameter is present.
-     *
-     * @return bool
-     */
-    public function hasEncryptionAlgorithm(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_ENC);
-    }
-    
-    /**
-     * Get the encryption algorithm parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\EncryptionAlgorithmParameter
-     */
-    public function encryptionAlgorithm(): Parameter\EncryptionAlgorithmParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_ENC),
-            Parameter\EncryptionAlgorithmParameter::class);
-    }
-    
-    /**
-     * Check whether the initialization vector parameter is present.
-     *
-     * @return bool
-     */
-    public function hasInitializationVector(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_IV);
-    }
-    
-    /**
-     * Get the initialization vector parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\InitializationVectorParameter
-     */
-    public function initializationVector(): Parameter\InitializationVectorParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_IV),
-            Parameter\InitializationVectorParameter::class);
-    }
-    
-    /**
-     * Check whether the JSON web key parameter is present.
-     *
-     * @return bool
-     */
-    public function hasJSONWebKey(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_JWK);
-    }
-    
-    /**
-     * Get the JSON web key parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\JSONWebKeyParameter
-     */
-    public function JSONWebKey(): Parameter\JSONWebKeyParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_JWK),
-            Parameter\JSONWebKeyParameter::class);
-    }
-    
-    /**
-     * Check whether the JWK set URL parameter is present.
-     *
-     * @return bool
-     */
-    public function hasJWKSetURL(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_JKU);
-    }
-    
-    /**
-     * Get the JWK set URL parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\JWKSetURLParameter
-     */
-    public function JWKSetURL(): Parameter\JWKSetURLParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_JKU),
-            Parameter\JWKSetURLParameter::class);
-    }
-    
-    /**
-     * Check whether the key ID parameter is present.
-     *
-     * @return bool
-     */
-    public function hasKeyID(): bool
-    {
-        return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\KeyIDParameter
-     */
-    public function keyID(): Parameter\KeyIDParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_KID),
-            Parameter\KeyIDParameter::class);
-    }
-    
-    /**
-     * Check whether the PBES2 count parameter is present.
-     *
-     * @return bool
-     */
-    public function hasPBES2Count(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_P2C);
-    }
-    
-    /**
-     * Get the PBES2 count parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\PBES2CountParameter
-     */
-    public function PBES2Count(): Parameter\PBES2CountParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_P2C),
-            Parameter\PBES2CountParameter::class);
-    }
-    
-    /**
-     * Check whether the PBES2 salt input parameter is present.
-     *
-     * @return bool
-     */
-    public function hasPBES2SaltInput(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_P2S);
-    }
-    
-    /**
-     * Get the PBES2 salt input parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\PBES2SaltInputParameter
-     */
-    public function PBES2SaltInput(): Parameter\PBES2SaltInputParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_P2S),
-            Parameter\PBES2SaltInputParameter::class);
-    }
-    
-    /**
-     * Check whether the type parameter is present.
-     *
-     * @return bool
-     */
-    public function hasType(): bool
-    {
-        return $this->has(Parameter\JWTParameter::P_TYP);
-    }
-    
-    /**
-     * Get the type parameter.
-     *
-     * @throws \UnexpectedValueException If the parameter has a wrong class
-     * @throws \LogicException If the parameter is not present
-     * @return \JWX\JWT\Parameter\TypeParameter
-     */
-    public function type(): Parameter\TypeParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_TYP),
-            Parameter\TypeParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 certificate chain parameter is present.
-     *
-     * @return bool
-     */
-    public function hasX509CertificateChain(): bool
-    {
-        return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509CertificateChainParameter
-     */
-    public function X509CertificateChain(): Parameter\X509CertificateChainParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_X5C),
-            Parameter\X509CertificateChainParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 certificate SHA-1 thumbprint parameter is
-     * present.
-     *
-     * @return bool
-     */
-    public function hasX509CertificateSHA1Thumbprint(): bool
-    {
-        return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509CertificateSHA1ThumbprintParameter
-     */
-    public function X509CertificateSHA1Thumbprint(): Parameter\X509CertificateSHA1ThumbprintParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_X5T),
-            Parameter\X509CertificateSHA1ThumbprintParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 certificate SHA-256 thumbprint parameter is
-     * present.
-     *
-     * @return bool
-     */
-    public function hasX509CertificateSHA256Thumbprint(): bool
-    {
-        return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509CertificateSHA256ThumbprintParameter
-     */
-    public function X509CertificateSHA256Thumbprint(): Parameter\X509CertificateSHA256ThumbprintParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_X5TS256),
-            Parameter\X509CertificateSHA256ThumbprintParameter::class);
-    }
-    
-    /**
-     * Check whether the X.509 URL parameter is present.
-     *
-     * @return bool
-     */
-    public function hasX509URL(): bool
-    {
-        return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509URLParameter
-     */
-    public function X509URL(): Parameter\X509URLParameter
-    {
-        return self::_checkType($this->get(Parameter\JWTParameter::P_X5U),
-            Parameter\X509URLParameter::class);
-    }
-    
-    /**
-     * Check that the parameter is an instance of the given class.
-     *
-     * @param \JWX\JWT\Parameter\JWTParameter $param Parameter
-     * @param string $cls Class name
-     * @throws \UnexpectedValueException
-     * @return \JWX\JWT\Parameter\JWTParameter
-     */
-    private static function _checkType(Parameter\JWTParameter $param, string $cls): Parameter\JWTParameter
-    {
-        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
+	 * @throws \LogicException If the parameter is not present
+	 * @return JWTParameter
+	 */
+	abstract public function get(string $name): JWTParameter;
+    
+	/**
+	 * Check whether the algorithm parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAlgorithm(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_ALG);
+	}
+    
+	/**
+	 * Get the algorithm parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\AlgorithmParameter
+	 */
+	public function algorithm(): Parameter\AlgorithmParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_ALG),
+			Parameter\AlgorithmParameter::class);
+	}
+    
+	/**
+	 * Check whether the authentication tag parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasAuthenticationTag(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_TAG);
+	}
+    
+	/**
+	 * Get the authentication tag parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\AuthenticationTagParameter
+	 */
+	public function authenticationTag(): Parameter\AuthenticationTagParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_TAG),
+			Parameter\AuthenticationTagParameter::class);
+	}
+    
+	/**
+	 * Check whether the 'base64url-encode payload' parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasB64Payload(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_B64);
+	}
+    
+	/**
+	 * Get the 'base64url-encode payload' parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\B64PayloadParameter
+	 */
+	public function B64Payload(): Parameter\B64PayloadParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_B64),
+			Parameter\B64PayloadParameter::class);
+	}
+    
+	/**
+	 * Check whether the compression algorithm parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCompressionAlgorithm(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_ZIP);
+	}
+    
+	/**
+	 * Get the compression algorithm parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\CompressionAlgorithmParameter
+	 */
+	public function compressionAlgorithm(): Parameter\CompressionAlgorithmParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_ZIP),
+			Parameter\CompressionAlgorithmParameter::class);
+	}
+    
+	/**
+	 * Check whether the content type parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasContentType(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_CTY);
+	}
+    
+	/**
+	 * Get the content type parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\ContentTypeParameter
+	 */
+	public function contentType(): Parameter\ContentTypeParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_CTY),
+			Parameter\ContentTypeParameter::class);
+	}
+    
+	/**
+	 * Check whether the critical parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCritical(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_CRIT);
+	}
+    
+	/**
+	 * Get the critical parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\CriticalParameter
+	 */
+	public function critical(): Parameter\CriticalParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_CRIT),
+			Parameter\CriticalParameter::class);
+	}
+    
+	/**
+	 * Check whether the encryption algorithm parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasEncryptionAlgorithm(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_ENC);
+	}
+    
+	/**
+	 * Get the encryption algorithm parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\EncryptionAlgorithmParameter
+	 */
+	public function encryptionAlgorithm(): Parameter\EncryptionAlgorithmParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_ENC),
+			Parameter\EncryptionAlgorithmParameter::class);
+	}
+    
+	/**
+	 * Check whether the initialization vector parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasInitializationVector(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_IV);
+	}
+    
+	/**
+	 * Get the initialization vector parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\InitializationVectorParameter
+	 */
+	public function initializationVector(): Parameter\InitializationVectorParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_IV),
+			Parameter\InitializationVectorParameter::class);
+	}
+    
+	/**
+	 * Check whether the JSON web key parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasJSONWebKey(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_JWK);
+	}
+    
+	/**
+	 * Get the JSON web key parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\JSONWebKeyParameter
+	 */
+	public function JSONWebKey(): Parameter\JSONWebKeyParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_JWK),
+			Parameter\JSONWebKeyParameter::class);
+	}
+    
+	/**
+	 * Check whether the JWK set URL parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasJWKSetURL(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_JKU);
+	}
+    
+	/**
+	 * Get the JWK set URL parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\JWKSetURLParameter
+	 */
+	public function JWKSetURL(): Parameter\JWKSetURLParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_JKU),
+			Parameter\JWKSetURLParameter::class);
+	}
+    
+	/**
+	 * Check whether the key ID parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasKeyID(): bool
+	{
+		return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\KeyIDParameter
+	 */
+	public function keyID(): Parameter\KeyIDParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_KID),
+			Parameter\KeyIDParameter::class);
+	}
+    
+	/**
+	 * Check whether the PBES2 count parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPBES2Count(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_P2C);
+	}
+    
+	/**
+	 * Get the PBES2 count parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\PBES2CountParameter
+	 */
+	public function PBES2Count(): Parameter\PBES2CountParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_P2C),
+			Parameter\PBES2CountParameter::class);
+	}
+    
+	/**
+	 * Check whether the PBES2 salt input parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPBES2SaltInput(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_P2S);
+	}
+    
+	/**
+	 * Get the PBES2 salt input parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\PBES2SaltInputParameter
+	 */
+	public function PBES2SaltInput(): Parameter\PBES2SaltInputParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_P2S),
+			Parameter\PBES2SaltInputParameter::class);
+	}
+    
+	/**
+	 * Check whether the type parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasType(): bool
+	{
+		return $this->has(Parameter\JWTParameter::P_TYP);
+	}
+    
+	/**
+	 * Get the type parameter.
+	 *
+	 * @throws \UnexpectedValueException If the parameter has a wrong class
+	 * @throws \LogicException If the parameter is not present
+	 * @return \JWX\JWT\Parameter\TypeParameter
+	 */
+	public function type(): Parameter\TypeParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_TYP),
+			Parameter\TypeParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 certificate chain parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509CertificateChain(): bool
+	{
+		return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509CertificateChainParameter
+	 */
+	public function X509CertificateChain(): Parameter\X509CertificateChainParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_X5C),
+			Parameter\X509CertificateChainParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 certificate SHA-1 thumbprint parameter is
+	 * present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509CertificateSHA1Thumbprint(): bool
+	{
+		return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509CertificateSHA1ThumbprintParameter
+	 */
+	public function X509CertificateSHA1Thumbprint(): Parameter\X509CertificateSHA1ThumbprintParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_X5T),
+			Parameter\X509CertificateSHA1ThumbprintParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 certificate SHA-256 thumbprint parameter is
+	 * present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509CertificateSHA256Thumbprint(): bool
+	{
+		return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509CertificateSHA256ThumbprintParameter
+	 */
+	public function X509CertificateSHA256Thumbprint(): Parameter\X509CertificateSHA256ThumbprintParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_X5TS256),
+			Parameter\X509CertificateSHA256ThumbprintParameter::class);
+	}
+    
+	/**
+	 * Check whether the X.509 URL parameter is present.
+	 *
+	 * @return bool
+	 */
+	public function hasX509URL(): bool
+	{
+		return $this->has(Parameter\JWTParameter::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 \JWX\JWT\Parameter\X509URLParameter
+	 */
+	public function X509URL(): Parameter\X509URLParameter
+	{
+		return self::_checkType($this->get(Parameter\JWTParameter::P_X5U),
+			Parameter\X509URLParameter::class);
+	}
+    
+	/**
+	 * Check that the parameter is an instance of the given class.
+	 *
+	 * @param \JWX\JWT\Parameter\JWTParameter $param Parameter
+	 * @param string $cls Class name
+	 * @throws \UnexpectedValueException
+	 * @return \JWX\JWT\Parameter\JWTParameter
+	 */
+	private static function _checkType(Parameter\JWTParameter $param, string $cls): Parameter\JWTParameter
+	{
+		if (!$param instanceof $cls) {
+			throw new \UnexpectedValueException(
+				"$cls expected, got " . get_class($param));
+		}
+		return $param;
+	}
 }

lib/JWX/JWT/Header/JOSE.php

Indentation +46 added lines, -46 removed lines

@@ -15,53 +15,53 @@
  */
 class JOSE extends Header
 {
-    /**
-     * Constructor.
-     *
-     * @param Header ...$headers One or more headers to merge
-     */
-    public function __construct(Header ...$headers)
-    {
-        $params = array();
-        foreach ($headers as $header) {
-            foreach ($header->parameters() as $param) {
-                if (isset($params[$param->name()])) {
-                    throw new \UnexpectedValueException("Duplicate parameter.");
-                }
-                $params[$param->name()] = $param;
-            }
-        }
-        parent::__construct(...array_values($params));
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Header ...$headers One or more headers to merge
+	 */
+	public function __construct(Header ...$headers)
+	{
+		$params = array();
+		foreach ($headers as $header) {
+			foreach ($header->parameters() as $param) {
+				if (isset($params[$param->name()])) {
+					throw new \UnexpectedValueException("Duplicate parameter.");
+				}
+				$params[$param->name()] = $param;
+			}
+		}
+		parent::__construct(...array_values($params));
+	}
     
-    /**
-     * Get self merged with another Header.
-     *
-     * @param Header $header
-     * @return self
-     */
-    public function withHeader(Header $header): self
-    {
-        return new self($this, $header);
-    }
+	/**
+	 * Get self merged with another Header.
+	 *
+	 * @param Header $header
+	 * @return self
+	 */
+	public function withHeader(Header $header): self
+	{
+		return new self($this, $header);
+	}
     
-    /**
-     * Whether JOSE is for a JWS.
-     *
-     * @return bool
-     */
-    public function isJWS(): bool
-    {
-        return $this->hasAlgorithm() && !$this->hasEncryptionAlgorithm();
-    }
+	/**
+	 * Whether JOSE is for a JWS.
+	 *
+	 * @return bool
+	 */
+	public function isJWS(): bool
+	{
+		return $this->hasAlgorithm() && !$this->hasEncryptionAlgorithm();
+	}
     
-    /**
-     * Whether JOSE is for a JWE.
-     *
-     * @return bool
-     */
-    public function isJWE(): bool
-    {
-        return $this->hasEncryptionAlgorithm();
-    }
+	/**
+	 * Whether JOSE is for a JWE.
+	 *
+	 * @return bool
+	 */
+	public function isJWE(): bool
+	{
+		return $this->hasEncryptionAlgorithm();
+	}
 }

lib/JWX/JWT/Header/Header.php

Indentation +138 added lines, -138 removed lines

@@ -11,153 +11,153 @@
  */
 class Header implements \Countable, \IteratorAggregate
 {
-    use TypedHeader;
+	use TypedHeader;
     
-    /**
-     * Parameters.
-     *
-     * @var JWTParameter[] $_parameters
-     */
-    protected $_parameters;
+	/**
+	 * Parameters.
+	 *
+	 * @var JWTParameter[] $_parameters
+	 */
+	protected $_parameters;
     
-    /**
-     * Constructor.
-     *
-     * @param JWTParameter ...$params Parameters
-     */
-    public function __construct(JWTParameter ...$params)
-    {
-        $this->_parameters = array();
-        foreach ($params as $param) {
-            $this->_parameters[$param->name()] = $param;
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param JWTParameter ...$params Parameters
+	 */
+	public function __construct(JWTParameter ...$params)
+	{
+		$this->_parameters = array();
+		foreach ($params as $param) {
+			$this->_parameters[$param->name()] = $param;
+		}
+	}
     
-    /**
-     * Initialize from an array representing a JSON object.
-     *
-     * @param array $members
-     * @return self
-     */
-    public static function fromArray(array $members): self
-    {
-        $params = array();
-        foreach ($members as $name => $value) {
-            $params[] = JWTParameter::fromNameAndValue($name, $value);
-        }
-        return new self(...$params);
-    }
+	/**
+	 * Initialize from an array representing a JSON object.
+	 *
+	 * @param array $members
+	 * @return self
+	 */
+	public static function fromArray(array $members): self
+	{
+		$params = array();
+		foreach ($members as $name => $value) {
+			$params[] = JWTParameter::fromNameAndValue($name, $value);
+		}
+		return new self(...$params);
+	}
     
-    /**
-     * Initialize from a JSON.
-     *
-     * @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);
-    }
+	/**
+	 * Initialize from a JSON.
+	 *
+	 * @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 parameters added.
-     *
-     * @param JWTParameter ...$param
-     * @return self
-     */
-    public function withParameters(JWTParameter ...$params): self
-    {
-        $obj = clone $this;
-        foreach ($params as $param) {
-            $obj->_parameters[$param->name()] = $param;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with parameters added.
+	 *
+	 * @param JWTParameter ...$param
+	 * @return self
+	 */
+	public function withParameters(JWTParameter ...$params): self
+	{
+		$obj = clone $this;
+		foreach ($params as $param) {
+			$obj->_parameters[$param->name()] = $param;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get all parameters.
-     *
-     * @return JWTParameter[]
-     */
-    public function parameters(): array
-    {
-        return $this->_parameters;
-    }
+	/**
+	 * Get all parameters.
+	 *
+	 * @return JWTParameter[]
+	 */
+	public function parameters(): array
+	{
+		return $this->_parameters;
+	}
     
-    /**
-     * Whether parameters are present.
-     *
-     * Returns false if any of the given parameters is not set.
-     *
-     * @param string ...$names Parameter names
-     * @return bool
-     */
-    public function has(string ...$names): bool
-    {
-        foreach ($names as $name) {
-            if (!isset($this->_parameters[$name])) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Whether parameters are present.
+	 *
+	 * Returns false if any of the given parameters is not set.
+	 *
+	 * @param string ...$names Parameter names
+	 * @return bool
+	 */
+	public function has(string ...$names): bool
+	{
+		foreach ($names as $name) {
+			if (!isset($this->_parameters[$name])) {
+				return false;
+			}
+		}
+		return true;
+	}
     
-    /**
-     * Get a parameter.
-     *
-     * @param string $name Parameter name
-     * @throws \LogicException
-     * @return JWTParameter
-     */
-    public function get(string $name): JWTParameter
-    {
-        if (!$this->has($name)) {
-            throw new \LogicException("Parameter $name doesn't exists.");
-        }
-        return $this->_parameters[$name];
-    }
+	/**
+	 * Get a parameter.
+	 *
+	 * @param string $name Parameter name
+	 * @throws \LogicException
+	 * @return JWTParameter
+	 */
+	public function get(string $name): JWTParameter
+	{
+		if (!$this->has($name)) {
+			throw new \LogicException("Parameter $name doesn't exists.");
+		}
+		return $this->_parameters[$name];
+	}
     
-    /**
-     * Convert to a JSON.
-     *
-     * @return string
-     */
-    public function toJSON(): string
-    {
-        if (empty($this->_parameters)) {
-            return "";
-        }
-        $data = array();
-        foreach ($this->_parameters as $param) {
-            $data[$param->name()] = $param->value();
-        }
-        return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
-    }
+	/**
+	 * Convert to a JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON(): string
+	{
+		if (empty($this->_parameters)) {
+			return "";
+		}
+		$data = array();
+		foreach ($this->_parameters as $param) {
+			$data[$param->name()] = $param->value();
+		}
+		return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
+	}
     
-    /**
-     * Get the number of parameters.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_parameters);
-    }
+	/**
+	 * Get the number of parameters.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_parameters);
+	}
     
-    /**
-     * Get iterator for the parameters.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_parameters);
-    }
+	/**
+	 * Get iterator for the parameters.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_parameters);
+	}
 }

lib/JWX/JWT/ValidationContext.php

Indentation +279 added lines, -279 removed lines

@@ -26,308 +26,308 @@
  */
 class ValidationContext
 {
-    /**
-     * Reference time.
-     *
-     * @var int $_refTime
-     */
-    protected $_refTime;
+	/**
+	 * Reference time.
+	 *
+	 * @var int $_refTime
+	 */
+	protected $_refTime;
     
-    /**
-     * Leeway in seconds for the reference time constraints.
-     *
-     * @var int $_leeway
-     */
-    protected $_leeway;
+	/**
+	 * Leeway in seconds for the reference time constraints.
+	 *
+	 * @var int $_leeway
+	 */
+	protected $_leeway;
     
-    /**
-     * Validation constraints.
-     *
-     * @var array $_constraints
-     */
-    protected $_constraints;
+	/**
+	 * Validation constraints.
+	 *
+	 * @var array $_constraints
+	 */
+	protected $_constraints;
     
-    /**
-     * Explicitly defined validators for named claims.
-     *
-     * @var Validator[] $_validators
-     */
-    protected $_validators;
+	/**
+	 * Explicitly defined validators for named claims.
+	 *
+	 * @var Validator[] $_validators
+	 */
+	protected $_validators;
     
-    /**
-     * Set of JSON Web Keys usable for the validation.
-     *
-     * @var JWKSet $_keys
-     */
-    protected $_keys;
+	/**
+	 * Set of JSON Web Keys usable for the validation.
+	 *
+	 * @var JWKSet $_keys
+	 */
+	protected $_keys;
     
-    /**
-     * Whether to allow unsecured JWT's, that is, claims without integrity
-     * protection nor encryption.
-     *
-     * @var bool $_allowUnsecured
-     */
-    protected $_allowUnsecured;
+	/**
+	 * Whether to allow unsecured JWT's, that is, claims without integrity
+	 * protection nor encryption.
+	 *
+	 * @var bool $_allowUnsecured
+	 */
+	protected $_allowUnsecured;
     
-    /**
-     * Constructor.
-     *
-     * @param array $constraints Optional array of constraints for the
-     *        registered claims
-     * @param JWKSet $keys Optional set of JSON Web Keys used for signature
-     *        validation and/or decryption
-     */
-    public function __construct(array $constraints = null, JWKSet $keys = null)
-    {
-        $this->_refTime = time();
-        $this->_leeway = 60;
-        $this->_constraints = $constraints ? $constraints : array();
-        $this->_validators = array();
-        $this->_keys = $keys ? $keys : new JWKSet();
-        $this->_allowUnsecured = false;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param array $constraints Optional array of constraints for the
+	 *        registered claims
+	 * @param JWKSet $keys Optional set of JSON Web Keys used for signature
+	 *        validation and/or decryption
+	 */
+	public function __construct(array $constraints = null, JWKSet $keys = null)
+	{
+		$this->_refTime = time();
+		$this->_leeway = 60;
+		$this->_constraints = $constraints ? $constraints : array();
+		$this->_validators = array();
+		$this->_keys = $keys ? $keys : new JWKSet();
+		$this->_allowUnsecured = false;
+	}
     
-    /**
-     * Initialize with a single JSON Web Key.
-     *
-     * @param JWK $key JSON Web Key
-     * @param array $constraints Optional constraints
-     * @return self
-     */
-    public static function fromJWK(JWK $key, array $constraints = null): self
-    {
-        return new self($constraints, new JWKSet($key));
-    }
+	/**
+	 * Initialize with a single JSON Web Key.
+	 *
+	 * @param JWK $key JSON Web Key
+	 * @param array $constraints Optional constraints
+	 * @return self
+	 */
+	public static function fromJWK(JWK $key, array $constraints = null): self
+	{
+		return new self($constraints, new JWKSet($key));
+	}
     
-    /**
-     * Get self with the reference time.
-     *
-     * @param int|null $ts Unix timestamp
-     * @return self
-     */
-    public function withReferenceTime($ts): self
-    {
-        $obj = clone $this;
-        $obj->_refTime = $ts;
-        return $obj;
-    }
+	/**
+	 * Get self with the reference time.
+	 *
+	 * @param int|null $ts Unix timestamp
+	 * @return self
+	 */
+	public function withReferenceTime($ts): self
+	{
+		$obj = clone $this;
+		$obj->_refTime = $ts;
+		return $obj;
+	}
     
-    /**
-     * Check whether the reference time is set.
-     *
-     * @return bool
-     */
-    public function hasReferenceTime(): bool
-    {
-        return isset($this->_refTime);
-    }
+	/**
+	 * Check whether the reference time is set.
+	 *
+	 * @return bool
+	 */
+	public function hasReferenceTime(): bool
+	{
+		return isset($this->_refTime);
+	}
     
-    /**
-     * Get the reference time.
-     *
-     * @throws \LogicException
-     * @return int
-     */
-    public function referenceTime(): int
-    {
-        if (!$this->hasReferenceTime()) {
-            throw new \LogicException("Reference time not set.");
-        }
-        return $this->_refTime;
-    }
+	/**
+	 * Get the reference time.
+	 *
+	 * @throws \LogicException
+	 * @return int
+	 */
+	public function referenceTime(): int
+	{
+		if (!$this->hasReferenceTime()) {
+			throw new \LogicException("Reference time not set.");
+		}
+		return $this->_refTime;
+	}
     
-    /**
-     * Get self with the reference time leeway.
-     *
-     * @param int $seconds
-     * @return self
-     */
-    public function withLeeway(int $seconds): self
-    {
-        $obj = clone $this;
-        $obj->_leeway = $seconds;
-        return $obj;
-    }
+	/**
+	 * Get self with the reference time leeway.
+	 *
+	 * @param int $seconds
+	 * @return self
+	 */
+	public function withLeeway(int $seconds): self
+	{
+		$obj = clone $this;
+		$obj->_leeway = $seconds;
+		return $obj;
+	}
     
-    /**
-     * Get the reference time leeway.
-     *
-     * @return int
-     */
-    public function leeway(): int
-    {
-        return $this->_leeway;
-    }
+	/**
+	 * Get the reference time leeway.
+	 *
+	 * @return int
+	 */
+	public function leeway(): int
+	{
+		return $this->_leeway;
+	}
     
-    /**
-     * Get self with a validation constraint.
-     *
-     * If the claim does not provide its own validator, an explicit validator
-     * must be given.
-     *
-     * @param string $name Claim name
-     * @param mixed $constraint Value to check claim against
-     * @param Validator|null $validator Optional explicit validator
-     * @return self
-     */
-    public function withConstraint(string $name, $constraint,
-        Validator $validator = null): self
-    {
-        $obj = clone $this;
-        $obj->_constraints[$name] = $constraint;
-        if ($validator) {
-            $obj->_validators[$name] = $validator;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with a validation constraint.
+	 *
+	 * If the claim does not provide its own validator, an explicit validator
+	 * must be given.
+	 *
+	 * @param string $name Claim name
+	 * @param mixed $constraint Value to check claim against
+	 * @param Validator|null $validator Optional explicit validator
+	 * @return self
+	 */
+	public function withConstraint(string $name, $constraint,
+		Validator $validator = null): self
+	{
+		$obj = clone $this;
+		$obj->_constraints[$name] = $constraint;
+		if ($validator) {
+			$obj->_validators[$name] = $validator;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get self with the issuer constraint.
-     *
-     * @param string $issuer Issuer name
-     * @return self
-     */
-    public function withIssuer(string $issuer): self
-    {
-        return $this->withConstraint(RegisteredClaim::NAME_ISSUER, $issuer);
-    }
+	/**
+	 * Get self with the issuer constraint.
+	 *
+	 * @param string $issuer Issuer name
+	 * @return self
+	 */
+	public function withIssuer(string $issuer): self
+	{
+		return $this->withConstraint(RegisteredClaim::NAME_ISSUER, $issuer);
+	}
     
-    /**
-     * Get self with the subject constraint.
-     *
-     * @param string $subject Subject name
-     * @return self
-     */
-    public function withSubject(string $subject): self
-    {
-        return $this->withConstraint(RegisteredClaim::NAME_SUBJECT, $subject);
-    }
+	/**
+	 * Get self with the subject constraint.
+	 *
+	 * @param string $subject Subject name
+	 * @return self
+	 */
+	public function withSubject(string $subject): self
+	{
+		return $this->withConstraint(RegisteredClaim::NAME_SUBJECT, $subject);
+	}
     
-    /**
-     * Get self with the audience constraint.
-     *
-     * @param string $audience Audience name
-     * @return self
-     */
-    public function withAudience(string $audience): self
-    {
-        return $this->withConstraint(RegisteredClaim::NAME_AUDIENCE, $audience);
-    }
+	/**
+	 * Get self with the audience constraint.
+	 *
+	 * @param string $audience Audience name
+	 * @return self
+	 */
+	public function withAudience(string $audience): self
+	{
+		return $this->withConstraint(RegisteredClaim::NAME_AUDIENCE, $audience);
+	}
     
-    /**
-     * Get self with the JWT ID constraint.
-     *
-     * @param string $id JWT ID
-     * @return self
-     */
-    public function withID(string $id): self
-    {
-        return $this->withConstraint(RegisteredClaim::NAME_JWT_ID, $id);
-    }
+	/**
+	 * Get self with the JWT ID constraint.
+	 *
+	 * @param string $id JWT ID
+	 * @return self
+	 */
+	public function withID(string $id): self
+	{
+		return $this->withConstraint(RegisteredClaim::NAME_JWT_ID, $id);
+	}
     
-    /**
-     * Check whether a named constraint is present.
-     *
-     * @param string $name Claim name
-     * @return bool
-     */
-    public function hasConstraint(string $name): bool
-    {
-        return isset($this->_constraints[$name]);
-    }
+	/**
+	 * Check whether a named constraint is present.
+	 *
+	 * @param string $name Claim name
+	 * @return bool
+	 */
+	public function hasConstraint(string $name): bool
+	{
+		return isset($this->_constraints[$name]);
+	}
     
-    /**
-     * Get a constraint value by the claim name.
-     *
-     * @param string $name Claim name
-     * @throws \LogicException If constraint is not set
-     * @return mixed Constraint value
-     */
-    public function constraint(string $name)
-    {
-        if (!$this->hasConstraint($name)) {
-            throw new \LogicException("Constraint $name not set.");
-        }
-        return $this->_constraints[$name];
-    }
+	/**
+	 * Get a constraint value by the claim name.
+	 *
+	 * @param string $name Claim name
+	 * @throws \LogicException If constraint is not set
+	 * @return mixed Constraint value
+	 */
+	public function constraint(string $name)
+	{
+		if (!$this->hasConstraint($name)) {
+			throw new \LogicException("Constraint $name not set.");
+		}
+		return $this->_constraints[$name];
+	}
     
-    /**
-     * Check whether a validator is defined for the given claim name.
-     *
-     * @param string $name Claim name
-     * @return bool
-     */
-    public function hasValidator(string $name): bool
-    {
-        return isset($this->_validators[$name]);
-    }
+	/**
+	 * Check whether a validator is defined for the given claim name.
+	 *
+	 * @param string $name Claim name
+	 * @return bool
+	 */
+	public function hasValidator(string $name): bool
+	{
+		return isset($this->_validators[$name]);
+	}
     
-    /**
-     * Get explicitly defined validator by the claim name.
-     *
-     * @param string $name Claim name
-     * @throws \LogicException If validator is not set
-     * @return Validator
-     */
-    public function validator(string $name): Validator
-    {
-        if (!$this->hasValidator($name)) {
-            throw new \LogicException("Validator $name not set.");
-        }
-        return $this->_validators[$name];
-    }
+	/**
+	 * Get explicitly defined validator by the claim name.
+	 *
+	 * @param string $name Claim name
+	 * @throws \LogicException If validator is not set
+	 * @return Validator
+	 */
+	public function validator(string $name): Validator
+	{
+		if (!$this->hasValidator($name)) {
+			throw new \LogicException("Validator $name not set.");
+		}
+		return $this->_validators[$name];
+	}
     
-    /**
-     * Get a set of JSON Web Keys defined in this context.
-     *
-     * @return JWKSet
-     */
-    public function keys(): JWKSet
-    {
-        return $this->_keys;
-    }
+	/**
+	 * Get a set of JSON Web Keys defined in this context.
+	 *
+	 * @return JWKSet
+	 */
+	public function keys(): JWKSet
+	{
+		return $this->_keys;
+	}
     
-    /**
-     * Get self with 'allow unsecured' flag set.
-     *
-     * If the unsecured JWT's are allowed, claims shall be considered valid even
-     * though they are not signed nor encrypted.
-     *
-     * @param bool $allow Whether to allow unsecured JWT's
-     * @return self
-     */
-    public function withUnsecuredAllowed(bool $allow): self
-    {
-        $obj = clone $this;
-        $obj->_allowUnsecured = $allow;
-        return $obj;
-    }
+	/**
+	 * Get self with 'allow unsecured' flag set.
+	 *
+	 * If the unsecured JWT's are allowed, claims shall be considered valid even
+	 * though they are not signed nor encrypted.
+	 *
+	 * @param bool $allow Whether to allow unsecured JWT's
+	 * @return self
+	 */
+	public function withUnsecuredAllowed(bool $allow): self
+	{
+		$obj = clone $this;
+		$obj->_allowUnsecured = $allow;
+		return $obj;
+	}
     
-    /**
-     * Check whether the unsecured JWT's are allowed.
-     *
-     * @return bool
-     */
-    public function isUnsecuredAllowed(): bool
-    {
-        return $this->_allowUnsecured;
-    }
+	/**
+	 * Check whether the unsecured JWT's are allowed.
+	 *
+	 * @return bool
+	 */
+	public function isUnsecuredAllowed(): bool
+	{
+		return $this->_allowUnsecured;
+	}
     
-    /**
-     * Validate claims.
-     *
-     * @param Claims $claims
-     * @throws ValidationException If any of the claims is not valid
-     * @return self
-     */
-    public function validate(Claims $claims): self
-    {
-        foreach ($claims as $claim) {
-            if (!$claim->validateWithContext($this)) {
-                throw new ValidationException(
-                    "Validation of claim '" . $claim->name() . "' failed.");
-            }
-        }
-        return $this;
-    }
+	/**
+	 * Validate claims.
+	 *
+	 * @param Claims $claims
+	 * @throws ValidationException If any of the claims is not valid
+	 * @return self
+	 */
+	public function validate(Claims $claims): self
+	{
+		foreach ($claims as $claim) {
+			if (!$claim->validateWithContext($this)) {
+				throw new ValidationException(
+					"Validation of claim '" . $claim->name() . "' failed.");
+			}
+		}
+		return $this;
+	}
 }

lib/JWX/JWT/Parameter/EncryptionAlgorithmParameterValue.php

Indentation +6 added lines, -6 removed lines

@@ -9,10 +9,10 @@
  */
 interface EncryptionAlgorithmParameterValue
 {
-    /**
-     * Get algorithm type as an 'enc' parameter value.
-     *
-     * @return string
-     */
-    public function encryptionAlgorithmParamValue(): string;
+	/**
+	 * Get algorithm type as an 'enc' parameter value.
+	 *
+	 * @return string
+	 */
+	public function encryptionAlgorithmParamValue(): string;
 }

lib/JWX/JWT/Parameter/X509URLParameter.php

Indentation +10 added lines, -10 removed lines

@@ -13,15 +13,15 @@
  */
 class X509URLParameter extends JWTParameter
 {
-    use StringParameterValue;
+	use StringParameterValue;
     
-    /**
-     * Constructor.
-     *
-     * @param string $uri
-     */
-    public function __construct(string $uri)
-    {
-        parent::__construct(self::PARAM_X509_URL, $uri);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uri
+	 */
+	public function __construct(string $uri)
+	{
+		parent::__construct(self::PARAM_X509_URL, $uri);
+	}
 }