sop / asn1

lib/ASN1/Type/Primitive/Integer.php

Switch Indentation +5 added lines, -5 removed lines

@@ -57,11 +57,11 @@
         $num = gmp_init($this->_number, 10);
         switch (gmp_sign($num)) {
             // positive
-            case 1:
-                return self::_encodePositiveInteger($num);
-            // negative
-            case -1:
-                return self::_encodeNegativeInteger($num);
+        case 1:
+            return self::_encodePositiveInteger($num);
+        // negative
+        case -1:
+            return self::_encodeNegativeInteger($num);
         }
         // zero
         return "\0";

Indentation +143 added lines, -143 removed lines

@@ -16,156 +16,156 @@
  */
 class Integer extends Element
 {
-    use UniversalClass;
-    use PrimitiveType;
+	use UniversalClass;
+	use PrimitiveType;
     
-    /**
-     * Number as a base 10.
-     *
-     * @var string
-     */
-    private $_number;
+	/**
+	 * Number as a base 10.
+	 *
+	 * @var string
+	 */
+	private $_number;
     
-    /**
-     * Constructor.
-     *
-     * @param int|string $number Base 10 integer
-     */
-    public function __construct($number)
-    {
-        $this->_typeTag = self::TYPE_INTEGER;
-        if (!self::_validateNumber($number)) {
-            $var = is_scalar($number) ? strval($number) : gettype($number);
-            throw new \InvalidArgumentException("'$var' is not a valid number.");
-        }
-        $this->_number = strval($number);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $number Base 10 integer
+	 */
+	public function __construct($number)
+	{
+		$this->_typeTag = self::TYPE_INTEGER;
+		if (!self::_validateNumber($number)) {
+			$var = is_scalar($number) ? strval($number) : gettype($number);
+			throw new \InvalidArgumentException("'$var' is not a valid number.");
+		}
+		$this->_number = strval($number);
+	}
     
-    /**
-     * Get the number as a base 10.
-     *
-     * @return string Integer as a string
-     */
-    public function number(): string
-    {
-        return $this->_number;
-    }
+	/**
+	 * Get the number as a base 10.
+	 *
+	 * @return string Integer as a string
+	 */
+	public function number(): string
+	{
+		return $this->_number;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        $num = gmp_init($this->_number, 10);
-        switch (gmp_sign($num)) {
-            // positive
-            case 1:
-                return self::_encodePositiveInteger($num);
-            // negative
-            case -1:
-                return self::_encodeNegativeInteger($num);
-        }
-        // zero
-        return "\0";
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$num = gmp_init($this->_number, 10);
+		switch (gmp_sign($num)) {
+			// positive
+			case 1:
+				return self::_encodePositiveInteger($num);
+			// negative
+			case -1:
+				return self::_encodeNegativeInteger($num);
+		}
+		// zero
+		return "\0";
+	}
     
-    /**
-     * Encode positive integer to DER content.
-     *
-     * @param \GMP|resource $num
-     * @return string
-     */
-    private static function _encodePositiveInteger(\GMP $num): string
-    {
-        $bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        // if first bit is 1, prepend full zero byte
-        // to represent positive two's complement
-        if (ord($bin[0]) & 0x80) {
-            $bin = chr(0x00) . $bin;
-        }
-        return $bin;
-    }
+	/**
+	 * Encode positive integer to DER content.
+	 *
+	 * @param \GMP|resource $num
+	 * @return string
+	 */
+	private static function _encodePositiveInteger(\GMP $num): string
+	{
+		$bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		// if first bit is 1, prepend full zero byte
+		// to represent positive two's complement
+		if (ord($bin[0]) & 0x80) {
+			$bin = chr(0x00) . $bin;
+		}
+		return $bin;
+	}
     
-    /**
-     * Encode negative integer to DER content.
-     *
-     * @param \GMP|resource $num
-     * @return string
-     */
-    private static function _encodeNegativeInteger(\GMP $num): string
-    {
-        $num = gmp_abs($num);
-        // compute number of bytes required
-        $width = 1;
-        if ($num > 128) {
-            $tmp = $num;
-            do {
-                $width++;
-                $tmp >>= 8;
-            } while ($tmp > 128);
-        }
-        // compute two's complement 2^n - x
-        $num = gmp_pow("2", 8 * $width) - $num;
-        $bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
-        // if first bit is 0, prepend full inverted byte
-        // to represent negative two's complement
-        if (!(ord($bin[0]) & 0x80)) {
-            $bin = chr(0xff) . $bin;
-        }
-        return $bin;
-    }
+	/**
+	 * Encode negative integer to DER content.
+	 *
+	 * @param \GMP|resource $num
+	 * @return string
+	 */
+	private static function _encodeNegativeInteger(\GMP $num): string
+	{
+		$num = gmp_abs($num);
+		// compute number of bytes required
+		$width = 1;
+		if ($num > 128) {
+			$tmp = $num;
+			do {
+				$width++;
+				$tmp >>= 8;
+			} while ($tmp > 128);
+		}
+		// compute two's complement 2^n - x
+		$num = gmp_pow("2", 8 * $width) - $num;
+		$bin = gmp_export($num, 1, GMP_MSW_FIRST | GMP_BIG_ENDIAN);
+		// if first bit is 0, prepend full inverted byte
+		// to represent negative two's complement
+		if (!(ord($bin[0]) & 0x80)) {
+			$bin = chr(0xff) . $bin;
+		}
+		return $bin;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        if (gmp_cmp(gmp_init($length->length(), 10), gmp_init(PHP_INT_MAX, 10)) >=
-             0) {
-            throw new \RuntimeException("Integer length too large");
-        }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		if (gmp_cmp(gmp_init($length->length(), 10), gmp_init(PHP_INT_MAX, 10)) >=
+			 0) {
+			throw new \RuntimeException("Integer length too large");
+		}
         
-        $bytes = substr($data, $idx, (int) $length->length());
-        $idx += $length->length();
-        $neg = ord($bytes[0]) & 0x80;
-        // negative, apply inversion of two's complement
-        if ($neg) {
-            $len = strlen($bytes);
-            for ($i = 0; $i < $len; $i++) {
-                $bytes[$i] = ~$bytes[$i];
-            }
-        }
-        $num = gmp_init(bin2hex($bytes), 16);
-        // negative, apply addition of two's complement
-        // and produce negative result
-        if ($neg) {
-            $num = gmp_neg($num + 1);
-        }
-        $offset = $idx;
-        // late static binding since enumerated extends integer type
-        return new static(gmp_strval($num, 10));
-    }
+		$bytes = substr($data, $idx, (int) $length->length());
+		$idx += $length->length();
+		$neg = ord($bytes[0]) & 0x80;
+		// negative, apply inversion of two's complement
+		if ($neg) {
+			$len = strlen($bytes);
+			for ($i = 0; $i < $len; $i++) {
+				$bytes[$i] = ~$bytes[$i];
+			}
+		}
+		$num = gmp_init(bin2hex($bytes), 16);
+		// negative, apply addition of two's complement
+		// and produce negative result
+		if ($neg) {
+			$num = gmp_neg($num + 1);
+		}
+		$offset = $idx;
+		// late static binding since enumerated extends integer type
+		return new static(gmp_strval($num, 10));
+	}
     
-    /**
-     * Test that number is valid for this context.
-     *
-     * @param mixed $num
-     * @return boolean
-     */
-    private static function _validateNumber($num): bool
-    {
-        if (is_int($num)) {
-            return true;
-        }
-        if (is_string($num) && preg_match('/-?\d+/', $num)) {
-            return true;
-        }
-        return false;
-    }
+	/**
+	 * Test that number is valid for this context.
+	 *
+	 * @param mixed $num
+	 * @return boolean
+	 */
+	private static function _validateNumber($num): bool
+	{
+		if (is_int($num)) {
+			return true;
+		}
+		if (is_string($num) && preg_match('/-?\d+/', $num)) {
+			return true;
+		}
+		return false;
+	}
 }

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Primitive/Enumerated.php

Indentation +10 added lines, -10 removed lines

@@ -7,14 +7,14 @@
  */
 class Enumerated extends Integer
 {
-    /**
-     * Constructor.
-     *
-     * @param int|string $number
-     */
-    public function __construct($number)
-    {
-        parent::__construct($number);
-        $this->_typeTag = self::TYPE_ENUMERATED;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int|string $number
+	 */
+	public function __construct($number)
+	{
+		parent::__construct($number);
+		$this->_typeTag = self::TYPE_ENUMERATED;
+	}
 }

lib/ASN1/Type/Constructed/Set.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     {
         $obj = clone $this;
         usort($obj->_elements,
-            function (Element $a, Element $b) {
+            function(Element $a, Element $b) {
                 if ($a->typeClass() != $b->typeClass()) {
                     return $a->typeClass() < $b->typeClass() ? -1 : 1;
                 }
@@ -53,7 +53,7 @@ 
     {
         $obj = clone $this;
         usort($obj->_elements,
-            function (Element $a, Element $b) {
+            function(Element $a, Element $b) {
                 $a_der = $a->toDER();
                 $b_der = $b->toDER();
                 return strcmp($a_der, $b_der);

Indentation +48 added lines, -48 removed lines

@@ -12,54 +12,54 @@
  */
 class Set extends Structure
 {
-    /**
-     * Constructor
-     *
-     * @param Element[] $elements Any number of elements
-     */
-    public function __construct(Element ...$elements)
-    {
-        $this->_typeTag = self::TYPE_SET;
-        parent::__construct(...$elements);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param Element[] $elements Any number of elements
+	 */
+	public function __construct(Element ...$elements)
+	{
+		$this->_typeTag = self::TYPE_SET;
+		parent::__construct(...$elements);
+	}
     
-    /**
-     * Sort by canonical ascending order.
-     * Used for DER encoding of SET type.
-     *
-     * @return self
-     */
-    public function sortedSet(): self
-    {
-        $obj = clone $this;
-        usort($obj->_elements,
-            function (Element $a, Element $b) {
-                if ($a->typeClass() != $b->typeClass()) {
-                    return $a->typeClass() < $b->typeClass() ? -1 : 1;
-                }
-                if ($a->tag() == $b->tag()) {
-                    return 0;
-                }
-                return $a->tag() < $b->tag() ? -1 : 1;
-            });
-        return $obj;
-    }
+	/**
+	 * Sort by canonical ascending order.
+	 * Used for DER encoding of SET type.
+	 *
+	 * @return self
+	 */
+	public function sortedSet(): self
+	{
+		$obj = clone $this;
+		usort($obj->_elements,
+			function (Element $a, Element $b) {
+				if ($a->typeClass() != $b->typeClass()) {
+					return $a->typeClass() < $b->typeClass() ? -1 : 1;
+				}
+				if ($a->tag() == $b->tag()) {
+					return 0;
+				}
+				return $a->tag() < $b->tag() ? -1 : 1;
+			});
+		return $obj;
+	}
     
-    /**
-     * Sort by encoding ascending order.
-     * Used for DER encoding of SET OF type.
-     *
-     * @return self
-     */
-    public function sortedSetOf(): self
-    {
-        $obj = clone $this;
-        usort($obj->_elements,
-            function (Element $a, Element $b) {
-                $a_der = $a->toDER();
-                $b_der = $b->toDER();
-                return strcmp($a_der, $b_der);
-            });
-        return $obj;
-    }
+	/**
+	 * Sort by encoding ascending order.
+	 * Used for DER encoding of SET OF type.
+	 *
+	 * @return self
+	 */
+	public function sortedSetOf(): self
+	{
+		$obj = clone $this;
+		usort($obj->_elements,
+			function (Element $a, Element $b) {
+				$a_der = $a->toDER();
+				$b_der = $b->toDER();
+				return strcmp($a_der, $b_der);
+			});
+		return $obj;
+	}
 }

lib/ASN1/Type/Primitive/Real.php

Doc Comments +1 added lines, -1 removed lines

@@ -273,7 +273,7 @@
     /**
      * Test that number is valid for this context.
      *
-     * @param mixed $num
+     * @param string $num
      * @return boolean
      */
     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);
-        // if length is zero, value is zero (spec 8.5.2)
-        if (!$length->length()) {
-            $obj = new self(self::NR3_ZERO);
-        } else {
-            $bytes = substr($data, $idx, $length->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->length();
-        return $obj;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		// if length is zero, value is zero (spec 8.5.2)
+		if (!$length->length()) {
+			$obj = new self(self::NR3_ZERO);
+		} else {
+			$bytes = substr($data, $idx, $length->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->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 boolean
-     */
-    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 boolean
+	 */
+	private static function _validateNumber($num): bool
+	{
+		if (!preg_match(self::NR3_REGEX, $num)) {
+			return false;
+		}
+		return true;
+	}
 }

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);

lib/ASN1/Feature/Encodable.php

Indentation +6 added lines, -6 removed lines

@@ -9,10 +9,10 @@
  */
 interface Encodable
 {
-    /**
-     * Encode object to DER.
-     *
-     * @return string
-     */
-    public function toDER(): string;
+	/**
+	 * Encode object to DER.
+	 *
+	 * @return string
+	 */
+	public function toDER(): string;
 }

lib/ASN1/DERData.php

Indentation +71 added lines, -71 removed lines

@@ -14,82 +14,82 @@
  */
 class DERData extends Element
 {
-    /**
-     * DER encoded data.
-     *
-     * @var string $_der
-     */
-    protected $_der;
+	/**
+	 * DER encoded data.
+	 *
+	 * @var string $_der
+	 */
+	protected $_der;
     
-    /**
-     * Identifier of the underlying type.
-     *
-     * @var Identifier $_identifier
-     */
-    protected $_identifier;
+	/**
+	 * Identifier of the underlying type.
+	 *
+	 * @var Identifier $_identifier
+	 */
+	protected $_identifier;
     
-    /**
-     * Offset to the content in DER data.
-     *
-     * @var int $_contentOffset
-     */
-    protected $_contentOffset = 0;
+	/**
+	 * Offset to the content in DER data.
+	 *
+	 * @var int $_contentOffset
+	 */
+	protected $_contentOffset = 0;
     
-    /**
-     * Constructor.
-     *
-     * @param string $data DER encoded data
-     * @throws \ASN1\Exception\DecodeException If data does not adhere to DER
-     */
-    public function __construct(string $data)
-    {
-        $this->_identifier = Identifier::fromDER($data, $this->_contentOffset);
-        Length::expectFromDER($data, $this->_contentOffset);
-        $this->_der = $data;
-        $this->_typeTag = intval($this->_identifier->tag());
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $data DER encoded data
+	 * @throws \ASN1\Exception\DecodeException If data does not adhere to DER
+	 */
+	public function __construct(string $data)
+	{
+		$this->_identifier = Identifier::fromDER($data, $this->_contentOffset);
+		Length::expectFromDER($data, $this->_contentOffset);
+		$this->_der = $data;
+		$this->_typeTag = intval($this->_identifier->tag());
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_identifier->typeClass();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_identifier->typeClass();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return $this->_identifier->isConstructed();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return $this->_identifier->isConstructed();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        // if there's no content payload
-        if (strlen($this->_der) == $this->_contentOffset) {
-            return "";
-        }
-        return substr($this->_der, $this->_contentOffset);
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		// if there's no content payload
+		if (strlen($this->_der) == $this->_contentOffset) {
+			return "";
+		}
+		return substr($this->_der, $this->_contentOffset);
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::toDER()
-     * @return string
-     */
-    public function toDER(): string
-    {
-        return $this->_der;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::toDER()
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		return $this->_der;
+	}
 }

lib/ASN1/Element.php

Switch Indentation +4 added lines, -4 removed lines

@@ -332,10 +332,10 @@
     private function _isPseudoType($tag): bool
     {
         switch ($tag) {
-            case self::TYPE_STRING:
-                return $this instanceof StringType;
-            case self::TYPE_TIME:
-                return $this instanceof TimeType;
+        case self::TYPE_STRING:
+            return $this instanceof StringType;
+        case self::TYPE_TIME:
+            return $this instanceof TimeType;
         }
         return false;
     }

Indentation +411 added lines, -411 removed lines

@@ -20,439 +20,439 @@
  */
 abstract class Element implements ElementBase
 {
-    // Universal type tags
-    const TYPE_EOC = 0x00;
-    const TYPE_BOOLEAN = 0x01;
-    const TYPE_INTEGER = 0x02;
-    const TYPE_BIT_STRING = 0x03;
-    const TYPE_OCTET_STRING = 0x04;
-    const TYPE_NULL = 0x05;
-    const TYPE_OBJECT_IDENTIFIER = 0x06;
-    const TYPE_OBJECT_DESCRIPTOR = 0x07;
-    const TYPE_EXTERNAL = 0x08;
-    const TYPE_REAL = 0x09;
-    const TYPE_ENUMERATED = 0x0a;
-    const TYPE_EMBEDDED_PDV = 0x0b;
-    const TYPE_UTF8_STRING = 0x0c;
-    const TYPE_RELATIVE_OID = 0x0d;
-    const TYPE_SEQUENCE = 0x10;
-    const TYPE_SET = 0x11;
-    const TYPE_NUMERIC_STRING = 0x12;
-    const TYPE_PRINTABLE_STRING = 0x13;
-    const TYPE_T61_STRING = 0x14;
-    const TYPE_VIDEOTEX_STRING = 0x15;
-    const TYPE_IA5_STRING = 0x16;
-    const TYPE_UTC_TIME = 0x17;
-    const TYPE_GENERALIZED_TIME = 0x18;
-    const TYPE_GRAPHIC_STRING = 0x19;
-    const TYPE_VISIBLE_STRING = 0x1a;
-    const TYPE_GENERAL_STRING = 0x1b;
-    const TYPE_UNIVERSAL_STRING = 0x1c;
-    const TYPE_CHARACTER_STRING = 0x1d;
-    const TYPE_BMP_STRING = 0x1e;
+	// Universal type tags
+	const TYPE_EOC = 0x00;
+	const TYPE_BOOLEAN = 0x01;
+	const TYPE_INTEGER = 0x02;
+	const TYPE_BIT_STRING = 0x03;
+	const TYPE_OCTET_STRING = 0x04;
+	const TYPE_NULL = 0x05;
+	const TYPE_OBJECT_IDENTIFIER = 0x06;
+	const TYPE_OBJECT_DESCRIPTOR = 0x07;
+	const TYPE_EXTERNAL = 0x08;
+	const TYPE_REAL = 0x09;
+	const TYPE_ENUMERATED = 0x0a;
+	const TYPE_EMBEDDED_PDV = 0x0b;
+	const TYPE_UTF8_STRING = 0x0c;
+	const TYPE_RELATIVE_OID = 0x0d;
+	const TYPE_SEQUENCE = 0x10;
+	const TYPE_SET = 0x11;
+	const TYPE_NUMERIC_STRING = 0x12;
+	const TYPE_PRINTABLE_STRING = 0x13;
+	const TYPE_T61_STRING = 0x14;
+	const TYPE_VIDEOTEX_STRING = 0x15;
+	const TYPE_IA5_STRING = 0x16;
+	const TYPE_UTC_TIME = 0x17;
+	const TYPE_GENERALIZED_TIME = 0x18;
+	const TYPE_GRAPHIC_STRING = 0x19;
+	const TYPE_VISIBLE_STRING = 0x1a;
+	const TYPE_GENERAL_STRING = 0x1b;
+	const TYPE_UNIVERSAL_STRING = 0x1c;
+	const TYPE_CHARACTER_STRING = 0x1d;
+	const TYPE_BMP_STRING = 0x1e;
     
-    /**
-     * Mapping from universal type tag to implementation class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_TAG_TO_CLASS = [
-        /* @formatter:off */
-        self::TYPE_BOOLEAN => Primitive\Boolean::class,
-        self::TYPE_INTEGER => Primitive\Integer::class,
-        self::TYPE_BIT_STRING => Primitive\BitString::class,
-        self::TYPE_OCTET_STRING => Primitive\OctetString::class,
-        self::TYPE_NULL => Primitive\NullType::class,
-        self::TYPE_OBJECT_IDENTIFIER => Primitive\ObjectIdentifier::class,
-        self::TYPE_OBJECT_DESCRIPTOR => Primitive\ObjectDescriptor::class,
-        self::TYPE_REAL => Primitive\Real::class,
-        self::TYPE_ENUMERATED => Primitive\Enumerated::class,
-        self::TYPE_UTF8_STRING => Primitive\UTF8String::class,
-        self::TYPE_RELATIVE_OID => Primitive\RelativeOID::class,
-        self::TYPE_SEQUENCE => Constructed\Sequence::class,
-        self::TYPE_SET => Constructed\Set::class,
-        self::TYPE_NUMERIC_STRING => Primitive\NumericString::class,
-        self::TYPE_PRINTABLE_STRING => Primitive\PrintableString::class,
-        self::TYPE_T61_STRING => Primitive\T61String::class,
-        self::TYPE_VIDEOTEX_STRING => Primitive\VideotexString::class,
-        self::TYPE_IA5_STRING => Primitive\IA5String::class,
-        self::TYPE_UTC_TIME => Primitive\UTCTime::class,
-        self::TYPE_GENERALIZED_TIME => Primitive\GeneralizedTime::class,
-        self::TYPE_GRAPHIC_STRING => Primitive\GraphicString::class,
-        self::TYPE_VISIBLE_STRING => Primitive\VisibleString::class,
-        self::TYPE_GENERAL_STRING => Primitive\GeneralString::class,
-        self::TYPE_UNIVERSAL_STRING => Primitive\UniversalString::class,
-        self::TYPE_CHARACTER_STRING => Primitive\CharacterString::class,
-        self::TYPE_BMP_STRING => Primitive\BMPString::class,
-        /* @formatter:on */
-    ];
+	/**
+	 * Mapping from universal type tag to implementation class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_TAG_TO_CLASS = [
+		/* @formatter:off */
+		self::TYPE_BOOLEAN => Primitive\Boolean::class,
+		self::TYPE_INTEGER => Primitive\Integer::class,
+		self::TYPE_BIT_STRING => Primitive\BitString::class,
+		self::TYPE_OCTET_STRING => Primitive\OctetString::class,
+		self::TYPE_NULL => Primitive\NullType::class,
+		self::TYPE_OBJECT_IDENTIFIER => Primitive\ObjectIdentifier::class,
+		self::TYPE_OBJECT_DESCRIPTOR => Primitive\ObjectDescriptor::class,
+		self::TYPE_REAL => Primitive\Real::class,
+		self::TYPE_ENUMERATED => Primitive\Enumerated::class,
+		self::TYPE_UTF8_STRING => Primitive\UTF8String::class,
+		self::TYPE_RELATIVE_OID => Primitive\RelativeOID::class,
+		self::TYPE_SEQUENCE => Constructed\Sequence::class,
+		self::TYPE_SET => Constructed\Set::class,
+		self::TYPE_NUMERIC_STRING => Primitive\NumericString::class,
+		self::TYPE_PRINTABLE_STRING => Primitive\PrintableString::class,
+		self::TYPE_T61_STRING => Primitive\T61String::class,
+		self::TYPE_VIDEOTEX_STRING => Primitive\VideotexString::class,
+		self::TYPE_IA5_STRING => Primitive\IA5String::class,
+		self::TYPE_UTC_TIME => Primitive\UTCTime::class,
+		self::TYPE_GENERALIZED_TIME => Primitive\GeneralizedTime::class,
+		self::TYPE_GRAPHIC_STRING => Primitive\GraphicString::class,
+		self::TYPE_VISIBLE_STRING => Primitive\VisibleString::class,
+		self::TYPE_GENERAL_STRING => Primitive\GeneralString::class,
+		self::TYPE_UNIVERSAL_STRING => Primitive\UniversalString::class,
+		self::TYPE_CHARACTER_STRING => Primitive\CharacterString::class,
+		self::TYPE_BMP_STRING => Primitive\BMPString::class,
+		/* @formatter:on */
+	];
     
-    /**
-     * Pseudotype for all string types.
-     *
-     * May be used as an expectation parameter.
-     *
-     * @var int
-     */
-    const TYPE_STRING = -1;
+	/**
+	 * Pseudotype for all string types.
+	 *
+	 * May be used as an expectation parameter.
+	 *
+	 * @var int
+	 */
+	const TYPE_STRING = -1;
     
-    /**
-     * Pseudotype for all time types.
-     *
-     * May be used as an expectation parameter.
-     *
-     * @var int
-     */
-    const TYPE_TIME = -2;
+	/**
+	 * Pseudotype for all time types.
+	 *
+	 * May be used as an expectation parameter.
+	 *
+	 * @var int
+	 */
+	const TYPE_TIME = -2;
     
-    /**
-     * Mapping from universal type tag to human readable name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_TYPE_TO_NAME = array(
-        /* @formatter:off */
-        self::TYPE_EOC => "EOC",
-        self::TYPE_BOOLEAN => "BOOLEAN",
-        self::TYPE_INTEGER => "INTEGER",
-        self::TYPE_BIT_STRING => "BIT STRING",
-        self::TYPE_OCTET_STRING => "OCTET STRING",
-        self::TYPE_NULL => "NULL",
-        self::TYPE_OBJECT_IDENTIFIER => "OBJECT IDENTIFIER",
-        self::TYPE_OBJECT_DESCRIPTOR => "ObjectDescriptor",
-        self::TYPE_EXTERNAL => "EXTERNAL",
-        self::TYPE_REAL => "REAL",
-        self::TYPE_ENUMERATED => "ENUMERATED",
-        self::TYPE_EMBEDDED_PDV => "EMBEDDED PDV",
-        self::TYPE_UTF8_STRING => "UTF8String",
-        self::TYPE_RELATIVE_OID => "RELATIVE-OID",
-        self::TYPE_SEQUENCE => "SEQUENCE",
-        self::TYPE_SET => "SET",
-        self::TYPE_NUMERIC_STRING => "NumericString",
-        self::TYPE_PRINTABLE_STRING => "PrintableString",
-        self::TYPE_T61_STRING => "T61String",
-        self::TYPE_VIDEOTEX_STRING => "VideotexString",
-        self::TYPE_IA5_STRING => "IA5String",
-        self::TYPE_UTC_TIME => "UTCTime",
-        self::TYPE_GENERALIZED_TIME => "GeneralizedTime",
-        self::TYPE_GRAPHIC_STRING => "GraphicString",
-        self::TYPE_VISIBLE_STRING => "VisibleString",
-        self::TYPE_GENERAL_STRING => "GeneralString",
-        self::TYPE_UNIVERSAL_STRING => "UniversalString",
-        self::TYPE_CHARACTER_STRING => "CHARACTER STRING",
-        self::TYPE_BMP_STRING => "BMPString",
-        self::TYPE_STRING => "Any String",
-        self::TYPE_TIME => "Any Time"
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from universal type tag to human readable name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_TYPE_TO_NAME = array(
+		/* @formatter:off */
+		self::TYPE_EOC => "EOC",
+		self::TYPE_BOOLEAN => "BOOLEAN",
+		self::TYPE_INTEGER => "INTEGER",
+		self::TYPE_BIT_STRING => "BIT STRING",
+		self::TYPE_OCTET_STRING => "OCTET STRING",
+		self::TYPE_NULL => "NULL",
+		self::TYPE_OBJECT_IDENTIFIER => "OBJECT IDENTIFIER",
+		self::TYPE_OBJECT_DESCRIPTOR => "ObjectDescriptor",
+		self::TYPE_EXTERNAL => "EXTERNAL",
+		self::TYPE_REAL => "REAL",
+		self::TYPE_ENUMERATED => "ENUMERATED",
+		self::TYPE_EMBEDDED_PDV => "EMBEDDED PDV",
+		self::TYPE_UTF8_STRING => "UTF8String",
+		self::TYPE_RELATIVE_OID => "RELATIVE-OID",
+		self::TYPE_SEQUENCE => "SEQUENCE",
+		self::TYPE_SET => "SET",
+		self::TYPE_NUMERIC_STRING => "NumericString",
+		self::TYPE_PRINTABLE_STRING => "PrintableString",
+		self::TYPE_T61_STRING => "T61String",
+		self::TYPE_VIDEOTEX_STRING => "VideotexString",
+		self::TYPE_IA5_STRING => "IA5String",
+		self::TYPE_UTC_TIME => "UTCTime",
+		self::TYPE_GENERALIZED_TIME => "GeneralizedTime",
+		self::TYPE_GRAPHIC_STRING => "GraphicString",
+		self::TYPE_VISIBLE_STRING => "VisibleString",
+		self::TYPE_GENERAL_STRING => "GeneralString",
+		self::TYPE_UNIVERSAL_STRING => "UniversalString",
+		self::TYPE_CHARACTER_STRING => "CHARACTER STRING",
+		self::TYPE_BMP_STRING => "BMPString",
+		self::TYPE_STRING => "Any String",
+		self::TYPE_TIME => "Any Time"
+		/* @formatter:on */
+	);
     
-    /**
-     * Element's type tag.
-     *
-     * @var int
-     */
-    protected $_typeTag;
+	/**
+	 * Element's type tag.
+	 *
+	 * @var int
+	 */
+	protected $_typeTag;
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::typeClass()
-     * @return int
-     */
-    abstract public function typeClass(): int;
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::typeClass()
+	 * @return int
+	 */
+	abstract public function typeClass(): int;
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isConstructed()
-     * @return bool
-     */
-    abstract public function isConstructed(): bool;
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isConstructed()
+	 * @return bool
+	 */
+	abstract public function isConstructed(): bool;
     
-    /**
-     * Get the content encoded in DER.
-     *
-     * Returns the DER encoded content without identifier and length header
-     * octets.
-     *
-     * @return string
-     */
-    abstract protected function _encodedContentDER(): string;
+	/**
+	 * Get the content encoded in DER.
+	 *
+	 * Returns the DER encoded content without identifier and length header
+	 * octets.
+	 *
+	 * @return string
+	 */
+	abstract protected function _encodedContentDER(): string;
     
-    /**
-     * Decode type-specific element from DER.
-     *
-     * @param Identifier $identifier Pre-parsed identifier
-     * @param string $data DER data
-     * @param int $offset Offset in data to the next byte after identifier
-     * @throws DecodeException If decoding fails
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        throw new \BadMethodCallException(
-            __METHOD__ . " must be implemented in derived class.");
-    }
+	/**
+	 * Decode type-specific element from DER.
+	 *
+	 * @param Identifier $identifier Pre-parsed identifier
+	 * @param string $data DER data
+	 * @param int $offset Offset in data to the next byte after identifier
+	 * @throws DecodeException If decoding fails
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		throw new \BadMethodCallException(
+			__METHOD__ . " must be implemented in derived class.");
+	}
     
-    /**
-     * Decode element from DER data.
-     *
-     * @param string $data DER encoded data
-     * @param int|null $offset Reference to the variable that contains offset
-     *        into the data where to start parsing. Variable is updated to
-     *        the offset next to the parsed element. If null, start from offset
-     *        0.
-     * @throws DecodeException If decoding fails
-     * @throws \UnexpectedValueException If called in the context of an expected
-     *         type, but decoding yields another type
-     * @return self
-     */
-    public static function fromDER(string $data, int &$offset = null): ElementBase
-    {
-        // decode identifier
-        $idx = $offset ? $offset : 0;
-        $identifier = Identifier::fromDER($data, $idx);
-        // determine class that implements type specific decoding
-        $cls = self::_determineImplClass($identifier);
-        try {
-            // decode remaining element
-            $element = $cls::_decodeFromDER($identifier, $data, $idx);
-        } catch (\LogicException $e) {
-            // rethrow as a RuntimeException for unified exception handling
-            throw new DecodeException(
-                sprintf("Error while decoding %s.",
-                    self::tagToName($identifier->tag())), 0, $e);
-        }
-        // if called in the context of a concrete class, check
-        // that decoded type matches the type of a calling class
-        $called_class = get_called_class();
-        if (__CLASS__ != $called_class) {
-            if (!$element instanceof $called_class) {
-                throw new \UnexpectedValueException(
-                    sprintf("%s expected, got %s.", $called_class,
-                        get_class($element)));
-            }
-        }
-        // update offset for the caller
-        if (isset($offset)) {
-            $offset = $idx;
-        }
-        return $element;
-    }
+	/**
+	 * Decode element from DER data.
+	 *
+	 * @param string $data DER encoded data
+	 * @param int|null $offset Reference to the variable that contains offset
+	 *        into the data where to start parsing. Variable is updated to
+	 *        the offset next to the parsed element. If null, start from offset
+	 *        0.
+	 * @throws DecodeException If decoding fails
+	 * @throws \UnexpectedValueException If called in the context of an expected
+	 *         type, but decoding yields another type
+	 * @return self
+	 */
+	public static function fromDER(string $data, int &$offset = null): ElementBase
+	{
+		// decode identifier
+		$idx = $offset ? $offset : 0;
+		$identifier = Identifier::fromDER($data, $idx);
+		// determine class that implements type specific decoding
+		$cls = self::_determineImplClass($identifier);
+		try {
+			// decode remaining element
+			$element = $cls::_decodeFromDER($identifier, $data, $idx);
+		} catch (\LogicException $e) {
+			// rethrow as a RuntimeException for unified exception handling
+			throw new DecodeException(
+				sprintf("Error while decoding %s.",
+					self::tagToName($identifier->tag())), 0, $e);
+		}
+		// if called in the context of a concrete class, check
+		// that decoded type matches the type of a calling class
+		$called_class = get_called_class();
+		if (__CLASS__ != $called_class) {
+			if (!$element instanceof $called_class) {
+				throw new \UnexpectedValueException(
+					sprintf("%s expected, got %s.", $called_class,
+						get_class($element)));
+			}
+		}
+		// update offset for the caller
+		if (isset($offset)) {
+			$offset = $idx;
+		}
+		return $element;
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\Encodable::toDER()
-     * @return string
-     */
-    public function toDER(): string
-    {
-        $identifier = new Identifier($this->typeClass(),
-            $this->isConstructed() ? Identifier::CONSTRUCTED : Identifier::PRIMITIVE,
-            $this->_typeTag);
-        $content = $this->_encodedContentDER();
-        $length = new Length(strlen($content));
-        return $identifier->toDER() . $length->toDER() . $content;
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\Encodable::toDER()
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		$identifier = new Identifier($this->typeClass(),
+			$this->isConstructed() ? Identifier::CONSTRUCTED : Identifier::PRIMITIVE,
+			$this->_typeTag);
+		$content = $this->_encodedContentDER();
+		$length = new Length(strlen($content));
+		return $identifier->toDER() . $length->toDER() . $content;
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::tag()
-     * @return int
-     */
-    public function tag(): int
-    {
-        return $this->_typeTag;
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::tag()
+	 * @return int
+	 */
+	public function tag(): int
+	{
+		return $this->_typeTag;
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isType()
-     * @return bool
-     */
-    public function isType($tag): bool
-    {
-        // if element is context specific
-        if ($this->typeClass() == Identifier::CLASS_CONTEXT_SPECIFIC) {
-            return false;
-        }
-        // negative tags identify an abstract pseudotype
-        if ($tag < 0) {
-            return $this->_isPseudoType($tag);
-        }
-        return $this->_isConcreteType($tag);
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isType()
+	 * @return bool
+	 */
+	public function isType($tag): bool
+	{
+		// if element is context specific
+		if ($this->typeClass() == Identifier::CLASS_CONTEXT_SPECIFIC) {
+			return false;
+		}
+		// negative tags identify an abstract pseudotype
+		if ($tag < 0) {
+			return $this->_isPseudoType($tag);
+		}
+		return $this->_isConcreteType($tag);
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::expectType()
-     * @return ElementBase
-     */
-    public function expectType($tag): ElementBase
-    {
-        if (!$this->isType($tag)) {
-            throw new \UnexpectedValueException(
-                sprintf("%s expected, got %s.", self::tagToName($tag),
-                    $this->_typeDescriptorString()));
-        }
-        return $this;
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::expectType()
+	 * @return ElementBase
+	 */
+	public function expectType($tag): ElementBase
+	{
+		if (!$this->isType($tag)) {
+			throw new \UnexpectedValueException(
+				sprintf("%s expected, got %s.", self::tagToName($tag),
+					$this->_typeDescriptorString()));
+		}
+		return $this;
+	}
     
-    /**
-     * Check whether the element is a concrete type of a given tag.
-     *
-     * @param int $tag
-     * @return bool
-     */
-    private function _isConcreteType($tag): bool
-    {
-        // if tag doesn't match
-        if ($this->tag() != $tag) {
-            return false;
-        }
-        // if type is universal check that instance is of a correct class
-        if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
-            $cls = self::_determineUniversalImplClass($tag);
-            if (!$this instanceof $cls) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Check whether the element is a concrete type of a given tag.
+	 *
+	 * @param int $tag
+	 * @return bool
+	 */
+	private function _isConcreteType($tag): bool
+	{
+		// if tag doesn't match
+		if ($this->tag() != $tag) {
+			return false;
+		}
+		// if type is universal check that instance is of a correct class
+		if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
+			$cls = self::_determineUniversalImplClass($tag);
+			if (!$this instanceof $cls) {
+				return false;
+			}
+		}
+		return true;
+	}
     
-    /**
-     * Check whether the element is a pseudotype.
-     *
-     * @param int $tag
-     * @return bool
-     */
-    private function _isPseudoType($tag): bool
-    {
-        switch ($tag) {
-            case self::TYPE_STRING:
-                return $this instanceof StringType;
-            case self::TYPE_TIME:
-                return $this instanceof TimeType;
-        }
-        return false;
-    }
+	/**
+	 * Check whether the element is a pseudotype.
+	 *
+	 * @param int $tag
+	 * @return bool
+	 */
+	private function _isPseudoType($tag): bool
+	{
+		switch ($tag) {
+			case self::TYPE_STRING:
+				return $this instanceof StringType;
+			case self::TYPE_TIME:
+				return $this instanceof TimeType;
+		}
+		return false;
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isTagged()
-     * @return bool
-     */
-    public function isTagged(): bool
-    {
-        return $this instanceof TaggedType;
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isTagged()
+	 * @return bool
+	 */
+	public function isTagged(): bool
+	{
+		return $this instanceof TaggedType;
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::expectTagged()
-     * @return TaggedType
-     */
-    public function expectTagged($tag = null): TaggedType
-    {
-        if (!$this->isTagged()) {
-            throw new \UnexpectedValueException(
-                sprintf("Context specific element expected, got %s.",
-                    Identifier::classToName($this->typeClass())));
-        }
-        if (isset($tag) && $this->tag() != $tag) {
-            throw new \UnexpectedValueException(
-                sprintf("Tag %d expected, got %d.", $tag, $this->tag()));
-        }
-        return $this;
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::expectTagged()
+	 * @return TaggedType
+	 */
+	public function expectTagged($tag = null): TaggedType
+	{
+		if (!$this->isTagged()) {
+			throw new \UnexpectedValueException(
+				sprintf("Context specific element expected, got %s.",
+					Identifier::classToName($this->typeClass())));
+		}
+		if (isset($tag) && $this->tag() != $tag) {
+			throw new \UnexpectedValueException(
+				sprintf("Tag %d expected, got %d.", $tag, $this->tag()));
+		}
+		return $this;
+	}
     
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::asElement()
-     * @return Element
-     */
-    final public function asElement(): Element
-    {
-        return $this;
-    }
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::asElement()
+	 * @return Element
+	 */
+	final public function asElement(): Element
+	{
+		return $this;
+	}
     
-    /**
-     * Get element decorated with UnspecifiedType object.
-     *
-     * @return UnspecifiedType
-     */
-    public function asUnspecified(): UnspecifiedType
-    {
-        return new UnspecifiedType($this);
-    }
+	/**
+	 * Get element decorated with UnspecifiedType object.
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function asUnspecified(): UnspecifiedType
+	{
+		return new UnspecifiedType($this);
+	}
     
-    /**
-     * Determine the class that implements the type.
-     *
-     * @param Identifier $identifier
-     * @return string Class name
-     */
-    protected static function _determineImplClass(Identifier $identifier): string
-    {
-        // tagged type
-        if ($identifier->isContextSpecific()) {
-            return TaggedType::class;
-        }
-        // universal class
-        if ($identifier->isUniversal()) {
-            return self::_determineUniversalImplClass(
-                intval($identifier->tag()));
-        }
-        throw new \UnexpectedValueException(
-            sprintf("%s %d not implemented.",
-                Identifier::classToName($identifier->typeClass()),
-                $identifier->tag()));
-    }
+	/**
+	 * Determine the class that implements the type.
+	 *
+	 * @param Identifier $identifier
+	 * @return string Class name
+	 */
+	protected static function _determineImplClass(Identifier $identifier): string
+	{
+		// tagged type
+		if ($identifier->isContextSpecific()) {
+			return TaggedType::class;
+		}
+		// universal class
+		if ($identifier->isUniversal()) {
+			return self::_determineUniversalImplClass(
+				intval($identifier->tag()));
+		}
+		throw new \UnexpectedValueException(
+			sprintf("%s %d not implemented.",
+				Identifier::classToName($identifier->typeClass()),
+				$identifier->tag()));
+	}
     
-    /**
-     * Determine the class that implements an universal type of the given tag.
-     *
-     * @param int $tag
-     * @throws \UnexpectedValueException
-     * @return string Class name
-     */
-    protected static function _determineUniversalImplClass($tag): string
-    {
-        if (!array_key_exists($tag, self::MAP_TAG_TO_CLASS)) {
-            throw new \UnexpectedValueException(
-                "Universal tag $tag not implemented.");
-        }
-        return self::MAP_TAG_TO_CLASS[$tag];
-    }
+	/**
+	 * Determine the class that implements an universal type of the given tag.
+	 *
+	 * @param int $tag
+	 * @throws \UnexpectedValueException
+	 * @return string Class name
+	 */
+	protected static function _determineUniversalImplClass($tag): string
+	{
+		if (!array_key_exists($tag, self::MAP_TAG_TO_CLASS)) {
+			throw new \UnexpectedValueException(
+				"Universal tag $tag not implemented.");
+		}
+		return self::MAP_TAG_TO_CLASS[$tag];
+	}
     
-    /**
-     * Get textual description of the type for debugging purposes.
-     *
-     * @return string
-     */
-    protected function _typeDescriptorString(): string
-    {
-        if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
-            return self::tagToName($this->_typeTag);
-        }
-        return sprintf("%s TAG %d", Identifier::classToName($this->typeClass()),
-            $this->_typeTag);
-    }
+	/**
+	 * Get textual description of the type for debugging purposes.
+	 *
+	 * @return string
+	 */
+	protected function _typeDescriptorString(): string
+	{
+		if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
+			return self::tagToName($this->_typeTag);
+		}
+		return sprintf("%s TAG %d", Identifier::classToName($this->typeClass()),
+			$this->_typeTag);
+	}
     
-    /**
-     * Get human readable name for an universal tag.
-     *
-     * @param int $tag
-     * @return string
-     */
-    public static function tagToName($tag): string
-    {
-        if (!array_key_exists($tag, self::MAP_TYPE_TO_NAME)) {
-            return "TAG $tag";
-        }
-        return self::MAP_TYPE_TO_NAME[$tag];
-    }
+	/**
+	 * Get human readable name for an universal tag.
+	 *
+	 * @param int $tag
+	 * @return string
+	 */
+	public static function tagToName($tag): string
+	{
+		if (!array_key_exists($tag, self::MAP_TYPE_TO_NAME)) {
+			return "TAG $tag";
+		}
+		return self::MAP_TYPE_TO_NAME[$tag];
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -191,7 +191,7 @@ 
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         throw new \BadMethodCallException(
             __METHOD__ . " must be implemented in derived class.");
@@ -210,7 +210,7 @@ 
      *         type, but decoding yields another type
      * @return self
      */
-    public static function fromDER(string $data, int &$offset = null): ElementBase
+    public static function fromDER(string $data, int & $offset = null): ElementBase
     {
         // decode identifier
         $idx = $offset ? $offset : 0;

lib/ASN1/Type/UniversalClass.php

Indentation +9 added lines, -9 removed lines

@@ -11,13 +11,13 @@
  */
 trait UniversalClass
 {
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return Identifier::CLASS_UNIVERSAL;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return Identifier::CLASS_UNIVERSAL;
+	}
 }

lib/ASN1/Type/Constructed/Sequence.php

Indentation +10 added lines, -10 removed lines

@@ -12,14 +12,14 @@
  */
 class Sequence extends Structure
 {
-    /**
-     * Constructor
-     *
-     * @param Element[] $elements Any number of elements
-     */
-    public function __construct(Element ...$elements)
-    {
-        $this->_typeTag = self::TYPE_SEQUENCE;
-        parent::__construct(...$elements);
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param Element[] $elements Any number of elements
+	 */
+	public function __construct(Element ...$elements)
+	{
+		$this->_typeTag = self::TYPE_SEQUENCE;
+		parent::__construct(...$elements);
+	}
 }