sop / jwx

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/JWT/Parameter/AuthenticationTagParameter.php

Indentation +20 added lines, -20 removed lines

@@ -11,26 +11,26 @@
  */
 class AuthenticationTagParameter extends JWTParameter
 {
-    use Base64URLValue;
+	use Base64URLValue;
     
-    /**
-     * Constructor.
-     *
-     * @param string $tag Base64url encoded authentication tag
-     */
-    public function __construct($tag)
-    {
-        $this->_validateEncoding($tag);
-        parent::__construct(self::PARAM_AUTHENTICATION_TAG, (string) $tag);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $tag Base64url encoded authentication tag
+	 */
+	public function __construct($tag)
+	{
+		$this->_validateEncoding($tag);
+		parent::__construct(self::PARAM_AUTHENTICATION_TAG, (string) $tag);
+	}
     
-    /**
-     * Get the authentication tag.
-     *
-     * @return string
-     */
-    public function authenticationTag()
-    {
-        return $this->string();
-    }
+	/**
+	 * Get the authentication tag.
+	 *
+	 * @return string
+	 */
+	public function authenticationTag()
+	{
+		return $this->string();
+	}
 }

lib/JWX/JWT/Parameter/CompressionAlgorithmParameterValue.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
  */
 interface CompressionAlgorithmParameterValue
 {
-    /**
-     * Get compression algorithm type as an 'zip' parameter value.
-     *
-     * @return string
-     */
-    public function compressionParamValue();
+	/**
+	 * Get compression algorithm type as an 'zip' parameter value.
+	 *
+	 * @return string
+	 */
+	public function compressionParamValue();
 }

lib/JWX/JWT/Parameter/CriticalParameter.php

Indentation +42 added lines, -42 removed lines

@@ -11,50 +11,50 @@
  */
 class CriticalParameter extends JWTParameter
 {
-    use ArrayParameterValue;
+	use ArrayParameterValue;
     
-    /**
-     * Constructor.
-     *
-     * @param string ...$names
-     */
-    public function __construct(...$names)
-    {
-        parent::__construct(self::PARAM_CRITICAL, $names);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string ...$names
+	 */
+	public function __construct(...$names)
+	{
+		parent::__construct(self::PARAM_CRITICAL, $names);
+	}
     
-    /**
-     * Get self with parameter name added.
-     *
-     * @param string $name
-     * @return self
-     */
-    public function withParamName($name)
-    {
-        $obj = clone $this;
-        $obj->_value[] = $name;
-        $obj->_value = array_values(array_unique($obj->_value));
-        return $obj;
-    }
+	/**
+	 * Get self with parameter name added.
+	 *
+	 * @param string $name
+	 * @return self
+	 */
+	public function withParamName($name)
+	{
+		$obj = clone $this;
+		$obj->_value[] = $name;
+		$obj->_value = array_values(array_unique($obj->_value));
+		return $obj;
+	}
     
-    /**
-     * Check whether given parameter name is critical.
-     *
-     * @param string $name
-     * @return bool
-     */
-    public function has($name)
-    {
-        return false !== array_search($name, $this->_value);
-    }
+	/**
+	 * Check whether given parameter name is critical.
+	 *
+	 * @param string $name
+	 * @return bool
+	 */
+	public function has($name)
+	{
+		return false !== array_search($name, $this->_value);
+	}
     
-    /**
-     * Get critical header parameter names.
-     *
-     * @return string[]
-     */
-    public function names()
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get critical header parameter names.
+	 *
+	 * @return string[]
+	 */
+	public function names()
+	{
+		return $this->_value;
+	}
 }

lib/JWX/JWT/Parameter/AlgorithmParameterValue.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
  */
 interface AlgorithmParameterValue
 {
-    /**
-     * Get algorithm type as an 'alg' parameter value.
-     *
-     * @return string
-     */
-    public function algorithmParamValue();
+	/**
+	 * Get algorithm type as an 'alg' parameter value.
+	 *
+	 * @return string
+	 */
+	public function algorithmParamValue();
 }

lib/JWX/JWT/Parameter/EncryptionAlgorithmParameter.php

Indentation +21 added lines, -21 removed lines

@@ -11,27 +11,27 @@
  */
 class EncryptionAlgorithmParameter extends JWTParameter
 {
-    use StringParameterValue;
+	use StringParameterValue;
     
-    /**
-     * Constructor.
-     *
-     * @param string $algo Algorithm name
-     */
-    public function __construct($algo)
-    {
-        parent::__construct(self::PARAM_ENCRYPTION_ALGORITHM, $algo);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $algo Algorithm name
+	 */
+	public function __construct($algo)
+	{
+		parent::__construct(self::PARAM_ENCRYPTION_ALGORITHM, $algo);
+	}
     
-    /**
-     * Initialize from EncryptionAlgorithmParameterValue.
-     *
-     * @param EncryptionAlgorithmParameterValue $value
-     * @return self
-     */
-    public static function fromAlgorithm(
-        EncryptionAlgorithmParameterValue $value)
-    {
-        return new self($value->encryptionAlgorithmParamValue());
-    }
+	/**
+	 * Initialize from EncryptionAlgorithmParameterValue.
+	 *
+	 * @param EncryptionAlgorithmParameterValue $value
+	 * @return self
+	 */
+	public static function fromAlgorithm(
+		EncryptionAlgorithmParameterValue $value)
+	{
+		return new self($value->encryptionAlgorithmParamValue());
+	}
 }

lib/JWX/JWT/Claims.php

Indentation +142 added lines, -142 removed lines

@@ -12,158 +12,158 @@
  */
 class Claims implements \Countable, \IteratorAggregate
 {
-    use TypedClaims;
+	use TypedClaims;
     
-    /**
-     * Claims.
-     *
-     * @var Claim[] $_claims
-     */
-    protected $_claims;
+	/**
+	 * Claims.
+	 *
+	 * @var Claim[] $_claims
+	 */
+	protected $_claims;
     
-    /**
-     * Constructor.
-     *
-     * @param Claim ...$claims Zero or more claims
-     */
-    public function __construct(Claim ...$claims)
-    {
-        $this->_claims = array();
-        foreach ($claims as $claim) {
-            $this->_claims[$claim->name()] = $claim;
-        }
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Claim ...$claims Zero or more claims
+	 */
+	public function __construct(Claim ...$claims)
+	{
+		$this->_claims = array();
+		foreach ($claims as $claim) {
+			$this->_claims[$claim->name()] = $claim;
+		}
+	}
     
-    /**
-     * Initialize from a JSON string.
-     *
-     * @param string $json JSON
-     * @throws \UnexpectedValueException If JSON is malformed
-     * @return self
-     */
-    public static function fromJSON($json)
-    {
-        $claims = array();
-        $fields = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
-        if (!is_array($fields)) {
-            throw new \UnexpectedValueException("Invalid JSON.");
-        }
-        foreach ($fields as $name => $value) {
-            $claims[] = Claim::fromNameAndValue($name, $value);
-        }
-        return new self(...$claims);
-    }
+	/**
+	 * Initialize from a JSON string.
+	 *
+	 * @param string $json JSON
+	 * @throws \UnexpectedValueException If JSON is malformed
+	 * @return self
+	 */
+	public static function fromJSON($json)
+	{
+		$claims = array();
+		$fields = json_decode($json, true, 32, JSON_BIGINT_AS_STRING);
+		if (!is_array($fields)) {
+			throw new \UnexpectedValueException("Invalid JSON.");
+		}
+		foreach ($fields as $name => $value) {
+			$claims[] = Claim::fromNameAndValue($name, $value);
+		}
+		return new self(...$claims);
+	}
     
-    /**
-     * Get self with Claim objects added.
-     *
-     * @param Claim ...$claims One or more Claim objects
-     * @return self
-     */
-    public function withClaims(Claim ...$claims)
-    {
-        $obj = clone $this;
-        foreach ($claims as $claim) {
-            $obj->_claims[$claim->name()] = $claim;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with Claim objects added.
+	 *
+	 * @param Claim ...$claims One or more Claim objects
+	 * @return self
+	 */
+	public function withClaims(Claim ...$claims)
+	{
+		$obj = clone $this;
+		foreach ($claims as $claim) {
+			$obj->_claims[$claim->name()] = $claim;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get all claims.
-     *
-     * @return Claim[]
-     */
-    public function all()
-    {
-        return $this->_claims;
-    }
+	/**
+	 * Get all claims.
+	 *
+	 * @return Claim[]
+	 */
+	public function all()
+	{
+		return $this->_claims;
+	}
     
-    /**
-     * Check whether claim is present.
-     *
-     * @param string $name Claim name
-     * @return true
-     */
-    public function has($name)
-    {
-        return isset($this->_claims[$name]);
-    }
+	/**
+	 * Check whether claim is present.
+	 *
+	 * @param string $name Claim name
+	 * @return true
+	 */
+	public function has($name)
+	{
+		return isset($this->_claims[$name]);
+	}
     
-    /**
-     * Get claim by name.
-     *
-     * @param string $name Claim name
-     * @throws \LogicException If claim is not present
-     * @return Claim
-     */
-    public function get($name)
-    {
-        if (!isset($this->_claims[$name])) {
-            throw new \LogicException("Claim $name not set.");
-        }
-        return $this->_claims[$name];
-    }
+	/**
+	 * Get claim by name.
+	 *
+	 * @param string $name Claim name
+	 * @throws \LogicException If claim is not present
+	 * @return Claim
+	 */
+	public function get($name)
+	{
+		if (!isset($this->_claims[$name])) {
+			throw new \LogicException("Claim $name not set.");
+		}
+		return $this->_claims[$name];
+	}
     
-    /**
-     * Convert to a JSON.
-     *
-     * @return string
-     */
-    public function toJSON()
-    {
-        $data = array();
-        foreach ($this->_claims as $claim) {
-            $data[$claim->name()] = $claim->value();
-        }
-        return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
-    }
+	/**
+	 * Convert to a JSON.
+	 *
+	 * @return string
+	 */
+	public function toJSON()
+	{
+		$data = array();
+		foreach ($this->_claims as $claim) {
+			$data[$claim->name()] = $claim->value();
+		}
+		return json_encode((object) $data, JSON_UNESCAPED_SLASHES);
+	}
     
-    /**
-     * Check whether a claims set is valid in the given context.
-     *
-     * @param ValidationContext $ctx Validation context
-     * @return bool
-     */
-    public function isValid(ValidationContext $ctx)
-    {
-        try {
-            $ctx->validate($this);
-        } catch (\RuntimeException $e) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check whether a claims set is valid in the given context.
+	 *
+	 * @param ValidationContext $ctx Validation context
+	 * @return bool
+	 */
+	public function isValid(ValidationContext $ctx)
+	{
+		try {
+			$ctx->validate($this);
+		} catch (\RuntimeException $e) {
+			return false;
+		}
+		return true;
+	}
     
-    /**
-     * Get the number of claims.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->_claims);
-    }
+	/**
+	 * Get the number of claims.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_claims);
+	}
     
-    /**
-     * Get iterator for Claim objects keyed by claim name.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_claims);
-    }
+	/**
+	 * Get iterator for Claim objects keyed by claim name.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_claims);
+	}
     
-    /**
-     * Convert to string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toJSON();
-    }
+	/**
+	 * Convert to string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toJSON();
+	}
 }

lib/JWX/Util/UUIDv4.php

Indentation +56 added lines, -56 removed lines

@@ -28,32 +28,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($uuid)
-    {
-        // @todo Check that UUID is version 4
-        $this->_uuid = $uuid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uuid UUIDv4 in canonical hexadecimal format
+	 */
+	public function __construct($uuid)
+	{
+		// @todo Check that UUID is version 4
+		$this->_uuid = $uuid;
+	}
     
-    /**
-     * Create new random UUIDv4.
-     *
-     * @return self
-     */
-    public static function createRandom()
-    {
-        /*
+	/**
+	 * Create new random UUIDv4.
+	 *
+	 * @return self
+	 */
+	public static function createRandom()
+	{
+		/*
          1. Set the two most significant bits (bits 6 and 7) of
          the clock_seq_hi_and_reserved to zero and one, respectively.
          
@@ -64,38 +64,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()
-    {
-        return $this->_uuid;
-    }
+	/**
+	 * Get UUIDv4 in canonical form.
+	 *
+	 * @return string
+	 */
+	public function canonical()
+	{
+		return $this->_uuid;
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->canonical();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->canonical();
+	}
 }

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

lib/JWX/Util/Base64.php

Indentation +95 added lines, -95 removed lines

@@ -7,104 +7,104 @@
  */
 class Base64
 {
-    /**
-     * Encode a string using base64url variant.
-     *
-     * @link https://en.wikipedia.org/wiki/Base64#URL_applications
-     * @param string $data
-     * @return string
-     */
-    public static function urlEncode($data)
-    {
-        return strtr(rtrim(self::encode($data), "="), "+/", "-_");
-    }
+	/**
+	 * Encode a string using base64url variant.
+	 *
+	 * @link https://en.wikipedia.org/wiki/Base64#URL_applications
+	 * @param string $data
+	 * @return string
+	 */
+	public static function urlEncode($data)
+	{
+		return strtr(rtrim(self::encode($data), "="), "+/", "-_");
+	}
     
-    /**
-     * Decode a string using base64url variant.
-     *
-     * @link https://en.wikipedia.org/wiki/Base64#URL_applications
-     * @param string $data
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    public static function urlDecode($data)
-    {
-        $data = strtr($data, "-_", "+/");
-        switch (strlen($data) % 4) {
-            case 0:
-                break;
-            case 2:
-                $data .= "==";
-                break;
-            case 3:
-                $data .= "=";
-                break;
-            default:
-                throw new \UnexpectedValueException(
-                    "Malformed base64url encoding.");
-        }
-        return self::decode($data);
-    }
+	/**
+	 * Decode a string using base64url variant.
+	 *
+	 * @link https://en.wikipedia.org/wiki/Base64#URL_applications
+	 * @param string $data
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	public static function urlDecode($data)
+	{
+		$data = strtr($data, "-_", "+/");
+		switch (strlen($data) % 4) {
+			case 0:
+				break;
+			case 2:
+				$data .= "==";
+				break;
+			case 3:
+				$data .= "=";
+				break;
+			default:
+				throw new \UnexpectedValueException(
+					"Malformed base64url encoding.");
+		}
+		return self::decode($data);
+	}
     
-    /**
-     * Check whether string is validly base64url encoded.
-     *
-     * @link https://en.wikipedia.org/wiki/Base64#URL_applications
-     * @param string $data
-     * @return bool
-     */
-    public static function isValidURLEncoding($data)
-    {
-        return preg_match('#^[A-Za-z0-9\-_]*$#', $data) == 1;
-    }
+	/**
+	 * Check whether string is validly base64url encoded.
+	 *
+	 * @link https://en.wikipedia.org/wiki/Base64#URL_applications
+	 * @param string $data
+	 * @return bool
+	 */
+	public static function isValidURLEncoding($data)
+	{
+		return preg_match('#^[A-Za-z0-9\-_]*$#', $data) == 1;
+	}
     
-    /**
-     * Encode a string in base64.
-     *
-     * @link https://tools.ietf.org/html/rfc4648#section-4
-     * @param string $data
-     * @throws \RuntimeException If encoding fails
-     * @return string
-     */
-    public static function encode($data)
-    {
-        $ret = @base64_encode($data);
-        if (!is_string($ret)) {
-            $err = error_get_last();
-            $msg = isset($err) ? $err["message"] : "base64_encode() failed.";
-            throw new \RuntimeException($msg);
-        }
-        return $ret;
-    }
+	/**
+	 * Encode a string in base64.
+	 *
+	 * @link https://tools.ietf.org/html/rfc4648#section-4
+	 * @param string $data
+	 * @throws \RuntimeException If encoding fails
+	 * @return string
+	 */
+	public static function encode($data)
+	{
+		$ret = @base64_encode($data);
+		if (!is_string($ret)) {
+			$err = error_get_last();
+			$msg = isset($err) ? $err["message"] : "base64_encode() failed.";
+			throw new \RuntimeException($msg);
+		}
+		return $ret;
+	}
     
-    /**
-     * Decode a string from base64 encoding.
-     *
-     * @link https://tools.ietf.org/html/rfc4648#section-4
-     * @param string $data
-     * @throws \RuntimeException If decoding fails
-     * @return string
-     */
-    public static function decode($data)
-    {
-        $ret = base64_decode($data, true);
-        if (!is_string($ret)) {
-            $err = error_get_last();
-            $msg = isset($err) ? $err["message"] : "base64_decode() failed.";
-            throw new \RuntimeException($msg);
-        }
-        return $ret;
-    }
+	/**
+	 * Decode a string from base64 encoding.
+	 *
+	 * @link https://tools.ietf.org/html/rfc4648#section-4
+	 * @param string $data
+	 * @throws \RuntimeException If decoding fails
+	 * @return string
+	 */
+	public static function decode($data)
+	{
+		$ret = base64_decode($data, true);
+		if (!is_string($ret)) {
+			$err = error_get_last();
+			$msg = isset($err) ? $err["message"] : "base64_decode() failed.";
+			throw new \RuntimeException($msg);
+		}
+		return $ret;
+	}
     
-    /**
-     * Check whether string is validly base64 encoded.
-     *
-     * @link https://tools.ietf.org/html/rfc4648#section-4
-     * @param string $data
-     * @return bool
-     */
-    public static function isValid($data)
-    {
-        return preg_match('#^[A-Za-z0-9+/]*={0,2}$#', $data) == 1;
-    }
+	/**
+	 * Check whether string is validly base64 encoded.
+	 *
+	 * @link https://tools.ietf.org/html/rfc4648#section-4
+	 * @param string $data
+	 * @return bool
+	 */
+	public static function isValid($data)
+	{
+		return preg_match('#^[A-Za-z0-9+/]*={0,2}$#', $data) == 1;
+	}
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -31,17 +31,17 @@
     {
         $data = strtr($data, "-_", "+/");
         switch (strlen($data) % 4) {
-            case 0:
-                break;
-            case 2:
-                $data .= "==";
-                break;
-            case 3:
-                $data .= "=";
-                break;
-            default:
-                throw new \UnexpectedValueException(
-                    "Malformed base64url encoding.");
+        case 0:
+            break;
+        case 2:
+            $data .= "==";
+            break;
+        case 3:
+            $data .= "=";
+            break;
+        default:
+            throw new \UnexpectedValueException(
+                "Malformed base64url encoding.");
         }
         return self::decode($data);
     }