sop / asn1

lib/ASN1/Type/Primitive/BitString.php

Spacing +1 added lines, -1 removed lines

@@ -179,7 +179,7 @@
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $length = Length::expectFromDER($data, $idx);

Indentation +181 added lines, -181 removed lines

@@ -17,194 +17,194 @@
  */
 class BitString extends StringType
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Number of unused bits in the last octet.
-     *
-     * @var int $_unusedBits
-     */
-    protected $_unusedBits;
+	/**
+	 * Number of unused bits in the last octet.
+	 *
+	 * @var int $_unusedBits
+	 */
+	protected $_unusedBits;
     
-    /**
-     * Constructor.
-     *
-     * @param string $string Content octets
-     * @param int $unused_bits Number of unused bits in the last octet
-     */
-    public function __construct(string $string, int $unused_bits = 0)
-    {
-        $this->_typeTag = self::TYPE_BIT_STRING;
-        parent::__construct($string);
-        $this->_unusedBits = $unused_bits;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string Content octets
+	 * @param int $unused_bits Number of unused bits in the last octet
+	 */
+	public function __construct(string $string, int $unused_bits = 0)
+	{
+		$this->_typeTag = self::TYPE_BIT_STRING;
+		parent::__construct($string);
+		$this->_unusedBits = $unused_bits;
+	}
     
-    /**
-     * Get the number of bits in the string.
-     *
-     * @return int
-     */
-    public function numBits(): int
-    {
-        return strlen($this->_string) * 8 - $this->_unusedBits;
-    }
+	/**
+	 * Get the number of bits in the string.
+	 *
+	 * @return int
+	 */
+	public function numBits(): int
+	{
+		return strlen($this->_string) * 8 - $this->_unusedBits;
+	}
     
-    /**
-     * Get the number of unused bits in the last octet of the string.
-     *
-     * @return int
-     */
-    public function unusedBits(): int
-    {
-        return $this->_unusedBits;
-    }
+	/**
+	 * Get the number of unused bits in the last octet of the string.
+	 *
+	 * @return int
+	 */
+	public function unusedBits(): int
+	{
+		return $this->_unusedBits;
+	}
     
-    /**
-     * Test whether bit is set.
-     *
-     * @param int $idx Bit index.
-     *        Most significant bit of the first octet is index 0.
-     * @return bool
-     */
-    public function testBit(int $idx): bool
-    {
-        // octet index
-        $oi = (int) floor($idx / 8);
-        // if octet is outside range
-        if ($oi < 0 || $oi >= strlen($this->_string)) {
-            throw new \OutOfBoundsException("Index is out of bounds.");
-        }
-        // bit index
-        $bi = $idx % 8;
-        // if tested bit is last octet's unused bit
-        if ($oi == strlen($this->_string) - 1) {
-            if ($bi >= 8 - $this->_unusedBits) {
-                throw new \OutOfBoundsException("Index refers to an unused bit.");
-            }
-        }
-        $byte = $this->_string[$oi];
-        // index 0 is the most significant bit in byte
-        $mask = 0x01 << (7 - $bi);
-        return (ord($byte) & $mask) > 0;
-    }
+	/**
+	 * Test whether bit is set.
+	 *
+	 * @param int $idx Bit index.
+	 *        Most significant bit of the first octet is index 0.
+	 * @return bool
+	 */
+	public function testBit(int $idx): bool
+	{
+		// octet index
+		$oi = (int) floor($idx / 8);
+		// if octet is outside range
+		if ($oi < 0 || $oi >= strlen($this->_string)) {
+			throw new \OutOfBoundsException("Index is out of bounds.");
+		}
+		// bit index
+		$bi = $idx % 8;
+		// if tested bit is last octet's unused bit
+		if ($oi == strlen($this->_string) - 1) {
+			if ($bi >= 8 - $this->_unusedBits) {
+				throw new \OutOfBoundsException("Index refers to an unused bit.");
+			}
+		}
+		$byte = $this->_string[$oi];
+		// index 0 is the most significant bit in byte
+		$mask = 0x01 << (7 - $bi);
+		return (ord($byte) & $mask) > 0;
+	}
     
-    /**
-     * Get range of bits.
-     *
-     * @param int $start Index of first bit
-     * @param int $length Number of bits in range
-     * @throws \OutOfBoundsException
-     * @return string Integer of $length bits
-     */
-    public function range(int $start, int $length): string
-    {
-        if (!$length) {
-            return "0";
-        }
-        if ($start + $length > $this->numBits()) {
-            throw new \OutOfBoundsException("Not enough bits.");
-        }
-        $bits = gmp_init(0);
-        $idx = $start;
-        $end = $start + $length;
-        while (true) {
-            $bit = $this->testBit($idx) ? 1 : 0;
-            $bits |= $bit;
-            if (++$idx >= $end) {
-                break;
-            }
-            $bits <<= 1;
-        }
-        return gmp_strval($bits, 10);
-    }
+	/**
+	 * Get range of bits.
+	 *
+	 * @param int $start Index of first bit
+	 * @param int $length Number of bits in range
+	 * @throws \OutOfBoundsException
+	 * @return string Integer of $length bits
+	 */
+	public function range(int $start, int $length): string
+	{
+		if (!$length) {
+			return "0";
+		}
+		if ($start + $length > $this->numBits()) {
+			throw new \OutOfBoundsException("Not enough bits.");
+		}
+		$bits = gmp_init(0);
+		$idx = $start;
+		$end = $start + $length;
+		while (true) {
+			$bit = $this->testBit($idx) ? 1 : 0;
+			$bits |= $bit;
+			if (++$idx >= $end) {
+				break;
+			}
+			$bits <<= 1;
+		}
+		return gmp_strval($bits, 10);
+	}
     
-    /**
-     * Get a copy of the bit string with trailing zeroes removed.
-     *
-     * @return self
-     */
-    public function withoutTrailingZeroes(): self
-    {
-        // if bit string was empty
-        if (!strlen($this->_string)) {
-            return new self("");
-        }
-        $bits = $this->_string;
-        // count number of empty trailing octets
-        $unused_octets = 0;
-        for ($idx = strlen($bits) - 1; $idx >= 0; --$idx, ++$unused_octets) {
-            if ($bits[$idx] != "\x0") {
-                break;
-            }
-        }
-        // strip trailing octets
-        if ($unused_octets) {
-            $bits = substr($bits, 0, -$unused_octets);
-        }
-        // if bit string was full of zeroes
-        if (!strlen($bits)) {
-            return new self("");
-        }
-        // count number of trailing zeroes in the last octet
-        $unused_bits = 0;
-        $byte = ord($bits[strlen($bits) - 1]);
-        while (!($byte & 0x01)) {
-            $unused_bits++;
-            $byte >>= 1;
-        }
-        return new self($bits, $unused_bits);
-    }
+	/**
+	 * Get a copy of the bit string with trailing zeroes removed.
+	 *
+	 * @return self
+	 */
+	public function withoutTrailingZeroes(): self
+	{
+		// if bit string was empty
+		if (!strlen($this->_string)) {
+			return new self("");
+		}
+		$bits = $this->_string;
+		// count number of empty trailing octets
+		$unused_octets = 0;
+		for ($idx = strlen($bits) - 1; $idx >= 0; --$idx, ++$unused_octets) {
+			if ($bits[$idx] != "\x0") {
+				break;
+			}
+		}
+		// strip trailing octets
+		if ($unused_octets) {
+			$bits = substr($bits, 0, -$unused_octets);
+		}
+		// if bit string was full of zeroes
+		if (!strlen($bits)) {
+			return new self("");
+		}
+		// count number of trailing zeroes in the last octet
+		$unused_bits = 0;
+		$byte = ord($bits[strlen($bits) - 1]);
+		while (!($byte & 0x01)) {
+			$unused_bits++;
+			$byte >>= 1;
+		}
+		return new self($bits, $unused_bits);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $der = chr($this->_unusedBits);
-        $der .= $this->_string;
-        if ($this->_unusedBits) {
-            $octet = $der[strlen($der) - 1];
-            // set unused bits to zero
-            $octet &= chr(0xff & ~((1 << $this->_unusedBits) - 1));
-            $der[strlen($der) - 1] = $octet;
-        }
-        return $der;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$der = chr($this->_unusedBits);
+		$der .= $this->_string;
+		if ($this->_unusedBits) {
+			$octet = $der[strlen($der) - 1];
+			// set unused bits to zero
+			$octet &= chr(0xff & ~((1 << $this->_unusedBits) - 1));
+			$der[strlen($der) - 1] = $octet;
+		}
+		return $der;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        if ($length->intLength() < 1) {
-            throw new DecodeException("Bit string length must be at least 1.");
-        }
-        $unused_bits = ord($data[$idx++]);
-        if ($unused_bits > 7) {
-            throw new DecodeException(
-                "Unused bits in a bit string must be less than 8.");
-        }
-        $str_len = $length->intLength() - 1;
-        if ($str_len) {
-            $str = substr($data, $idx, $str_len);
-            if ($unused_bits) {
-                $mask = (1 << $unused_bits) - 1;
-                if (ord($str[strlen($str) - 1]) & $mask) {
-                    throw new DecodeException(
-                        "DER encoded bit string must have zero padding.");
-                }
-            }
-        } else {
-            $str = "";
-        }
-        $offset = $idx + $str_len;
-        return new self($str, $unused_bits);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		if ($length->intLength() < 1) {
+			throw new DecodeException("Bit string length must be at least 1.");
+		}
+		$unused_bits = ord($data[$idx++]);
+		if ($unused_bits > 7) {
+			throw new DecodeException(
+				"Unused bits in a bit string must be less than 8.");
+		}
+		$str_len = $length->intLength() - 1;
+		if ($str_len) {
+			$str = substr($data, $idx, $str_len);
+			if ($unused_bits) {
+				$mask = (1 << $unused_bits) - 1;
+				if (ord($str[strlen($str) - 1]) & $mask) {
+					throw new DecodeException(
+						"DER encoded bit string must have zero padding.");
+				}
+			}
+		} else {
+			$str = "";
+		}
+		$offset = $idx + $str_len;
+		return new self($str, $unused_bits);
+	}
 }

lib/ASN1/Type/Primitive/NullType.php

Indentation +34 added lines, -34 removed lines

@@ -17,41 +17,41 @@
  */
 class NullType extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        $this->_typeTag = self::TYPE_NULL;
-    }
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		$this->_typeTag = self::TYPE_NULL;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return "";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return "";
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        if (!$identifier->isPrimitive()) {
-            throw new DecodeException("Null value must be primitive.");
-        }
-        // null type has always zero length
-        Length::expectFromDER($data, $idx, 0);
-        $offset = $idx;
-        return new self();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		if (!$identifier->isPrimitive()) {
+			throw new DecodeException("Null value must be primitive.");
+		}
+		// null type has always zero length
+		Length::expectFromDER($data, $idx, 0);
+		$offset = $idx;
+		return new self();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         if (!$identifier->isPrimitive()) {

lib/ASN1/Type/Primitive/Boolean.php

Indentation +55 added lines, -55 removed lines

@@ -17,64 +17,64 @@
  */
 class Boolean extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Value.
-     *
-     * @var bool
-     */
-    private $_bool;
+	/**
+	 * Value.
+	 *
+	 * @var bool
+	 */
+	private $_bool;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $bool
-     */
-    public function __construct(bool $bool)
-    {
-        $this->_typeTag = self::TYPE_BOOLEAN;
-        $this->_bool = $bool;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $bool
+	 */
+	public function __construct(bool $bool)
+	{
+		$this->_typeTag = self::TYPE_BOOLEAN;
+		$this->_bool = $bool;
+	}
     
-    /**
-     * Get the value.
-     *
-     * @return bool
-     */
-    public function value(): bool
-    {
-        return $this->_bool;
-    }
+	/**
+	 * Get the value.
+	 *
+	 * @return bool
+	 */
+	public function value(): bool
+	{
+		return $this->_bool;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return $this->_bool ? chr(0xff) : chr(0);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return $this->_bool ? chr(0xff) : chr(0);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        Length::expectFromDER($data, $idx, 1);
-        $byte = ord($data[$idx++]);
-        if ($byte !== 0) {
-            if ($byte != 0xff) {
-                throw new DecodeException(
-                    "DER encoded boolean true must have all bits set to 1.");
-            }
-        }
-        $offset = $idx;
-        return new self($byte !== 0);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		Length::expectFromDER($data, $idx, 1);
+		$byte = ord($data[$idx++]);
+		if ($byte !== 0) {
+			if ($byte != 0xff) {
+				throw new DecodeException(
+					"DER encoded boolean true must have all bits set to 1.");
+			}
+		}
+		$offset = $idx;
+		return new self($byte !== 0);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         Length::expectFromDER($data, $idx, 1);

lib/ASN1/Type/StringType.php

Indentation +41 added lines, -41 removed lines

@@ -11,48 +11,48 @@
  */
 abstract class StringType extends Element
 {
-    /**
-     * String value.
-     *
-     * @var string $_string
-     */
-    protected $_string;
+	/**
+	 * String value.
+	 *
+	 * @var string $_string
+	 */
+	protected $_string;
     
-    /**
-     * Constructor.
-     *
-     * @param string $string
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(string $string)
-    {
-        if (!$this->_validateString($string)) {
-            throw new \InvalidArgumentException(
-                sprintf("Not a valid %s string.",
-                    self::tagToName($this->_typeTag)));
-        }
-        $this->_string = $string;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $string
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct(string $string)
+	{
+		if (!$this->_validateString($string)) {
+			throw new \InvalidArgumentException(
+				sprintf("Not a valid %s string.",
+					self::tagToName($this->_typeTag)));
+		}
+		$this->_string = $string;
+	}
     
-    /**
-     * Get the string value.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_string;
-    }
+	/**
+	 * Get the string value.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_string;
+	}
     
-    /**
-     * Check whether string is valid for the concrete type.
-     *
-     * @param string $string
-     * @return bool
-     */
-    protected function _validateString(string $string): bool
-    {
-        // Override in derived classes
-        return true;
-    }
+	/**
+	 * Check whether string is valid for the concrete type.
+	 *
+	 * @param string $string
+	 * @return bool
+	 */
+	protected function _validateString(string $string): bool
+	{
+		// Override in derived classes
+		return true;
+	}
 }

lib/ASN1/Type/Primitive/Real.php

Spacing +9 added lines, -9 removed lines

@@ -33,14 +33,14 @@ 
      * @link http://php.net/manual/en/language.types.float.php
      * @var string
      */
-    const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */
-        '([+\-]?'. // sign
-        '(?:'.
-            '\d+'. // LNUM
-            '|'.
-            '(?:\d*\.\d+|\d+\.\d*)'. // DNUM
-        '))[eE]'.
-        '([+\-]?\d+)'. // exponent
+    const PHP_EXPONENT_DNUM = '/^' . /* @formatter:off */
+        '([+\-]?' . // sign
+        '(?:' .
+            '\d+' . // LNUM
+            '|' .
+            '(?:\d*\.\d+|\d+\.\d*)' . // DNUM
+        '))[eE]' .
+        '([+\-]?\d+)' . // exponent
     '$/'; /* @formatter:on */
     
     /**
@@ -115,7 +115,7 @@ 
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $length = Length::expectFromDER($data, $idx)->intLength();

Doc Comments +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
     /**
      * Test that number is valid for this context.
      *
-     * @param mixed $num
+     * @param string $num
      * @return bool
      */
     private static function _validateNumber($num): bool

Indentation +250 added lines, -250 removed lines

@@ -17,271 +17,271 @@
  */
 class Real extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Regex pattern to parse NR3 form number conforming to DER.
-     *
-     * @var string
-     */
-    const NR3_REGEX = '/^(-?)(\d+)?\.E([+\-]?\d+)$/';
+	/**
+	 * Regex pattern to parse NR3 form number conforming to DER.
+	 *
+	 * @var string
+	 */
+	const NR3_REGEX = '/^(-?)(\d+)?\.E([+\-]?\d+)$/';
     
-    /**
-     * Regex pattern to parse PHP exponent number format.
-     *
-     * @link http://php.net/manual/en/language.types.float.php
-     * @var string
-     */
-    const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */
-        '([+\-]?'. // sign
-        '(?:'.
-            '\d+'. // LNUM
-            '|'.
-            '(?:\d*\.\d+|\d+\.\d*)'. // DNUM
-        '))[eE]'.
-        '([+\-]?\d+)'. // exponent
-    '$/'; /* @formatter:on */
+	/**
+	 * Regex pattern to parse PHP exponent number format.
+	 *
+	 * @link http://php.net/manual/en/language.types.float.php
+	 * @var string
+	 */
+	const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */
+		'([+\-]?'. // sign
+		'(?:'.
+			'\d+'. // LNUM
+			'|'.
+			'(?:\d*\.\d+|\d+\.\d*)'. // DNUM
+		'))[eE]'.
+		'([+\-]?\d+)'. // exponent
+	'$/'; /* @formatter:on */
     
-    /**
-     * Number zero represented in NR3 form.
-     *
-     * @var string
-     */
-    const NR3_ZERO = ".E+0";
+	/**
+	 * Number zero represented in NR3 form.
+	 *
+	 * @var string
+	 */
+	const NR3_ZERO = ".E+0";
     
-    /**
-     * Number in NR3 form.
-     *
-     * @var string
-     */
-    private $_number;
+	/**
+	 * Number in NR3 form.
+	 *
+	 * @var string
+	 */
+	private $_number;
     
-    /**
-     * Constructor.
-     *
-     * @param string $number Number in NR3 form.
-     */
-    public function __construct(string $number)
-    {
-        $this->_typeTag = self::TYPE_REAL;
-        if (!self::_validateNumber($number)) {
-            throw new \InvalidArgumentException(
-                "'$number' is not a valid NR3 form real.");
-        }
-        $this->_number = $number;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $number Number in NR3 form.
+	 */
+	public function __construct(string $number)
+	{
+		$this->_typeTag = self::TYPE_REAL;
+		if (!self::_validateNumber($number)) {
+			throw new \InvalidArgumentException(
+				"'$number' is not a valid NR3 form real.");
+		}
+		$this->_number = $number;
+	}
     
-    /**
-     * Initialize from float.
-     *
-     * @param float $number
-     * @return self
-     */
-    public static function fromFloat(float $number): self
-    {
-        return new self(self::_decimalToNR3(strval($number)));
-    }
+	/**
+	 * Initialize from float.
+	 *
+	 * @param float $number
+	 * @return self
+	 */
+	public static function fromFloat(float $number): self
+	{
+		return new self(self::_decimalToNR3(strval($number)));
+	}
     
-    /**
-     * Get number as a float.
-     *
-     * @return float
-     */
-    public function float(): float
-    {
-        return self::_nr3ToDecimal($this->_number);
-    }
+	/**
+	 * Get number as a float.
+	 *
+	 * @return float
+	 */
+	public function float(): float
+	{
+		return self::_nr3ToDecimal($this->_number);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        /* if the real value is the value zero, there shall be no contents
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		/* if the real value is the value zero, there shall be no contents
          octets in the encoding. (X.690 07-2002, section 8.5.2) */
-        if (self::NR3_ZERO == $this->_number) {
-            return "";
-        }
-        // encode in NR3 decimal encoding
-        $data = chr(0x03) . $this->_number;
-        return $data;
-    }
+		if (self::NR3_ZERO == $this->_number) {
+			return "";
+		}
+		// encode in NR3 decimal encoding
+		$data = chr(0x03) . $this->_number;
+		return $data;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        // if length is zero, value is zero (spec 8.5.2)
-        if (!$length) {
-            $obj = new self(self::NR3_ZERO);
-        } else {
-            $bytes = substr($data, $idx, $length);
-            $byte = ord($bytes[0]);
-            if (0x80 & $byte) { // bit 8 = 1
-                $obj = self::_decodeBinaryEncoding($bytes);
-            } else if ($byte >> 6 == 0x00) { // bit 8 = 0, bit 7 = 0
-                $obj = self::_decodeDecimalEncoding($bytes);
-            } else { // bit 8 = 0, bit 7 = 1
-                $obj = self::_decodeSpecialRealValue($bytes);
-            }
-        }
-        $offset = $idx + $length;
-        return $obj;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		// if length is zero, value is zero (spec 8.5.2)
+		if (!$length) {
+			$obj = new self(self::NR3_ZERO);
+		} else {
+			$bytes = substr($data, $idx, $length);
+			$byte = ord($bytes[0]);
+			if (0x80 & $byte) { // bit 8 = 1
+				$obj = self::_decodeBinaryEncoding($bytes);
+			} else if ($byte >> 6 == 0x00) { // bit 8 = 0, bit 7 = 0
+				$obj = self::_decodeDecimalEncoding($bytes);
+			} else { // bit 8 = 0, bit 7 = 1
+				$obj = self::_decodeSpecialRealValue($bytes);
+			}
+		}
+		$offset = $idx + $length;
+		return $obj;
+	}
     
-    /**
-     *
-     * @todo Implement
-     * @param string $data
-     */
-    protected static function _decodeBinaryEncoding(string $data)
-    {
-        throw new \RuntimeException(
-            "Binary encoding of REAL is not implemented.");
-    }
+	/**
+	 *
+	 * @todo Implement
+	 * @param string $data
+	 */
+	protected static function _decodeBinaryEncoding(string $data)
+	{
+		throw new \RuntimeException(
+			"Binary encoding of REAL is not implemented.");
+	}
     
-    /**
-     *
-     * @param string $data
-     * @throws \RuntimeException
-     * @return \ASN1\Type\Primitive\Real
-     */
-    protected static function _decodeDecimalEncoding(string $data): Real
-    {
-        $nr = ord($data[0]) & 0x03;
-        if ($nr != 0x03) {
-            throw new \RuntimeException("Only NR3 form supported.");
-        }
-        $str = substr($data, 1);
-        return new self($str);
-    }
+	/**
+	 *
+	 * @param string $data
+	 * @throws \RuntimeException
+	 * @return \ASN1\Type\Primitive\Real
+	 */
+	protected static function _decodeDecimalEncoding(string $data): Real
+	{
+		$nr = ord($data[0]) & 0x03;
+		if ($nr != 0x03) {
+			throw new \RuntimeException("Only NR3 form supported.");
+		}
+		$str = substr($data, 1);
+		return new self($str);
+	}
     
-    /**
-     *
-     * @todo Implement
-     * @param string $data
-     */
-    protected static function _decodeSpecialRealValue(string $data)
-    {
-        if (strlen($data) != 1) {
-            throw new DecodeException(
-                "SpecialRealValue must have one content octet.");
-        }
-        $byte = ord($data[0]);
-        if ($byte == 0x40) { // positive infinity
-            throw new \RuntimeException("PLUS-INFINITY not supported.");
-        } else if ($byte == 0x41) { // negative infinity
-            throw new \RuntimeException("MINUS-INFINITY not supported.");
-        } else {
-            throw new DecodeException("Invalid SpecialRealValue encoding.");
-        }
-    }
+	/**
+	 *
+	 * @todo Implement
+	 * @param string $data
+	 */
+	protected static function _decodeSpecialRealValue(string $data)
+	{
+		if (strlen($data) != 1) {
+			throw new DecodeException(
+				"SpecialRealValue must have one content octet.");
+		}
+		$byte = ord($data[0]);
+		if ($byte == 0x40) { // positive infinity
+			throw new \RuntimeException("PLUS-INFINITY not supported.");
+		} else if ($byte == 0x41) { // negative infinity
+			throw new \RuntimeException("MINUS-INFINITY not supported.");
+		} else {
+			throw new DecodeException("Invalid SpecialRealValue encoding.");
+		}
+	}
     
-    /**
-     * Convert decimal number string to NR3 form.
-     *
-     * @param string $str
-     * @return string
-     */
-    private static function _decimalToNR3(string $str): string
-    {
-        // if number is in exponent form
-        if (preg_match(self::PHP_EXPONENT_DNUM, $str, $match)) {
-            $parts = explode(".", $match[1]);
-            $m = ltrim($parts[0], "0");
-            $e = intval($match[2]);
-            // if mantissa had decimals
-            if (count($parts) == 2) {
-                $d = rtrim($parts[1], "0");
-                $e -= strlen($d);
-                $m .= $d;
-            }
-        } else {
-            // explode from decimal
-            $parts = explode(".", $str);
-            $m = ltrim($parts[0], "0");
-            // if number had decimals
-            if (count($parts) == 2) {
-                // exponent is negative number of the decimals
-                $e = -strlen($parts[1]);
-                // append decimals to the mantissa
-                $m .= $parts[1];
-            } else {
-                $e = 0;
-            }
-            // shift trailing zeroes from the mantissa to the exponent
-            while (substr($m, -1) === "0") {
-                $e++;
-                $m = substr($m, 0, -1);
-            }
-        }
-        /* if exponent is zero, it must be prefixed with a "+" sign
+	/**
+	 * Convert decimal number string to NR3 form.
+	 *
+	 * @param string $str
+	 * @return string
+	 */
+	private static function _decimalToNR3(string $str): string
+	{
+		// if number is in exponent form
+		if (preg_match(self::PHP_EXPONENT_DNUM, $str, $match)) {
+			$parts = explode(".", $match[1]);
+			$m = ltrim($parts[0], "0");
+			$e = intval($match[2]);
+			// if mantissa had decimals
+			if (count($parts) == 2) {
+				$d = rtrim($parts[1], "0");
+				$e -= strlen($d);
+				$m .= $d;
+			}
+		} else {
+			// explode from decimal
+			$parts = explode(".", $str);
+			$m = ltrim($parts[0], "0");
+			// if number had decimals
+			if (count($parts) == 2) {
+				// exponent is negative number of the decimals
+				$e = -strlen($parts[1]);
+				// append decimals to the mantissa
+				$m .= $parts[1];
+			} else {
+				$e = 0;
+			}
+			// shift trailing zeroes from the mantissa to the exponent
+			while (substr($m, -1) === "0") {
+				$e++;
+				$m = substr($m, 0, -1);
+			}
+		}
+		/* if exponent is zero, it must be prefixed with a "+" sign
          (X.690 07-2002, section 11.3.2.6) */
-        if (0 == $e) {
-            $es = "+";
-        } else {
-            $es = $e < 0 ? "-" : "";
-        }
-        return sprintf("%s.E%s%d", $m, $es, abs($e));
-    }
+		if (0 == $e) {
+			$es = "+";
+		} else {
+			$es = $e < 0 ? "-" : "";
+		}
+		return sprintf("%s.E%s%d", $m, $es, abs($e));
+	}
     
-    /**
-     * Convert NR3 form number to decimal.
-     *
-     * @param string $str
-     * @throws \UnexpectedValueException
-     * @return float
-     */
-    private static function _nr3ToDecimal(string $str): float
-    {
-        if (!preg_match(self::NR3_REGEX, $str, $match)) {
-            throw new \UnexpectedValueException(
-                "'$str' is not a valid NR3 form real.");
-        }
-        $m = $match[2];
-        // if number started with minus sign
-        $inv = $match[1] == "-";
-        $e = intval($match[3]);
-        // positive exponent
-        if ($e > 0) {
-            // pad with trailing zeroes
-            $num = $m . str_repeat("0", $e);
-        } else if ($e < 0) {
-            // pad with leading zeroes
-            if (strlen($m) < abs($e)) {
-                $m = str_repeat("0", abs($e) - strlen($m)) . $m;
-            }
-            // insert decimal point
-            $num = substr($m, 0, $e) . "." . substr($m, $e);
-        } else {
-            $num = empty($m) ? "0" : $m;
-        }
-        // if number is negative
-        if ($inv) {
-            $num = "-$num";
-        }
-        return floatval($num);
-    }
+	/**
+	 * Convert NR3 form number to decimal.
+	 *
+	 * @param string $str
+	 * @throws \UnexpectedValueException
+	 * @return float
+	 */
+	private static function _nr3ToDecimal(string $str): float
+	{
+		if (!preg_match(self::NR3_REGEX, $str, $match)) {
+			throw new \UnexpectedValueException(
+				"'$str' is not a valid NR3 form real.");
+		}
+		$m = $match[2];
+		// if number started with minus sign
+		$inv = $match[1] == "-";
+		$e = intval($match[3]);
+		// positive exponent
+		if ($e > 0) {
+			// pad with trailing zeroes
+			$num = $m . str_repeat("0", $e);
+		} else if ($e < 0) {
+			// pad with leading zeroes
+			if (strlen($m) < abs($e)) {
+				$m = str_repeat("0", abs($e) - strlen($m)) . $m;
+			}
+			// insert decimal point
+			$num = substr($m, 0, $e) . "." . substr($m, $e);
+		} else {
+			$num = empty($m) ? "0" : $m;
+		}
+		// if number is negative
+		if ($inv) {
+			$num = "-$num";
+		}
+		return floatval($num);
+	}
     
-    /**
-     * Test that number is valid for this context.
-     *
-     * @param mixed $num
-     * @return bool
-     */
-    private static function _validateNumber($num): bool
-    {
-        if (!preg_match(self::NR3_REGEX, $num)) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Test that number is valid for this context.
+	 *
+	 * @param mixed $num
+	 * @return bool
+	 */
+	private static function _validateNumber($num): bool
+	{
+		if (!preg_match(self::NR3_REGEX, $num)) {
+			return false;
+		}
+		return true;
+	}
 }

lib/ASN1/Type/Primitive/RelativeOID.php

Indentation +32 added lines, -32 removed lines

@@ -13,38 +13,38 @@
  */
 class RelativeOID extends ObjectIdentifier
 {
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-        $this->_typeTag = self::TYPE_RELATIVE_OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+		$this->_typeTag = self::TYPE_RELATIVE_OID;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return self::_encodeSubIDs(...self::_explodeDottedOID($this->_oid));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return self::_encodeSubIDs(...self::_explodeDottedOID($this->_oid));
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $len = Length::expectFromDER($data, $idx)->intLength();
-        $subids = self::_decodeSubIDs(substr($data, $idx, $len));
-        $offset = $idx + $len;
-        return new self(self::_implodeSubIDs(...$subids));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$len = Length::expectFromDER($data, $idx)->intLength();
+		$subids = self::_decodeSubIDs(substr($data, $idx, $len));
+		$offset = $idx + $len;
+		return new self(self::_implodeSubIDs(...$subids));
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $len = Length::expectFromDER($data, $idx)->intLength();

lib/ASN1/Type/Primitive/ObjectIdentifier.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $len = Length::expectFromDER($data, $idx)->intLength();
@@ -109,7 +109,7 @@ 
     {
         return implode(".",
             array_map(
-                function ($num) {
+                function($num) {
                     return gmp_strval($num, 10);
                 }, $subids));
     }

Indentation +147 added lines, -147 removed lines

@@ -17,160 +17,160 @@
  */
 class ObjectIdentifier extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Object identifier in dotted format.
-     *
-     * @var string
-     */
-    protected $_oid;
+	/**
+	 * Object identifier in dotted format.
+	 *
+	 * @var string
+	 */
+	protected $_oid;
     
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-        $this->_typeTag = self::TYPE_OBJECT_IDENTIFIER;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+		$this->_typeTag = self::TYPE_OBJECT_IDENTIFIER;
+	}
     
-    /**
-     * Get OID in dotted format.
-     *
-     * @return string
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get OID in dotted format.
+	 *
+	 * @return string
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $subids = self::_explodeDottedOID($this->_oid);
-        // encode first two subids to one according to spec section 8.19.4
-        if (count($subids) >= 2) {
-            $num = ($subids[0] * 40) + $subids[1];
-            array_splice($subids, 0, 2, array($num));
-        }
-        return self::_encodeSubIDs(...$subids);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$subids = self::_explodeDottedOID($this->_oid);
+		// encode first two subids to one according to spec section 8.19.4
+		if (count($subids) >= 2) {
+			$num = ($subids[0] * 40) + $subids[1];
+			array_splice($subids, 0, 2, array($num));
+		}
+		return self::_encodeSubIDs(...$subids);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $len = Length::expectFromDER($data, $idx)->intLength();
-        $subids = self::_decodeSubIDs(substr($data, $idx, $len));
-        $idx += $len;
-        // decode first subidentifier according to spec section 8.19.4
-        if (isset($subids[0])) {
-            list($x, $y) = gmp_div_qr($subids[0], "40");
-            array_splice($subids, 0, 1, array($x, $y));
-        }
-        $offset = $idx;
-        return new self(self::_implodeSubIDs(...$subids));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$len = Length::expectFromDER($data, $idx)->intLength();
+		$subids = self::_decodeSubIDs(substr($data, $idx, $len));
+		$idx += $len;
+		// decode first subidentifier according to spec section 8.19.4
+		if (isset($subids[0])) {
+			list($x, $y) = gmp_div_qr($subids[0], "40");
+			array_splice($subids, 0, 1, array($x, $y));
+		}
+		$offset = $idx;
+		return new self(self::_implodeSubIDs(...$subids));
+	}
     
-    /**
-     * Explode dotted OID to an array of sub ID's.
-     *
-     * @param string $oid OID in dotted format
-     * @return \GMP[] Array of GMP numbers
-     */
-    protected static function _explodeDottedOID(string $oid): array
-    {
-        $subids = [];
-        foreach (explode(".", $oid) as $subid) {
-            $subids[] = gmp_init($subid, 10);
-        }
-        return $subids;
-    }
+	/**
+	 * Explode dotted OID to an array of sub ID's.
+	 *
+	 * @param string $oid OID in dotted format
+	 * @return \GMP[] Array of GMP numbers
+	 */
+	protected static function _explodeDottedOID(string $oid): array
+	{
+		$subids = [];
+		foreach (explode(".", $oid) as $subid) {
+			$subids[] = gmp_init($subid, 10);
+		}
+		return $subids;
+	}
     
-    /**
-     * Implode an array of sub IDs to dotted OID format.
-     *
-     * @param \GMP ...$subids
-     * @return string
-     */
-    protected static function _implodeSubIDs(\GMP ...$subids): string
-    {
-        return implode(".",
-            array_map(
-                function ($num) {
-                    return gmp_strval($num, 10);
-                }, $subids));
-    }
+	/**
+	 * Implode an array of sub IDs to dotted OID format.
+	 *
+	 * @param \GMP ...$subids
+	 * @return string
+	 */
+	protected static function _implodeSubIDs(\GMP ...$subids): string
+	{
+		return implode(".",
+			array_map(
+				function ($num) {
+					return gmp_strval($num, 10);
+				}, $subids));
+	}
     
-    /**
-     * Encode sub ID's to DER.
-     *
-     * @param \GMP ...$subids
-     * @return string
-     */
-    protected static function _encodeSubIDs(\GMP ...$subids): string
-    {
-        $data = "";
-        foreach ($subids as $subid) {
-            // if number fits to one base 128 byte
-            if ($subid < 128) {
-                $data .= chr(intval($subid));
-            } else { // encode to multiple bytes
-                $bytes = [];
-                do {
-                    array_unshift($bytes, 0x7f & gmp_intval($subid));
-                    $subid >>= 7;
-                } while ($subid > 0);
-                // all bytes except last must have bit 8 set to one
-                foreach (array_splice($bytes, 0, -1) as $byte) {
-                    $data .= chr(0x80 | $byte);
-                }
-                $data .= chr(reset($bytes));
-            }
-        }
-        return $data;
-    }
+	/**
+	 * Encode sub ID's to DER.
+	 *
+	 * @param \GMP ...$subids
+	 * @return string
+	 */
+	protected static function _encodeSubIDs(\GMP ...$subids): string
+	{
+		$data = "";
+		foreach ($subids as $subid) {
+			// if number fits to one base 128 byte
+			if ($subid < 128) {
+				$data .= chr(intval($subid));
+			} else { // encode to multiple bytes
+				$bytes = [];
+				do {
+					array_unshift($bytes, 0x7f & gmp_intval($subid));
+					$subid >>= 7;
+				} while ($subid > 0);
+				// all bytes except last must have bit 8 set to one
+				foreach (array_splice($bytes, 0, -1) as $byte) {
+					$data .= chr(0x80 | $byte);
+				}
+				$data .= chr(reset($bytes));
+			}
+		}
+		return $data;
+	}
     
-    /**
-     * Decode sub ID's from DER data.
-     *
-     * @param string $data
-     * @throws DecodeException
-     * @return \GMP[] Array of GMP numbers
-     */
-    protected static function _decodeSubIDs(string $data): array
-    {
-        $subids = [];
-        $idx = 0;
-        $end = strlen($data);
-        while ($idx < $end) {
-            $num = gmp_init("0", 10);
-            while (true) {
-                if ($idx >= $end) {
-                    throw new DecodeException("Unexpected end of data.");
-                }
-                $byte = ord($data[$idx++]);
-                $num |= $byte & 0x7f;
-                // bit 8 of the last octet is zero
-                if (!($byte & 0x80)) {
-                    break;
-                }
-                $num <<= 7;
-            }
-            $subids[] = $num;
-        }
-        return $subids;
-    }
+	/**
+	 * Decode sub ID's from DER data.
+	 *
+	 * @param string $data
+	 * @throws DecodeException
+	 * @return \GMP[] Array of GMP numbers
+	 */
+	protected static function _decodeSubIDs(string $data): array
+	{
+		$subids = [];
+		$idx = 0;
+		$end = strlen($data);
+		while ($idx < $end) {
+			$num = gmp_init("0", 10);
+			while (true) {
+				if ($idx >= $end) {
+					throw new DecodeException("Unexpected end of data.");
+				}
+				$byte = ord($data[$idx++]);
+				$num |= $byte & 0x7f;
+				// bit 8 of the last octet is zero
+				if (!($byte & 0x80)) {
+					break;
+				}
+				$num <<= 7;
+			}
+			$subids[] = $num;
+		}
+		return $subids;
+	}
 }

lib/ASN1/Type/Primitive/GeneralizedTime.php

Indentation +102 added lines, -102 removed lines

@@ -17,112 +17,112 @@
  */
 class GeneralizedTime extends TimeType
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Regular expression to parse date.
-     *
-     * DER restricts format to UTC timezone (Z suffix).
-     *
-     * @var string
-     */
-    const REGEX = /* @formatter:off */ '#^' .
-        '(\d\d\d\d)' . /* YYYY */
-        '(\d\d)' . /* MM */
-        '(\d\d)' . /* DD */
-        '(\d\d)' . /* hh */
-        '(\d\d)' . /* mm */
-        '(\d\d)' . /* ss */
-        '(?:\.(\d+))?' . /* frac */
-        'Z' . /* TZ */
-        '$#' /* @formatter:on */;
+	/**
+	 * Regular expression to parse date.
+	 *
+	 * DER restricts format to UTC timezone (Z suffix).
+	 *
+	 * @var string
+	 */
+	const REGEX = /* @formatter:off */ '#^' .
+		'(\d\d\d\d)' . /* YYYY */
+		'(\d\d)' . /* MM */
+		'(\d\d)' . /* DD */
+		'(\d\d)' . /* hh */
+		'(\d\d)' . /* mm */
+		'(\d\d)' . /* ss */
+		'(?:\.(\d+))?' . /* frac */
+		'Z' . /* TZ */
+		'$#' /* @formatter:on */;
     
-    /**
-     * Cached formatted date.
-     *
-     * @var string|null
-     */
-    private $_formatted;
+	/**
+	 * Cached formatted date.
+	 *
+	 * @var string|null
+	 */
+	private $_formatted;
     
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_typeTag = self::TYPE_GENERALIZED_TIME;
-        parent::__construct($dt);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_typeTag = self::TYPE_GENERALIZED_TIME;
+		parent::__construct($dt);
+	}
     
-    /**
-     * Clear cached variables on clone.
-     */
-    public function __clone()
-    {
-        $this->_formatted = null;
-    }
+	/**
+	 * Clear cached variables on clone.
+	 */
+	public function __clone()
+	{
+		$this->_formatted = null;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        if (!isset($this->_formatted)) {
-            $dt = $this->_dateTime->setTimezone(
-                self::_createTimeZone(self::TZ_UTC));
-            $this->_formatted = $dt->format("YmdHis");
-            // if fractions were used
-            $frac = $dt->format("u");
-            if ($frac != 0) {
-                $frac = rtrim($frac, "0");
-                $this->_formatted .= ".$frac";
-            }
-            // timezone
-            $this->_formatted .= "Z";
-        }
-        return $this->_formatted;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		if (!isset($this->_formatted)) {
+			$dt = $this->_dateTime->setTimezone(
+				self::_createTimeZone(self::TZ_UTC));
+			$this->_formatted = $dt->format("YmdHis");
+			// if fractions were used
+			$frac = $dt->format("u");
+			if ($frac != 0) {
+				$frac = rtrim($frac, "0");
+				$this->_formatted .= ".$frac";
+			}
+			// timezone
+			$this->_formatted .= "Z";
+		}
+		return $this->_formatted;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $str = substr($data, $idx, $length);
-        $idx += $length;
-        if (!preg_match(self::REGEX, $str, $match)) {
-            throw new DecodeException("Invalid GeneralizedTime format.");
-        }
-        list(, $year, $month, $day, $hour, $minute, $second) = $match;
-        if (isset($match[7])) {
-            $frac = $match[7];
-            // DER restricts trailing zeroes in fractional seconds component
-            if ('0' === $frac[strlen($frac) - 1]) {
-                throw new DecodeException(
-                    "Fractional seconds must omit trailing zeroes.");
-            }
-            $frac = (int) $frac;
-        } else {
-            $frac = 0;
-        }
-        $time = $year . $month . $day . $hour . $minute . $second . "." . $frac .
-             self::TZ_UTC;
-        $dt = \DateTimeImmutable::createFromFormat("!YmdHis.uT", $time,
-            self::_createTimeZone(self::TZ_UTC));
-        if (!$dt) {
-            throw new DecodeException(
-                "Failed to decode GeneralizedTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr());
-        }
-        $offset = $idx;
-        return new self($dt);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$str = substr($data, $idx, $length);
+		$idx += $length;
+		if (!preg_match(self::REGEX, $str, $match)) {
+			throw new DecodeException("Invalid GeneralizedTime format.");
+		}
+		list(, $year, $month, $day, $hour, $minute, $second) = $match;
+		if (isset($match[7])) {
+			$frac = $match[7];
+			// DER restricts trailing zeroes in fractional seconds component
+			if ('0' === $frac[strlen($frac) - 1]) {
+				throw new DecodeException(
+					"Fractional seconds must omit trailing zeroes.");
+			}
+			$frac = (int) $frac;
+		} else {
+			$frac = 0;
+		}
+		$time = $year . $month . $day . $hour . $minute . $second . "." . $frac .
+			 self::TZ_UTC;
+		$dt = \DateTimeImmutable::createFromFormat("!YmdHis.uT", $time,
+			self::_createTimeZone(self::TZ_UTC));
+		if (!$dt) {
+			throw new DecodeException(
+				"Failed to decode GeneralizedTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr());
+		}
+		$offset = $idx;
+		return new self($dt);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $length = Length::expectFromDER($data, $idx)->intLength();

lib/ASN1/Type/Primitive/UTCTime.php

Indentation +64 added lines, -64 removed lines

@@ -17,72 +17,72 @@
  */
 class UTCTime extends TimeType
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Regular expression to parse date.
-     *
-     * DER restricts format to UTC timezone (Z suffix).
-     *
-     * @var string
-     */
-    const REGEX = /* @formatter:off */ '#^' .
-        '(\d\d)' . /* YY */
-        '(\d\d)' . /* MM */
-        '(\d\d)' . /* DD */
-        '(\d\d)' . /* hh */
-        '(\d\d)' . /* mm */
-        '(\d\d)' . /* ss */
-        'Z' . /* TZ */
-        '$#' /* @formatter:on */;
+	/**
+	 * Regular expression to parse date.
+	 *
+	 * DER restricts format to UTC timezone (Z suffix).
+	 *
+	 * @var string
+	 */
+	const REGEX = /* @formatter:off */ '#^' .
+		'(\d\d)' . /* YY */
+		'(\d\d)' . /* MM */
+		'(\d\d)' . /* DD */
+		'(\d\d)' . /* hh */
+		'(\d\d)' . /* mm */
+		'(\d\d)' . /* ss */
+		'Z' . /* TZ */
+		'$#' /* @formatter:on */;
     
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_typeTag = self::TYPE_UTC_TIME;
-        parent::__construct($dt);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_typeTag = self::TYPE_UTC_TIME;
+		parent::__construct($dt);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $dt = $this->_dateTime->setTimezone(self::_createTimeZone(self::TZ_UTC));
-        return $dt->format("ymdHis\Z");
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$dt = $this->_dateTime->setTimezone(self::_createTimeZone(self::TZ_UTC));
+		return $dt->format("ymdHis\Z");
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $str = substr($data, $idx, $length);
-        $idx += $length;
-        if (!preg_match(self::REGEX, $str, $match)) {
-            throw new DecodeException("Invalid UTCTime format.");
-        }
-        list(, $year, $month, $day, $hour, $minute, $second) = $match;
-        $time = $year . $month . $day . $hour . $minute . $second . self::TZ_UTC;
-        $dt = \DateTimeImmutable::createFromFormat("!ymdHisT", $time,
-            self::_createTimeZone(self::TZ_UTC));
-        if (!$dt) {
-            throw new DecodeException(
-                "Failed to decode UTCTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr());
-        }
-        $offset = $idx;
-        return new self($dt);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$str = substr($data, $idx, $length);
+		$idx += $length;
+		if (!preg_match(self::REGEX, $str, $match)) {
+			throw new DecodeException("Invalid UTCTime format.");
+		}
+		list(, $year, $month, $day, $hour, $minute, $second) = $match;
+		$time = $year . $month . $day . $hour . $minute . $second . self::TZ_UTC;
+		$dt = \DateTimeImmutable::createFromFormat("!ymdHisT", $time,
+			self::_createTimeZone(self::TZ_UTC));
+		if (!$dt) {
+			throw new DecodeException(
+				"Failed to decode UTCTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr());
+		}
+		$offset = $idx;
+		return new self($dt);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $length = Length::expectFromDER($data, $idx)->intLength();