sop / jwx

lib/JWX/JWK/JWKSet.php

Spacing +2 added lines, -2 removed lines

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

Indentation +223 added lines, -223 removed lines

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

lib/JWX/JWK/Parameter/OtherPrimesInfoParameter.php

Indentation +10 added lines, -10 removed lines

@@ -12,15 +12,15 @@
  */
 class OtherPrimesInfoParameter extends JWKParameter
 {
-    use ArrayParameterValue;
+	use ArrayParameterValue;
     
-    /**
-     * Constructor.
-     *
-     * @param array[] ...$primes
-     */
-    public function __construct(...$primes)
-    {
-        parent::__construct(self::PARAM_OTHER_PRIMES_INFO, $primes);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param array[] ...$primes
+	 */
+	public function __construct(...$primes)
+	{
+		parent::__construct(self::PARAM_OTHER_PRIMES_INFO, $primes);
+	}
 }

lib/JWX/JWT/Claim/ExpirationTimeClaim.php

Indentation +13 added lines, -13 removed lines

@@ -13,18 +13,18 @@
  */
 class ExpirationTimeClaim extends RegisteredClaim
 {
-    use NumericDateClaim;
-    use ReferenceTimeValidation;
+	use NumericDateClaim;
+	use ReferenceTimeValidation;
     
-    /**
-     * Constructor.
-     *
-     * @param int $exp_time Expiration time
-     */
-    public function __construct($exp_time)
-    {
-        // validate that claim is after the constraint (reference time)
-        parent::__construct(self::NAME_EXPIRATION_TIME, intval($exp_time),
-            new GreaterValidator());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $exp_time Expiration time
+	 */
+	public function __construct($exp_time)
+	{
+		// validate that claim is after the constraint (reference time)
+		parent::__construct(self::NAME_EXPIRATION_TIME, intval($exp_time),
+			new GreaterValidator());
+	}
 }

lib/JWX/JWT/Claim/RegisteredClaim.php

Indentation +77 added lines, -77 removed lines

@@ -9,85 +9,85 @@
  */
 abstract class RegisteredClaim extends Claim
 {
-    // JWT claims
-    const NAME_ISSUER = "iss";
-    const NAME_SUBJECT = "sub";
-    const NAME_AUDIENCE = "aud";
-    const NAME_EXPIRATION_TIME = "exp";
-    const NAME_NOT_BEFORE = "nbf";
-    const NAME_ISSUED_AT = "iat";
-    const NAME_JWT_ID = "jti";
+	// JWT claims
+	const NAME_ISSUER = "iss";
+	const NAME_SUBJECT = "sub";
+	const NAME_AUDIENCE = "aud";
+	const NAME_EXPIRATION_TIME = "exp";
+	const NAME_NOT_BEFORE = "nbf";
+	const NAME_ISSUED_AT = "iat";
+	const NAME_JWT_ID = "jti";
     
-    // OpenID claims
-    const NAME_FULL_NAME = "name";
-    const NAME_GIVEN_NAME = "given_name";
-    const NAME_FAMILY_NAME = "family_name";
-    const NAME_MIDDLE_NAME = "middle_name";
-    const NAME_NICKNAME = "nickname";
-    const NAME_PREFERRED_USERNAME = "preferred_username";
-    const NAME_PROFILE_URL = "profile";
-    const NAME_PICTURE_URL = "picture";
-    const NAME_WEBSITE_URL = "website";
-    const NAME_EMAIL = "email";
-    const NAME_EMAIL_VERIFIED = "email_verified";
-    const NAME_GENDER = "gender";
-    const NAME_BIRTHDATE = "birthdate";
-    const NAME_TIMEZONE = "zoneinfo";
-    const NAME_LOCALE = "locale";
-    const NAME_PHONE_NUMBER = "phone_number";
-    const NAME_PHONE_NUMBER_VERIFIED = "phone_number_verified";
-    const NAME_ADDRESS = "address";
-    const NAME_UPDATED_AT = "updated_at";
-    const NAME_AUTHORIZED_PARTY = "azp";
-    const NAME_NONCE = "nonce";
-    const NAME_AUTH_TIME = "auth_time";
-    const NAME_ACCESS_TOKEN_HASH = "at_hash";
-    const NAME_CODE_HASH = "c_hash";
-    const NAME_ACR = "acr";
-    const NAME_AMR = "amr";
-    const NAME_SUB_JWK = "sub_jwk";
+	// OpenID claims
+	const NAME_FULL_NAME = "name";
+	const NAME_GIVEN_NAME = "given_name";
+	const NAME_FAMILY_NAME = "family_name";
+	const NAME_MIDDLE_NAME = "middle_name";
+	const NAME_NICKNAME = "nickname";
+	const NAME_PREFERRED_USERNAME = "preferred_username";
+	const NAME_PROFILE_URL = "profile";
+	const NAME_PICTURE_URL = "picture";
+	const NAME_WEBSITE_URL = "website";
+	const NAME_EMAIL = "email";
+	const NAME_EMAIL_VERIFIED = "email_verified";
+	const NAME_GENDER = "gender";
+	const NAME_BIRTHDATE = "birthdate";
+	const NAME_TIMEZONE = "zoneinfo";
+	const NAME_LOCALE = "locale";
+	const NAME_PHONE_NUMBER = "phone_number";
+	const NAME_PHONE_NUMBER_VERIFIED = "phone_number_verified";
+	const NAME_ADDRESS = "address";
+	const NAME_UPDATED_AT = "updated_at";
+	const NAME_AUTHORIZED_PARTY = "azp";
+	const NAME_NONCE = "nonce";
+	const NAME_AUTH_TIME = "auth_time";
+	const NAME_ACCESS_TOKEN_HASH = "at_hash";
+	const NAME_CODE_HASH = "c_hash";
+	const NAME_ACR = "acr";
+	const NAME_AMR = "amr";
+	const NAME_SUB_JWK = "sub_jwk";
     
-    /**
-     * Mapping from registered claim name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_NAME_TO_CLASS = array(
-        /* @formatter:off */
-        self::NAME_ISSUER => IssuerClaim::class,
-        self::NAME_SUBJECT => SubjectClaim::class,
-        self::NAME_AUDIENCE => AudienceClaim::class,
-        self::NAME_EXPIRATION_TIME => ExpirationTimeClaim::class,
-        self::NAME_NOT_BEFORE => NotBeforeClaim::class,
-        self::NAME_ISSUED_AT => IssuedAtClaim::class,
-        self::NAME_JWT_ID => JWTIDClaim::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from registered claim name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_NAME_TO_CLASS = array(
+		/* @formatter:off */
+		self::NAME_ISSUER => IssuerClaim::class,
+		self::NAME_SUBJECT => SubjectClaim::class,
+		self::NAME_AUDIENCE => AudienceClaim::class,
+		self::NAME_EXPIRATION_TIME => ExpirationTimeClaim::class,
+		self::NAME_NOT_BEFORE => NotBeforeClaim::class,
+		self::NAME_ISSUED_AT => IssuedAtClaim::class,
+		self::NAME_JWT_ID => JWTIDClaim::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * Defined here for type strictness. Parameters are passed to the
-     * superclass.
-     *
-     * @param mixed ...$args
-     */
-    public function __construct(...$args)
-    {
-        parent::__construct((string) $args[0], $args[1],
-            isset($args[2]) ? $args[2] : null);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * Defined here for type strictness. Parameters are passed to the
+	 * superclass.
+	 *
+	 * @param mixed ...$args
+	 */
+	public function __construct(...$args)
+	{
+		parent::__construct((string) $args[0], $args[1],
+			isset($args[2]) ? $args[2] : null);
+	}
     
-    /**
-     * Initialize concrete claim instance from a JSON value.
-     *
-     * @param mixed $value
-     * @return RegisteredClaim
-     */
-    public static function fromJSONValue($value)
-    {
-        return new static($value);
-    }
+	/**
+	 * Initialize concrete claim instance from a JSON value.
+	 *
+	 * @param mixed $value
+	 * @return RegisteredClaim
+	 */
+	public static function fromJSONValue($value)
+	{
+		return new static($value);
+	}
 }

lib/JWX/JWT/Parameter/ReplicatedClaimParameter.php

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@
  */
 class ReplicatedClaimParameter extends JWTParameter
 {
-    /**
-     * Constructor.
-     *
-     * @param Claim $claim
-     */
-    public function __construct(Claim $claim)
-    {
-        parent::__construct($claim->name(), $claim->value());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Claim $claim
+	 */
+	public function __construct(Claim $claim)
+	{
+		parent::__construct($claim->name(), $claim->value());
+	}
 }

lib/JWX/Util/UUIDv4.php

Spacing +2 added lines, -2 removed lines

@@ -70,9 +70,9 @@
             // time_mid
             mt_rand(0, 0xffff), 
             // time_hi_and_version
-            mt_rand(0, 0x0fff) | 0x4000, 
+            mt_rand(0, 0x0fff)|0x4000, 
             // clk_seq_hi_res
-            mt_rand(0, 0x3f) | 0x80, 
+            mt_rand(0, 0x3f)|0x80, 
             // clk_seq_low
             mt_rand(0, 0xff), 
             // node

Indentation +56 added lines, -56 removed lines

@@ -30,32 +30,32 @@ 
  */
 class UUIDv4
 {
-    /**
-     * UUID.
-     *
-     * @var string $_uuid
-     */
-    protected $_uuid;
+	/**
+	 * UUID.
+	 *
+	 * @var string $_uuid
+	 */
+	protected $_uuid;
     
-    /**
-     * Constructor.
-     *
-     * @param string $uuid UUIDv4 in canonical hexadecimal format
-     */
-    public function __construct(string $uuid)
-    {
-        // @todo Check that UUID is version 4
-        $this->_uuid = $uuid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uuid UUIDv4 in canonical hexadecimal format
+	 */
+	public function __construct(string $uuid)
+	{
+		// @todo Check that UUID is version 4
+		$this->_uuid = $uuid;
+	}
     
-    /**
-     * Create new random UUIDv4.
-     *
-     * @return self
-     */
-    public static function createRandom(): self
-    {
-        /*
+	/**
+	 * Create new random UUIDv4.
+	 *
+	 * @return self
+	 */
+	public static function createRandom(): self
+	{
+		/*
          1. Set the two most significant bits (bits 6 and 7) of
          the clock_seq_hi_and_reserved to zero and one, respectively.
          
@@ -66,38 +66,38 @@ 
          3. Set all the other bits to randomly (or pseudo-randomly)
          chosen values.
          */
-        $uuid = sprintf("%04x%04x-%04x-%04x-%02x%02x-%04x%04x%04x",
-            // time_low
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), 
-            // time_mid
-            mt_rand(0, 0xffff), 
-            // time_hi_and_version
-            mt_rand(0, 0x0fff) | 0x4000, 
-            // clk_seq_hi_res
-            mt_rand(0, 0x3f) | 0x80, 
-            // clk_seq_low
-            mt_rand(0, 0xff), 
-            // node
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
-        return new self($uuid);
-    }
+		$uuid = sprintf("%04x%04x-%04x-%04x-%02x%02x-%04x%04x%04x",
+			// time_low
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), 
+			// time_mid
+			mt_rand(0, 0xffff), 
+			// time_hi_and_version
+			mt_rand(0, 0x0fff) | 0x4000, 
+			// clk_seq_hi_res
+			mt_rand(0, 0x3f) | 0x80, 
+			// clk_seq_low
+			mt_rand(0, 0xff), 
+			// node
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
+		return new self($uuid);
+	}
     
-    /**
-     * Get UUIDv4 in canonical form.
-     *
-     * @return string
-     */
-    public function canonical(): string
-    {
-        return $this->_uuid;
-    }
+	/**
+	 * Get UUIDv4 in canonical form.
+	 *
+	 * @return string
+	 */
+	public function canonical(): string
+	{
+		return $this->_uuid;
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->canonical();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->canonical();
+	}
 }

lib/JWX/Parameter/Feature/ArrayParameterValue.php

Indentation +20 added lines, -20 removed lines

@@ -7,25 +7,25 @@
  */
 trait ArrayParameterValue
 {
-    /**
-     * Constructor.
-     *
-     * @param mixed ...$values
-     */
-    abstract public function __construct(...$values);
+	/**
+	 * Constructor.
+	 *
+	 * @param mixed ...$values
+	 */
+	abstract public function __construct(...$values);
     
-    /**
-     * Initialize from a JSON value.
-     *
-     * @param array $value
-     * @return static
-     */
-    public static function fromJSONValue($value)
-    {
-        if (!is_array($value)) {
-            throw new \UnexpectedValueException(
-                get_called_class() . " expects an array parameter.");
-        }
-        return new static(...$value);
-    }
+	/**
+	 * Initialize from a JSON value.
+	 *
+	 * @param array $value
+	 * @return static
+	 */
+	public static function fromJSONValue($value)
+	{
+		if (!is_array($value)) {
+			throw new \UnexpectedValueException(
+				get_called_class() . " expects an array parameter.");
+		}
+		return new static(...$value);
+	}
 }

lib/JWX/JWS/Algorithm/HMACAlgorithm.php

Indentation +81 added lines, -81 removed lines

@@ -18,92 +18,92 @@
  */
 abstract class HMACAlgorithm extends SignatureAlgorithm
 {
-    /**
-     * Shared secret key.
-     *
-     * @var string $_key
-     */
-    protected $_key;
+	/**
+	 * Shared secret key.
+	 *
+	 * @var string $_key
+	 */
+	protected $_key;
     
-    /**
-     * Mapping from algorithm name to class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ALGO_TO_CLASS = array(
-        /* @formatter:off */
-        JWA::ALGO_HS256 => HS256Algorithm::class, 
-        JWA::ALGO_HS384 => HS384Algorithm::class, 
-        JWA::ALGO_HS512 => HS512Algorithm::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from algorithm name to class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ALGO_TO_CLASS = array(
+		/* @formatter:off */
+		JWA::ALGO_HS256 => HS256Algorithm::class, 
+		JWA::ALGO_HS384 => HS384Algorithm::class, 
+		JWA::ALGO_HS512 => HS512Algorithm::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Get algorithm name recognized by the Hash extension.
-     *
-     * @return string
-     */
-    abstract protected function _hashAlgo(): string;
+	/**
+	 * Get algorithm name recognized by the Hash extension.
+	 *
+	 * @return string
+	 */
+	abstract protected function _hashAlgo(): string;
     
-    /**
-     * Constructor.
-     *
-     * @param string $key Shared secret key
-     */
-    public function __construct(string $key)
-    {
-        $this->_key = $key;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $key Shared secret key
+	 */
+	public function __construct(string $key)
+	{
+		$this->_key = $key;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public static function fromJWK(JWK $jwk, Header $header): self
-    {
-        $jwk = SymmetricKeyJWK::fromJWK($jwk);
-        $alg = JWA::deriveAlgorithmName($header, $jwk);
-        if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
-            throw new \UnexpectedValueException("Unsupported algorithm '$alg'.");
-        }
-        $cls = self::MAP_ALGO_TO_CLASS[$alg];
-        return new $cls($jwk->key());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public static function fromJWK(JWK $jwk, Header $header): self
+	{
+		$jwk = SymmetricKeyJWK::fromJWK($jwk);
+		$alg = JWA::deriveAlgorithmName($header, $jwk);
+		if (!array_key_exists($alg, self::MAP_ALGO_TO_CLASS)) {
+			throw new \UnexpectedValueException("Unsupported algorithm '$alg'.");
+		}
+		$cls = self::MAP_ALGO_TO_CLASS[$alg];
+		return new $cls($jwk->key());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function computeSignature(string $data): string
-    {
-        $result = @hash_hmac($this->_hashAlgo(), $data, $this->_key, true);
-        if (false === $result) {
-            $err = error_get_last();
-            $msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
-            throw new \RuntimeException($msg ?? 'hash_hmac() failed.');
-        }
-        return $result;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function computeSignature(string $data): string
+	{
+		$result = @hash_hmac($this->_hashAlgo(), $data, $this->_key, true);
+		if (false === $result) {
+			$err = error_get_last();
+			$msg = isset($err) && __FILE__ == $err['file'] ? $err['message'] : null;
+			throw new \RuntimeException($msg ?? 'hash_hmac() failed.');
+		}
+		return $result;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function validateSignature(string $data, string $signature): bool
-    {
-        return $this->computeSignature($data) === $signature;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function validateSignature(string $data, string $signature): bool
+	{
+		return $this->computeSignature($data) === $signature;
+	}
     
-    /**
-     *
-     * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
-     * @return \JWX\JWT\Parameter\JWTParameter[]
-     */
-    public function headerParameters(): array
-    {
-        return array_merge(parent::headerParameters(),
-            array(AlgorithmParameter::fromAlgorithm($this)));
-    }
+	/**
+	 *
+	 * @see \JWX\JWS\SignatureAlgorithm::headerParameters()
+	 * @return \JWX\JWT\Parameter\JWTParameter[]
+	 */
+	public function headerParameters(): array
+	{
+		return array_merge(parent::headerParameters(),
+			array(AlgorithmParameter::fromAlgorithm($this)));
+	}
 }

lib/JWX/JWS/Algorithm/HS256Algorithm.php

Indentation +16 added lines, -16 removed lines

@@ -13,21 +13,21 @@
  */
 class HS256Algorithm extends HMACAlgorithm
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _hashAlgo(): string
-    {
-        return "sha256";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _hashAlgo(): string
+	{
+		return "sha256";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function algorithmParamValue(): string
-    {
-        return JWA::ALGO_HS256;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function algorithmParamValue(): string
+	{
+		return JWA::ALGO_HS256;
+	}
 }