sop / asn1

lib/ASN1/Type/Primitive/Boolean.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Primitive;
 

Indentation +55 added lines, -55 removed lines

@@ -16,64 +16,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);
+	}
 }

lib/ASN1/Type/Primitive/BitString.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Primitive;
 

Indentation +182 added lines, -182 removed lines

@@ -16,195 +16,195 @@
  */
 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/UTCTime.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Primitive;
 

Indentation +65 added lines, -65 removed lines

@@ -16,73 +16,73 @@
  */
 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;
-        /** @var $match string[] */
-        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;
+		/** @var $match string[] */
+		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);
+	}
 }

lib/ASN1/Type/Primitive/RelativeOID.php

Indentation +33 added lines, -33 removed lines

@@ -12,39 +12,39 @@
  */
 class RelativeOID extends ObjectIdentifier
 {
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-        $this->_subids = self::_explodeDottedOID($oid);
-        $this->_typeTag = self::TYPE_RELATIVE_OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+		$this->_subids = self::_explodeDottedOID($oid);
+		$this->_typeTag = self::TYPE_RELATIVE_OID;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _encodedContentDER(): string
-    {
-        return self::_encodeSubIDs(...$this->_subids);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return self::_encodeSubIDs(...$this->_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));
-    }
+	/**
+	 *
+	 * {@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

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Primitive;
 

lib/ASN1/Type/Primitive/GeneralizedTime.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Primitive;
 

Indentation +103 added lines, -103 removed lines

@@ -16,113 +16,113 @@
  */
 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;
-        /** @var $match string[] */
-        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;
+		/** @var $match string[] */
+		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);
+	}
 }

lib/ASN1/Type/Tagged/DERTaggedType.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Tagged;
 

Indentation +138 added lines, -138 removed lines

@@ -21,154 +21,154 @@
  * May be encoded back to complete DER encoding.
  */
 class DERTaggedType extends TaggedType implements 
-    ExplicitTagging,
-    ImplicitTagging
+	ExplicitTagging,
+	ImplicitTagging
 {
-    /**
-     * Identifier.
-     *
-     * @var Identifier
-     */
-    private $_identifier;
+	/**
+	 * Identifier.
+	 *
+	 * @var Identifier
+	 */
+	private $_identifier;
     
-    /**
-     * DER data.
-     *
-     * @var string
-     */
-    private $_data;
+	/**
+	 * DER data.
+	 *
+	 * @var string
+	 */
+	private $_data;
     
-    /**
-     * Offset to next byte after identifier.
-     *
-     * @var int
-     */
-    private $_offset;
+	/**
+	 * Offset to next byte after identifier.
+	 *
+	 * @var int
+	 */
+	private $_offset;
     
-    /**
-     * Offset to content.
-     *
-     * @var int
-     */
-    private $_valueOffset;
+	/**
+	 * Offset to content.
+	 *
+	 * @var int
+	 */
+	private $_valueOffset;
     
-    /**
-     * Length of the content.
-     *
-     * @var int
-     */
-    private $_valueLength;
+	/**
+	 * Length of the content.
+	 *
+	 * @var int
+	 */
+	private $_valueLength;
     
-    /**
-     * Constructor.
-     *
-     * @param Identifier $identifier Pre-parsed identifier
-     * @param string $data DER data
-     * @param int $offset Offset to next byte after identifier
-     * @param int $value_offset Offset to content
-     * @param int $value_length Content length
-     */
-    public function __construct(Identifier $identifier, string $data,
-        int $offset, int $value_offset, int $value_length,
-        bool $indefinite_length)
-    {
-        $this->_identifier = $identifier;
-        $this->_data = $data;
-        $this->_offset = $offset;
-        $this->_valueOffset = $value_offset;
-        $this->_valueLength = $value_length;
-        $this->_indefiniteLength = $indefinite_length;
-        $this->_typeTag = $identifier->intTag();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Identifier $identifier Pre-parsed identifier
+	 * @param string $data DER data
+	 * @param int $offset Offset to next byte after identifier
+	 * @param int $value_offset Offset to content
+	 * @param int $value_length Content length
+	 */
+	public function __construct(Identifier $identifier, string $data,
+		int $offset, int $value_offset, int $value_length,
+		bool $indefinite_length)
+	{
+		$this->_identifier = $identifier;
+		$this->_data = $data;
+		$this->_offset = $offset;
+		$this->_valueOffset = $value_offset;
+		$this->_valueLength = $value_length;
+		$this->_indefiniteLength = $indefinite_length;
+		$this->_typeTag = $identifier->intTag();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $length = Length::expectFromDER($data, $idx);
-        // offset to inner value
-        $value_offset = $idx;
-        if ($length->isIndefinite()) {
-            if ($identifier->isPrimitive()) {
-                throw new DecodeException(
-                    'Primitive type with indefinite length is not supported.');
-            }
-            while (!Element::fromDER($data, $idx)->isType(self::TYPE_EOC));
-            // EOC consists of two octets.
-            $value_length = $idx - $value_offset - 2;
-        } else {
-            $value_length = $length->intLength();
-            $idx += $value_length;
-        }
-        // late static binding since ApplicationType and PrivateType extend this class
-        $type = new static($identifier, $data, $offset, $value_offset,
-            $value_length, $length->isIndefinite());
-        $offset = $idx;
-        return $type;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$length = Length::expectFromDER($data, $idx);
+		// offset to inner value
+		$value_offset = $idx;
+		if ($length->isIndefinite()) {
+			if ($identifier->isPrimitive()) {
+				throw new DecodeException(
+					'Primitive type with indefinite length is not supported.');
+			}
+			while (!Element::fromDER($data, $idx)->isType(self::TYPE_EOC));
+			// EOC consists of two octets.
+			$value_length = $idx - $value_offset - 2;
+		} else {
+			$value_length = $length->intLength();
+			$idx += $value_length;
+		}
+		// late static binding since ApplicationType and PrivateType extend this class
+		$type = new static($identifier, $data, $offset, $value_offset,
+			$value_length, $length->isIndefinite());
+		$offset = $idx;
+		return $type;
+	}
     
-    /**
-     *
-     * @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
-    {
-        return substr($this->_data, $this->_valueOffset, $this->_valueLength);
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return substr($this->_data, $this->_valueOffset, $this->_valueLength);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
-     * @return UnspecifiedType
-     */
-    public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
-    {
-        $identifier = $this->_identifier->withClass($class)->withTag($tag);
-        $cls = self::_determineImplClass($identifier);
-        $idx = $this->_offset;
-        /** @var \ASN1\Feature\ElementBase $element */
-        $element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
-        return $element->asUnspecified();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
+	 * @return UnspecifiedType
+	 */
+	public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		$identifier = $this->_identifier->withClass($class)->withTag($tag);
+		$cls = self::_determineImplClass($identifier);
+		$idx = $this->_offset;
+		/** @var \ASN1\Feature\ElementBase $element */
+		$element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
+		return $element->asUnspecified();
+	}
     
-    /**
-     *
-     * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
-     * @return UnspecifiedType
-     */
-    public function explicit($expectedTag = null): UnspecifiedType
-    {
-        $idx = $this->_valueOffset;
-        $element = Element::fromDER($this->_data, $idx);
-        if (isset($expectedTag)) {
-            $element->expectType($expectedTag);
-        }
-        return $element->asUnspecified();
-    }
+	/**
+	 *
+	 * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
+	 * @return UnspecifiedType
+	 */
+	public function explicit($expectedTag = null): UnspecifiedType
+	{
+		$idx = $this->_valueOffset;
+		$element = Element::fromDER($this->_data, $idx);
+		if (isset($expectedTag)) {
+			$element->expectType($expectedTag);
+		}
+		return $element->asUnspecified();
+	}
 }

lib/ASN1/Type/Tagged/PrivateType.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Tagged;
 

lib/ASN1/Type/Tagged/ApplicationType.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type\Tagged;
 

lib/ASN1/Type/PrimitiveString.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace ASN1\Type;
 

Indentation +35 added lines, -35 removed lines

@@ -13,41 +13,41 @@
  */
 abstract class PrimitiveString extends StringType
 {
-    use PrimitiveType;
+	use PrimitiveType;
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        return $this->_string;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		return $this->_string;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Element::_decodeFromDER()
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier,
-        string $data, int &$offset): ElementBase
-    {
-        $idx = $offset;
-        if (!$identifier->isPrimitive()) {
-            throw new DecodeException("DER encoded string must be primitive.");
-        }
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $str = $length ? substr($data, $idx, $length) : "";
-        // substr should never return false, since length is
-        // checked by Length::expectFromDER.
-        assert(is_string($str), new DecodeException("substr"));
-        $offset = $idx + $length;
-        try {
-            return new static($str);
-        } catch (\InvalidArgumentException $e) {
-            throw new DecodeException($e->getMessage(), 0, $e);
-        }
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Element::_decodeFromDER()
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier,
+		string $data, int &$offset): ElementBase
+	{
+		$idx = $offset;
+		if (!$identifier->isPrimitive()) {
+			throw new DecodeException("DER encoded string must be primitive.");
+		}
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$str = $length ? substr($data, $idx, $length) : "";
+		// substr should never return false, since length is
+		// checked by Length::expectFromDER.
+		assert(is_string($str), new DecodeException("substr"));
+		$offset = $idx + $length;
+		try {
+			return new static($str);
+		} catch (\InvalidArgumentException $e) {
+			throw new DecodeException($e->getMessage(), 0, $e);
+		}
+	}
 }