sop / asn1

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

lib/ASN1/Type/UnspecifiedType.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 +678 added lines, -678 removed lines

@@ -16,682 +16,682 @@
  */
 class UnspecifiedType implements ElementBase
 {
-    /**
-     * The wrapped element.
-     *
-     * @var Element
-     */
-    private $_element;
-    
-    /**
-     * Constructor.
-     *
-     * @param Element $el
-     */
-    public function __construct(Element $el)
-    {
-        $this->_element = $el;
-    }
-    
-    /**
-     * Initialize from DER data.
-     *
-     * @param string $data DER encoded data
-     * @return self
-     */
-    public static function fromDER(string $data): self
-    {
-        return Element::fromDER($data)->asUnspecified();
-    }
-    
-    /**
-     * Initialize from ElementBase interface.
-     *
-     * @param ElementBase $el
-     * @return self
-     */
-    public static function fromElementBase(ElementBase $el): self
-    {
-        // if element is already wrapped
-        if ($el instanceof self) {
-            return $el;
-        }
-        return new self($el->asElement());
-    }
-    
-    /**
-     * Compatibility method to dispatch calls to the wrapped element.
-     *
-     * @deprecated Use <code>as*</code> accessor methods to ensure strict type
-     * @param string $mtd Method name
-     * @param array $args Arguments
-     * @return mixed
-     */
-    public function __call($mtd, array $args)
-    {
-        return call_user_func_array([$this->_element, $mtd], $args);
-    }
-    
-    /**
-     * Get the wrapped element as a context specific tagged type.
-     *
-     * @throws \UnexpectedValueException If the element is not tagged
-     * @return TaggedType
-     */
-    public function asTagged(): TaggedType
-    {
-        if (!$this->_element instanceof TaggedType) {
-            throw new \UnexpectedValueException(
-                "Tagged element expected, got " . $this->_typeDescriptorString());
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an application specific type.
-     *
-     * @throws \UnexpectedValueException If element is not application specific
-     * @return \ASN1\Type\Tagged\ApplicationType
-     */
-    public function asApplication(): Tagged\ApplicationType
-    {
-        if (!$this->_element instanceof Tagged\ApplicationType) {
-            throw new \UnexpectedValueException(
-                "Application type expected, got " .
-                $this->_typeDescriptorString());
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a private tagged type.
-     *
-     * @throws \UnexpectedValueException If element is not using private tagging
-     * @return \ASN1\Type\Tagged\PrivateType
-     */
-    public function asPrivate(): Tagged\PrivateType
-    {
-        if (!$this->_element instanceof Tagged\PrivateType) {
-            throw new \UnexpectedValueException(
-                "Private type expected, got " . $this->_typeDescriptorString());
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a boolean type.
-     *
-     * @throws \UnexpectedValueException If the element is not a boolean
-     * @return \ASN1\Type\Primitive\Boolean
-     */
-    public function asBoolean(): Primitive\Boolean
-    {
-        if (!$this->_element instanceof Primitive\Boolean) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_BOOLEAN));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an integer type.
-     *
-     * @throws \UnexpectedValueException If the element is not an integer
-     * @return \ASN1\Type\Primitive\Integer
-     */
-    public function asInteger(): Primitive\Integer
-    {
-        if (!$this->_element instanceof Primitive\Integer) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_INTEGER));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a bit string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a bit string
-     * @return \ASN1\Type\Primitive\BitString
-     */
-    public function asBitString(): Primitive\BitString
-    {
-        if (!$this->_element instanceof Primitive\BitString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_BIT_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an octet string type.
-     *
-     * @throws \UnexpectedValueException If the element is not an octet string
-     * @return \ASN1\Type\Primitive\OctetString
-     */
-    public function asOctetString(): Primitive\OctetString
-    {
-        if (!$this->_element instanceof Primitive\OctetString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_OCTET_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a null type.
-     *
-     * @throws \UnexpectedValueException If the element is not a null
-     * @return \ASN1\Type\Primitive\NullType
-     */
-    public function asNull(): Primitive\NullType
-    {
-        if (!$this->_element instanceof Primitive\NullType) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_NULL));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an object identifier type.
-     *
-     * @throws \UnexpectedValueException If the element is not an object
-     *         identifier
-     * @return \ASN1\Type\Primitive\ObjectIdentifier
-     */
-    public function asObjectIdentifier(): Primitive\ObjectIdentifier
-    {
-        if (!$this->_element instanceof Primitive\ObjectIdentifier) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(
-                    Element::TYPE_OBJECT_IDENTIFIER));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an object descriptor type.
-     *
-     * @throws \UnexpectedValueException If the element is not an object
-     *         descriptor
-     * @return \ASN1\Type\Primitive\ObjectDescriptor
-     */
-    public function asObjectDescriptor(): Primitive\ObjectDescriptor
-    {
-        if (!$this->_element instanceof Primitive\ObjectDescriptor) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(
-                    Element::TYPE_OBJECT_DESCRIPTOR));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a real type.
-     *
-     * @throws \UnexpectedValueException If the element is not a real
-     * @return \ASN1\Type\Primitive\Real
-     */
-    public function asReal(): Primitive\Real
-    {
-        if (!$this->_element instanceof Primitive\Real) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_REAL));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an enumerated type.
-     *
-     * @throws \UnexpectedValueException If the element is not an enumerated
-     * @return \ASN1\Type\Primitive\Enumerated
-     */
-    public function asEnumerated(): Primitive\Enumerated
-    {
-        if (!$this->_element instanceof Primitive\Enumerated) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_ENUMERATED));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a UTF8 string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a UTF8 string
-     * @return \ASN1\Type\Primitive\UTF8String
-     */
-    public function asUTF8String(): Primitive\UTF8String
-    {
-        if (!$this->_element instanceof Primitive\UTF8String) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_UTF8_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a relative OID type.
-     *
-     * @throws \UnexpectedValueException If the element is not a relative OID
-     * @return \ASN1\Type\Primitive\RelativeOID
-     */
-    public function asRelativeOID(): Primitive\RelativeOID
-    {
-        if (!$this->_element instanceof Primitive\RelativeOID) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_RELATIVE_OID));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a sequence type.
-     *
-     * @throws \UnexpectedValueException If the element is not a sequence
-     * @return \ASN1\Type\Constructed\Sequence
-     */
-    public function asSequence(): Constructed\Sequence
-    {
-        if (!$this->_element instanceof Constructed\Sequence) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_SEQUENCE));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a set type.
-     *
-     * @throws \UnexpectedValueException If the element is not a set
-     * @return \ASN1\Type\Constructed\Set
-     */
-    public function asSet(): Constructed\Set
-    {
-        if (!$this->_element instanceof Constructed\Set) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_SET));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a numeric string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a numeric string
-     * @return \ASN1\Type\Primitive\NumericString
-     */
-    public function asNumericString(): Primitive\NumericString
-    {
-        if (!$this->_element instanceof Primitive\NumericString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_NUMERIC_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a printable string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a printable
-     *         string
-     * @return \ASN1\Type\Primitive\PrintableString
-     */
-    public function asPrintableString(): Primitive\PrintableString
-    {
-        if (!$this->_element instanceof Primitive\PrintableString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_PRINTABLE_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a T61 string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a T61 string
-     * @return \ASN1\Type\Primitive\T61String
-     */
-    public function asT61String(): Primitive\T61String
-    {
-        if (!$this->_element instanceof Primitive\T61String) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_T61_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a videotex string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a videotex string
-     * @return \ASN1\Type\Primitive\VideotexString
-     */
-    public function asVideotexString(): Primitive\VideotexString
-    {
-        if (!$this->_element instanceof Primitive\VideotexString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_VIDEOTEX_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a IA5 string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a IA5 string
-     * @return \ASN1\Type\Primitive\IA5String
-     */
-    public function asIA5String(): Primitive\IA5String
-    {
-        if (!$this->_element instanceof Primitive\IA5String) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_IA5_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as an UTC time type.
-     *
-     * @throws \UnexpectedValueException If the element is not a UTC time
-     * @return \ASN1\Type\Primitive\UTCTime
-     */
-    public function asUTCTime(): Primitive\UTCTime
-    {
-        if (!$this->_element instanceof Primitive\UTCTime) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_UTC_TIME));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a generalized time type.
-     *
-     * @throws \UnexpectedValueException If the element is not a generalized
-     *         time
-     * @return \ASN1\Type\Primitive\GeneralizedTime
-     */
-    public function asGeneralizedTime(): Primitive\GeneralizedTime
-    {
-        if (!$this->_element instanceof Primitive\GeneralizedTime) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_GENERALIZED_TIME));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a graphic string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a graphic string
-     * @return \ASN1\Type\Primitive\GraphicString
-     */
-    public function asGraphicString(): Primitive\GraphicString
-    {
-        if (!$this->_element instanceof Primitive\GraphicString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_GRAPHIC_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a visible string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a visible string
-     * @return \ASN1\Type\Primitive\VisibleString
-     */
-    public function asVisibleString(): Primitive\VisibleString
-    {
-        if (!$this->_element instanceof Primitive\VisibleString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_VISIBLE_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a general string type.
-     *
-     * @throws \UnexpectedValueException If the element is not general string
-     * @return \ASN1\Type\Primitive\GeneralString
-     */
-    public function asGeneralString(): Primitive\GeneralString
-    {
-        if (!$this->_element instanceof Primitive\GeneralString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_GENERAL_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a universal string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a universal
-     *         string
-     * @return \ASN1\Type\Primitive\UniversalString
-     */
-    public function asUniversalString(): Primitive\UniversalString
-    {
-        if (!$this->_element instanceof Primitive\UniversalString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_UNIVERSAL_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a character string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a character
-     *         string
-     * @return \ASN1\Type\Primitive\CharacterString
-     */
-    public function asCharacterString(): Primitive\CharacterString
-    {
-        if (!$this->_element instanceof Primitive\CharacterString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_CHARACTER_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a BMP string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a bmp string
-     * @return \ASN1\Type\Primitive\BMPString
-     */
-    public function asBMPString(): Primitive\BMPString
-    {
-        if (!$this->_element instanceof Primitive\BMPString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_BMP_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as a constructed string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a constructed
-     *         string
-     * @return Constructed\ConstructedString
-     */
-    public function asConstructedString(): Constructed\ConstructedString
-    {
-        if (!$this->_element instanceof Constructed\ConstructedString) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(
-                    Element::TYPE_CONSTRUCTED_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as any string type.
-     *
-     * @throws \UnexpectedValueException If the element is not a string
-     * @return StringType
-     */
-    public function asString(): StringType
-    {
-        if (!$this->_element instanceof StringType) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_STRING));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Get the wrapped element as any time type.
-     *
-     * @throws \UnexpectedValueException If the element is not a time
-     * @return TimeType
-     */
-    public function asTime(): TimeType
-    {
-        if (!$this->_element instanceof TimeType) {
-            throw new \UnexpectedValueException(
-                $this->_generateExceptionMessage(Element::TYPE_TIME));
-        }
-        return $this->_element;
-    }
-    
-    /**
-     * Generate message for exceptions thrown by <code>as*</code> methods.
-     *
-     * @param int $tag Type tag of the expected element
-     * @return string
-     */
-    private function _generateExceptionMessage(int $tag): string
-    {
-        return sprintf("%s expected, got %s.", Element::tagToName($tag),
-            $this->_typeDescriptorString());
-    }
-    
-    /**
-     * Get textual description of the wrapped element for debugging purposes.
-     *
-     * @return string
-     */
-    private function _typeDescriptorString(): string
-    {
-        $type_cls = $this->_element->typeClass();
-        $tag = $this->_element->tag();
-        if ($type_cls == Identifier::CLASS_UNIVERSAL) {
-            return Element::tagToName($tag);
-        }
-        return Identifier::classToName($type_cls) . " TAG $tag";
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\Encodable::toDER()
-     * @return string
-     */
-    public function toDER(): string
-    {
-        return $this->_element->toDER();
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_element->typeClass();
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return $this->_element->isConstructed();
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::tag()
-     * @return int
-     */
-    public function tag(): int
-    {
-        return $this->_element->tag();
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Feature\ElementBase::isType()
-     * @return bool
-     */
-    public function isType(int $tag): bool
-    {
-        return $this->_element->isType($tag);
-    }
-    
-    /**
-     *
-     * @deprecated Use any <code>as*</code> accessor method first to ensure
-     *             type strictness.
-     * @see \ASN1\Feature\ElementBase::expectType()
-     * @return ElementBase
-     */
-    public function expectType(int $tag): ElementBase
-    {
-        return $this->_element->expectType($tag);
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::isTagged()
-     * @return bool
-     */
-    public function isTagged(): bool
-    {
-        return $this->_element->isTagged();
-    }
-    
-    /**
-     *
-     * @deprecated Use any <code>as*</code> accessor method first to ensure
-     *             type strictness.
-     * @see \ASN1\Feature\ElementBase::expectTagged()
-     * @return TaggedType
-     */
-    public function expectTagged($tag = null): TaggedType
-    {
-        return $this->_element->expectTagged($tag);
-    }
-    
-    /**
-     *
-     * @see \ASN1\Feature\ElementBase::asElement()
-     * @return Element
-     */
-    public function asElement(): Element
-    {
-        return $this->_element;
-    }
-    
-    /**
-     *
-     * {@inheritdoc}
-     * @return UnspecifiedType
-     */
-    public function asUnspecified(): UnspecifiedType
-    {
-        return $this;
-    }
+	/**
+	 * The wrapped element.
+	 *
+	 * @var Element
+	 */
+	private $_element;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param Element $el
+	 */
+	public function __construct(Element $el)
+	{
+		$this->_element = $el;
+	}
+    
+	/**
+	 * Initialize from DER data.
+	 *
+	 * @param string $data DER encoded data
+	 * @return self
+	 */
+	public static function fromDER(string $data): self
+	{
+		return Element::fromDER($data)->asUnspecified();
+	}
+    
+	/**
+	 * Initialize from ElementBase interface.
+	 *
+	 * @param ElementBase $el
+	 * @return self
+	 */
+	public static function fromElementBase(ElementBase $el): self
+	{
+		// if element is already wrapped
+		if ($el instanceof self) {
+			return $el;
+		}
+		return new self($el->asElement());
+	}
+    
+	/**
+	 * Compatibility method to dispatch calls to the wrapped element.
+	 *
+	 * @deprecated Use <code>as*</code> accessor methods to ensure strict type
+	 * @param string $mtd Method name
+	 * @param array $args Arguments
+	 * @return mixed
+	 */
+	public function __call($mtd, array $args)
+	{
+		return call_user_func_array([$this->_element, $mtd], $args);
+	}
+    
+	/**
+	 * Get the wrapped element as a context specific tagged type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not tagged
+	 * @return TaggedType
+	 */
+	public function asTagged(): TaggedType
+	{
+		if (!$this->_element instanceof TaggedType) {
+			throw new \UnexpectedValueException(
+				"Tagged element expected, got " . $this->_typeDescriptorString());
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an application specific type.
+	 *
+	 * @throws \UnexpectedValueException If element is not application specific
+	 * @return \ASN1\Type\Tagged\ApplicationType
+	 */
+	public function asApplication(): Tagged\ApplicationType
+	{
+		if (!$this->_element instanceof Tagged\ApplicationType) {
+			throw new \UnexpectedValueException(
+				"Application type expected, got " .
+				$this->_typeDescriptorString());
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a private tagged type.
+	 *
+	 * @throws \UnexpectedValueException If element is not using private tagging
+	 * @return \ASN1\Type\Tagged\PrivateType
+	 */
+	public function asPrivate(): Tagged\PrivateType
+	{
+		if (!$this->_element instanceof Tagged\PrivateType) {
+			throw new \UnexpectedValueException(
+				"Private type expected, got " . $this->_typeDescriptorString());
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a boolean type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a boolean
+	 * @return \ASN1\Type\Primitive\Boolean
+	 */
+	public function asBoolean(): Primitive\Boolean
+	{
+		if (!$this->_element instanceof Primitive\Boolean) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_BOOLEAN));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an integer type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an integer
+	 * @return \ASN1\Type\Primitive\Integer
+	 */
+	public function asInteger(): Primitive\Integer
+	{
+		if (!$this->_element instanceof Primitive\Integer) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_INTEGER));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a bit string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a bit string
+	 * @return \ASN1\Type\Primitive\BitString
+	 */
+	public function asBitString(): Primitive\BitString
+	{
+		if (!$this->_element instanceof Primitive\BitString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_BIT_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an octet string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an octet string
+	 * @return \ASN1\Type\Primitive\OctetString
+	 */
+	public function asOctetString(): Primitive\OctetString
+	{
+		if (!$this->_element instanceof Primitive\OctetString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_OCTET_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a null type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a null
+	 * @return \ASN1\Type\Primitive\NullType
+	 */
+	public function asNull(): Primitive\NullType
+	{
+		if (!$this->_element instanceof Primitive\NullType) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_NULL));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an object identifier type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an object
+	 *         identifier
+	 * @return \ASN1\Type\Primitive\ObjectIdentifier
+	 */
+	public function asObjectIdentifier(): Primitive\ObjectIdentifier
+	{
+		if (!$this->_element instanceof Primitive\ObjectIdentifier) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(
+					Element::TYPE_OBJECT_IDENTIFIER));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an object descriptor type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an object
+	 *         descriptor
+	 * @return \ASN1\Type\Primitive\ObjectDescriptor
+	 */
+	public function asObjectDescriptor(): Primitive\ObjectDescriptor
+	{
+		if (!$this->_element instanceof Primitive\ObjectDescriptor) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(
+					Element::TYPE_OBJECT_DESCRIPTOR));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a real type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a real
+	 * @return \ASN1\Type\Primitive\Real
+	 */
+	public function asReal(): Primitive\Real
+	{
+		if (!$this->_element instanceof Primitive\Real) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_REAL));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an enumerated type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not an enumerated
+	 * @return \ASN1\Type\Primitive\Enumerated
+	 */
+	public function asEnumerated(): Primitive\Enumerated
+	{
+		if (!$this->_element instanceof Primitive\Enumerated) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_ENUMERATED));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a UTF8 string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a UTF8 string
+	 * @return \ASN1\Type\Primitive\UTF8String
+	 */
+	public function asUTF8String(): Primitive\UTF8String
+	{
+		if (!$this->_element instanceof Primitive\UTF8String) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_UTF8_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a relative OID type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a relative OID
+	 * @return \ASN1\Type\Primitive\RelativeOID
+	 */
+	public function asRelativeOID(): Primitive\RelativeOID
+	{
+		if (!$this->_element instanceof Primitive\RelativeOID) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_RELATIVE_OID));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a sequence type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a sequence
+	 * @return \ASN1\Type\Constructed\Sequence
+	 */
+	public function asSequence(): Constructed\Sequence
+	{
+		if (!$this->_element instanceof Constructed\Sequence) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_SEQUENCE));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a set type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a set
+	 * @return \ASN1\Type\Constructed\Set
+	 */
+	public function asSet(): Constructed\Set
+	{
+		if (!$this->_element instanceof Constructed\Set) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_SET));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a numeric string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a numeric string
+	 * @return \ASN1\Type\Primitive\NumericString
+	 */
+	public function asNumericString(): Primitive\NumericString
+	{
+		if (!$this->_element instanceof Primitive\NumericString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_NUMERIC_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a printable string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a printable
+	 *         string
+	 * @return \ASN1\Type\Primitive\PrintableString
+	 */
+	public function asPrintableString(): Primitive\PrintableString
+	{
+		if (!$this->_element instanceof Primitive\PrintableString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_PRINTABLE_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a T61 string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a T61 string
+	 * @return \ASN1\Type\Primitive\T61String
+	 */
+	public function asT61String(): Primitive\T61String
+	{
+		if (!$this->_element instanceof Primitive\T61String) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_T61_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a videotex string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a videotex string
+	 * @return \ASN1\Type\Primitive\VideotexString
+	 */
+	public function asVideotexString(): Primitive\VideotexString
+	{
+		if (!$this->_element instanceof Primitive\VideotexString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_VIDEOTEX_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a IA5 string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a IA5 string
+	 * @return \ASN1\Type\Primitive\IA5String
+	 */
+	public function asIA5String(): Primitive\IA5String
+	{
+		if (!$this->_element instanceof Primitive\IA5String) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_IA5_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as an UTC time type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a UTC time
+	 * @return \ASN1\Type\Primitive\UTCTime
+	 */
+	public function asUTCTime(): Primitive\UTCTime
+	{
+		if (!$this->_element instanceof Primitive\UTCTime) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_UTC_TIME));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a generalized time type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a generalized
+	 *         time
+	 * @return \ASN1\Type\Primitive\GeneralizedTime
+	 */
+	public function asGeneralizedTime(): Primitive\GeneralizedTime
+	{
+		if (!$this->_element instanceof Primitive\GeneralizedTime) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_GENERALIZED_TIME));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a graphic string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a graphic string
+	 * @return \ASN1\Type\Primitive\GraphicString
+	 */
+	public function asGraphicString(): Primitive\GraphicString
+	{
+		if (!$this->_element instanceof Primitive\GraphicString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_GRAPHIC_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a visible string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a visible string
+	 * @return \ASN1\Type\Primitive\VisibleString
+	 */
+	public function asVisibleString(): Primitive\VisibleString
+	{
+		if (!$this->_element instanceof Primitive\VisibleString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_VISIBLE_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a general string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not general string
+	 * @return \ASN1\Type\Primitive\GeneralString
+	 */
+	public function asGeneralString(): Primitive\GeneralString
+	{
+		if (!$this->_element instanceof Primitive\GeneralString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_GENERAL_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a universal string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a universal
+	 *         string
+	 * @return \ASN1\Type\Primitive\UniversalString
+	 */
+	public function asUniversalString(): Primitive\UniversalString
+	{
+		if (!$this->_element instanceof Primitive\UniversalString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_UNIVERSAL_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a character string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a character
+	 *         string
+	 * @return \ASN1\Type\Primitive\CharacterString
+	 */
+	public function asCharacterString(): Primitive\CharacterString
+	{
+		if (!$this->_element instanceof Primitive\CharacterString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_CHARACTER_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a BMP string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a bmp string
+	 * @return \ASN1\Type\Primitive\BMPString
+	 */
+	public function asBMPString(): Primitive\BMPString
+	{
+		if (!$this->_element instanceof Primitive\BMPString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_BMP_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as a constructed string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a constructed
+	 *         string
+	 * @return Constructed\ConstructedString
+	 */
+	public function asConstructedString(): Constructed\ConstructedString
+	{
+		if (!$this->_element instanceof Constructed\ConstructedString) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(
+					Element::TYPE_CONSTRUCTED_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as any string type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a string
+	 * @return StringType
+	 */
+	public function asString(): StringType
+	{
+		if (!$this->_element instanceof StringType) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_STRING));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Get the wrapped element as any time type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a time
+	 * @return TimeType
+	 */
+	public function asTime(): TimeType
+	{
+		if (!$this->_element instanceof TimeType) {
+			throw new \UnexpectedValueException(
+				$this->_generateExceptionMessage(Element::TYPE_TIME));
+		}
+		return $this->_element;
+	}
+    
+	/**
+	 * Generate message for exceptions thrown by <code>as*</code> methods.
+	 *
+	 * @param int $tag Type tag of the expected element
+	 * @return string
+	 */
+	private function _generateExceptionMessage(int $tag): string
+	{
+		return sprintf("%s expected, got %s.", Element::tagToName($tag),
+			$this->_typeDescriptorString());
+	}
+    
+	/**
+	 * Get textual description of the wrapped element for debugging purposes.
+	 *
+	 * @return string
+	 */
+	private function _typeDescriptorString(): string
+	{
+		$type_cls = $this->_element->typeClass();
+		$tag = $this->_element->tag();
+		if ($type_cls == Identifier::CLASS_UNIVERSAL) {
+			return Element::tagToName($tag);
+		}
+		return Identifier::classToName($type_cls) . " TAG $tag";
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\Encodable::toDER()
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		return $this->_element->toDER();
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_element->typeClass();
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return $this->_element->isConstructed();
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::tag()
+	 * @return int
+	 */
+	public function tag(): int
+	{
+		return $this->_element->tag();
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Feature\ElementBase::isType()
+	 * @return bool
+	 */
+	public function isType(int $tag): bool
+	{
+		return $this->_element->isType($tag);
+	}
+    
+	/**
+	 *
+	 * @deprecated Use any <code>as*</code> accessor method first to ensure
+	 *             type strictness.
+	 * @see \ASN1\Feature\ElementBase::expectType()
+	 * @return ElementBase
+	 */
+	public function expectType(int $tag): ElementBase
+	{
+		return $this->_element->expectType($tag);
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::isTagged()
+	 * @return bool
+	 */
+	public function isTagged(): bool
+	{
+		return $this->_element->isTagged();
+	}
+    
+	/**
+	 *
+	 * @deprecated Use any <code>as*</code> accessor method first to ensure
+	 *             type strictness.
+	 * @see \ASN1\Feature\ElementBase::expectTagged()
+	 * @return TaggedType
+	 */
+	public function expectTagged($tag = null): TaggedType
+	{
+		return $this->_element->expectTagged($tag);
+	}
+    
+	/**
+	 *
+	 * @see \ASN1\Feature\ElementBase::asElement()
+	 * @return Element
+	 */
+	public function asElement(): Element
+	{
+		return $this->_element;
+	}
+    
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return UnspecifiedType
+	 */
+	public function asUnspecified(): UnspecifiedType
+	{
+		return $this;
+	}
 }

lib/ASN1/Type/TimeType.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 +78 added lines, -78 removed lines

@@ -10,88 +10,88 @@
  */
 abstract class TimeType extends Element
 {
-    /**
-     * UTC timezone.
-     *
-     * @var string
-     */
-    const TZ_UTC = "UTC";
+	/**
+	 * UTC timezone.
+	 *
+	 * @var string
+	 */
+	const TZ_UTC = "UTC";
     
-    /**
-     * Date and time.
-     *
-     * @var \DateTimeImmutable $_dateTime
-     */
-    protected $_dateTime;
+	/**
+	 * Date and time.
+	 *
+	 * @var \DateTimeImmutable $_dateTime
+	 */
+	protected $_dateTime;
     
-    /**
-     * Constructor.
-     *
-     * @param \DateTimeImmutable $dt
-     */
-    public function __construct(\DateTimeImmutable $dt)
-    {
-        $this->_dateTime = $dt;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 */
+	public function __construct(\DateTimeImmutable $dt)
+	{
+		$this->_dateTime = $dt;
+	}
     
-    /**
-     * Initialize from datetime string.
-     *
-     * @link http://php.net/manual/en/datetime.formats.php
-     * @param string $time Time string
-     * @param string|null $tz Timezone, if null use default.
-     * @throws \RuntimeException
-     * @return self
-     */
-    public static function fromString(string $time, string $tz = null): self
-    {
-        try {
-            if (!isset($tz)) {
-                $tz = date_default_timezone_get();
-            }
-            return new static(
-                new \DateTimeImmutable($time, self::_createTimeZone($tz)));
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                "Failed to create DateTime: " .
-                self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
-        }
-    }
+	/**
+	 * Initialize from datetime string.
+	 *
+	 * @link http://php.net/manual/en/datetime.formats.php
+	 * @param string $time Time string
+	 * @param string|null $tz Timezone, if null use default.
+	 * @throws \RuntimeException
+	 * @return self
+	 */
+	public static function fromString(string $time, string $tz = null): self
+	{
+		try {
+			if (!isset($tz)) {
+				$tz = date_default_timezone_get();
+			}
+			return new static(
+				new \DateTimeImmutable($time, self::_createTimeZone($tz)));
+		} catch (\Exception $e) {
+			throw new \RuntimeException(
+				"Failed to create DateTime: " .
+				self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
+		}
+	}
     
-    /**
-     * Get the date and time.
-     *
-     * @return \DateTimeImmutable
-     */
-    public function dateTime(): \DateTimeImmutable
-    {
-        return $this->_dateTime;
-    }
+	/**
+	 * Get the date and time.
+	 *
+	 * @return \DateTimeImmutable
+	 */
+	public function dateTime(): \DateTimeImmutable
+	{
+		return $this->_dateTime;
+	}
     
-    /**
-     * Create DateTimeZone object from string.
-     *
-     * @param string $tz
-     * @throws \UnexpectedValueException If timezone is invalid
-     * @return \DateTimeZone
-     */
-    protected static function _createTimeZone(string $tz): \DateTimeZone
-    {
-        try {
-            return new \DateTimeZone($tz);
-        } catch (\Exception $e) {
-            throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
-        }
-    }
+	/**
+	 * Create DateTimeZone object from string.
+	 *
+	 * @param string $tz
+	 * @throws \UnexpectedValueException If timezone is invalid
+	 * @return \DateTimeZone
+	 */
+	protected static function _createTimeZone(string $tz): \DateTimeZone
+	{
+		try {
+			return new \DateTimeZone($tz);
+		} catch (\Exception $e) {
+			throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
+		}
+	}
     
-    /**
-     * Get last error caused by DateTimeImmutable.
-     *
-     * @return string
-     */
-    protected static function _getLastDateTimeImmutableErrorsStr(): string
-    {
-        $errors = \DateTimeImmutable::getLastErrors()["errors"];
-        return implode(", ", $errors);
-    }
+	/**
+	 * Get last error caused by DateTimeImmutable.
+	 *
+	 * @return string
+	 */
+	protected static function _getLastDateTimeImmutableErrorsStr(): string
+	{
+		$errors = \DateTimeImmutable::getLastErrors()["errors"];
+		return implode(", ", $errors);
+	}
 }