sop / asn1

lib/ASN1/Element.php

Switch Indentation +4 added lines, -4 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -58,7 +58,7 @@ 
      *
      * @var array
      */
-    const MAP_TAG_TO_CLASS = [ /* @formatter:off */
+    const MAP_TAG_TO_CLASS = [/* @formatter:off */
         self::TYPE_BOOLEAN => Primitive\Boolean::class,
         self::TYPE_INTEGER => Primitive\Integer::class,
         self::TYPE_BIT_STRING => Primitive\BitString::class,
@@ -113,7 +113,7 @@ 
      *
      * @var array
      */
-    const MAP_TYPE_TO_NAME = [ /* @formatter:off */
+    const MAP_TYPE_TO_NAME = [/* @formatter:off */
         self::TYPE_EOC => "EOC",
         self::TYPE_BOOLEAN => "BOOLEAN",
         self::TYPE_INTEGER => "INTEGER",
@@ -189,7 +189,7 @@ 
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         throw new \BadMethodCallException(
             __METHOD__ . " must be implemented in derived class.");
@@ -208,7 +208,7 @@ 
      *         type, but decoding yields another type
      * @return ElementBase
      */
-    public static function fromDER(string $data, int &$offset = null): ElementBase
+    public static function fromDER(string $data, int & $offset = null): ElementBase
     {
         // decode identifier
         $idx = $offset ? $offset : 0;

Indentation +412 added lines, -412 removed lines

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

lib/ASN1/Feature/ElementBase.php

Indentation +74 added lines, -74 removed lines

@@ -13,86 +13,86 @@
  */
 interface ElementBase extends Encodable
 {
-    /**
-     * Get the class of the ASN.1 type.
-     *
-     * One of <code>Identifier::CLASS_*</code> constants.
-     *
-     * @return int
-     */
-    public function typeClass(): int;
+	/**
+	 * Get the class of the ASN.1 type.
+	 *
+	 * One of <code>Identifier::CLASS_*</code> constants.
+	 *
+	 * @return int
+	 */
+	public function typeClass(): int;
     
-    /**
-     * Check whether the element is constructed.
-     *
-     * Otherwise it's primitive.
-     *
-     * @return bool
-     */
-    public function isConstructed(): bool;
+	/**
+	 * Check whether the element is constructed.
+	 *
+	 * Otherwise it's primitive.
+	 *
+	 * @return bool
+	 */
+	public function isConstructed(): bool;
     
-    /**
-     * Get the tag of the element.
-     *
-     * Interpretation of the tag depends on the context. For example it may
-     * represent a universal type tag or a tag of an implicitly or explicitly
-     * tagged type.
-     *
-     * @return int
-     */
-    public function tag(): int;
+	/**
+	 * Get the tag of the element.
+	 *
+	 * Interpretation of the tag depends on the context. For example it may
+	 * represent a universal type tag or a tag of an implicitly or explicitly
+	 * tagged type.
+	 *
+	 * @return int
+	 */
+	public function tag(): int;
     
-    /**
-     * Check whether the element is a type of a given tag.
-     *
-     * @param int $tag Type tag
-     * @return boolean
-     */
-    public function isType(int $tag): bool;
+	/**
+	 * Check whether the element is a type of a given tag.
+	 *
+	 * @param int $tag Type tag
+	 * @return boolean
+	 */
+	public function isType(int $tag): bool;
     
-    /**
-     * Check whether the element is a type of a given tag.
-     *
-     * Throws an exception if expectation fails.
-     *
-     * @param int $tag Type tag
-     * @throws \UnexpectedValueException If the element type differs from the
-     *         expected
-     * @return ElementBase
-     */
-    public function expectType(int $tag): ElementBase;
+	/**
+	 * Check whether the element is a type of a given tag.
+	 *
+	 * Throws an exception if expectation fails.
+	 *
+	 * @param int $tag Type tag
+	 * @throws \UnexpectedValueException If the element type differs from the
+	 *         expected
+	 * @return ElementBase
+	 */
+	public function expectType(int $tag): ElementBase;
     
-    /**
-     * Check whether the element is tagged (context specific).
-     *
-     * @return bool
-     */
-    public function isTagged(): bool;
+	/**
+	 * Check whether the element is tagged (context specific).
+	 *
+	 * @return bool
+	 */
+	public function isTagged(): bool;
     
-    /**
-     * Check whether the element is tagged (context specific) and optionally has
-     * a given tag.
-     *
-     * Throws an exception if the element is not tagged or tag differs from
-     * the expected.
-     *
-     * @param int|null $tag Optional type tag
-     * @throws \UnexpectedValueException If expectation fails
-     * @return \ASN1\Type\TaggedType
-     */
-    public function expectTagged($tag = null): TaggedType;
+	/**
+	 * Check whether the element is tagged (context specific) and optionally has
+	 * a given tag.
+	 *
+	 * Throws an exception if the element is not tagged or tag differs from
+	 * the expected.
+	 *
+	 * @param int|null $tag Optional type tag
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return \ASN1\Type\TaggedType
+	 */
+	public function expectTagged($tag = null): TaggedType;
     
-    /**
-     * Get the object as an abstract Element instance.
-     *
-     * @return \ASN1\Element
-     */
-    public function asElement(): Element;
+	/**
+	 * Get the object as an abstract Element instance.
+	 *
+	 * @return \ASN1\Element
+	 */
+	public function asElement(): Element;
     
-    /**
-     * Get the object as an UnspecifiedType instance.
-     *
-     * @return UnspecifiedType
-     */
-    public function asUnspecified(): UnspecifiedType;
+	/**
+	 * Get the object as an UnspecifiedType instance.
+	 *
+	 * @return UnspecifiedType
+	 */
+	public function asUnspecified(): UnspecifiedType;
 }

lib/ASN1/Component/Identifier.php

Indentation +269 added lines, -269 removed lines

@@ -13,295 +13,295 @@
  */
 class Identifier implements Encodable
 {
-    // Type class enumerations
-    const CLASS_UNIVERSAL = 0b00;
-    const CLASS_APPLICATION = 0b01;
-    const CLASS_CONTEXT_SPECIFIC = 0b10;
-    const CLASS_PRIVATE = 0b11;
+	// Type class enumerations
+	const CLASS_UNIVERSAL = 0b00;
+	const CLASS_APPLICATION = 0b01;
+	const CLASS_CONTEXT_SPECIFIC = 0b10;
+	const CLASS_PRIVATE = 0b11;
     
-    /**
-     * Mapping from type class to human readable name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_CLASS_TO_NAME = [ /* @formatter:off */
-        self::CLASS_UNIVERSAL => "UNIVERSAL", 
-        self::CLASS_APPLICATION => "APPLICATION", 
-        self::CLASS_CONTEXT_SPECIFIC => "CONTEXT SPECIFIC", 
-        self::CLASS_PRIVATE => "PRIVATE",
-        /* @formatter:on */
-    ];
+	/**
+	 * Mapping from type class to human readable name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_CLASS_TO_NAME = [ /* @formatter:off */
+		self::CLASS_UNIVERSAL => "UNIVERSAL", 
+		self::CLASS_APPLICATION => "APPLICATION", 
+		self::CLASS_CONTEXT_SPECIFIC => "CONTEXT SPECIFIC", 
+		self::CLASS_PRIVATE => "PRIVATE",
+		/* @formatter:on */
+	];
     
-    // P/C enumerations
-    const PRIMITIVE = 0b0;
-    const CONSTRUCTED = 0b1;
+	// P/C enumerations
+	const PRIMITIVE = 0b0;
+	const CONSTRUCTED = 0b1;
     
-    /**
-     * Type class.
-     *
-     * @var int
-     */
-    private $_class;
+	/**
+	 * Type class.
+	 *
+	 * @var int
+	 */
+	private $_class;
     
-    /**
-     * Primitive or Constructed.
-     *
-     * @var int
-     */
-    private $_pc;
+	/**
+	 * Primitive or Constructed.
+	 *
+	 * @var int
+	 */
+	private $_pc;
     
-    /**
-     * Content type tag.
-     *
-     * @var BigInt
-     */
-    private $_tag;
+	/**
+	 * Content type tag.
+	 *
+	 * @var BigInt
+	 */
+	private $_tag;
     
-    /**
-     * Constructor.
-     *
-     * @param int $class Type class
-     * @param int $pc Primitive / Constructed
-     * @param int|string $tag Type tag number
-     */
-    public function __construct(int $class, int $pc, $tag)
-    {
-        $this->_class = 0b11 & $class;
-        $this->_pc = 0b1 & $pc;
-        $this->_tag = new BigInt($tag);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $class Type class
+	 * @param int $pc Primitive / Constructed
+	 * @param int|string $tag Type tag number
+	 */
+	public function __construct(int $class, int $pc, $tag)
+	{
+		$this->_class = 0b11 & $class;
+		$this->_pc = 0b1 & $pc;
+		$this->_tag = new BigInt($tag);
+	}
     
-    /**
-     * Decode identifier component from DER data.
-     *
-     * @param string $data DER encoded data
-     * @param int|null $offset Reference to the variable that contains offset
-     *        into the data where to start parsing. Variable is updated to
-     *        the offset next to the parsed identifier. If null, start from
-     *        offset 0.
-     * @throws DecodeException If decoding fails
-     * @return self
-     */
-    public static function fromDER(string $data, int &$offset = null): Identifier
-    {
-        $idx = $offset ? $offset : 0;
-        $datalen = strlen($data);
-        if ($idx >= $datalen) {
-            throw new DecodeException("Invalid offset.");
-        }
-        $byte = ord($data[$idx++]);
-        // bits 8 and 7 (class)
-        // 0 = universal, 1 = application, 2 = context-specific, 3 = private
-        $class = (0b11000000 & $byte) >> 6;
-        // bit 6 (0 = primitive / 1 = constructed)
-        $pc = (0b00100000 & $byte) >> 5;
-        // bits 5 to 1 (tag number)
-        $tag = (0b00011111 & $byte);
-        // long-form identifier
-        if (0x1f == $tag) {
-            $tag = self::_decodeLongFormTag($data, $idx);
-        }
-        if (isset($offset)) {
-            $offset = $idx;
-        }
-        return new self($class, $pc, $tag);
-    }
+	/**
+	 * Decode identifier component from DER data.
+	 *
+	 * @param string $data DER encoded data
+	 * @param int|null $offset Reference to the variable that contains offset
+	 *        into the data where to start parsing. Variable is updated to
+	 *        the offset next to the parsed identifier. If null, start from
+	 *        offset 0.
+	 * @throws DecodeException If decoding fails
+	 * @return self
+	 */
+	public static function fromDER(string $data, int &$offset = null): Identifier
+	{
+		$idx = $offset ? $offset : 0;
+		$datalen = strlen($data);
+		if ($idx >= $datalen) {
+			throw new DecodeException("Invalid offset.");
+		}
+		$byte = ord($data[$idx++]);
+		// bits 8 and 7 (class)
+		// 0 = universal, 1 = application, 2 = context-specific, 3 = private
+		$class = (0b11000000 & $byte) >> 6;
+		// bit 6 (0 = primitive / 1 = constructed)
+		$pc = (0b00100000 & $byte) >> 5;
+		// bits 5 to 1 (tag number)
+		$tag = (0b00011111 & $byte);
+		// long-form identifier
+		if (0x1f == $tag) {
+			$tag = self::_decodeLongFormTag($data, $idx);
+		}
+		if (isset($offset)) {
+			$offset = $idx;
+		}
+		return new self($class, $pc, $tag);
+	}
     
-    /**
-     * Parse long form tag.
-     *
-     * @param string $data DER data
-     * @param int $offset Reference to the variable containing offset to data
-     * @throws DecodeException If decoding fails
-     * @return string Tag number
-     */
-    private static function _decodeLongFormTag(string $data, int &$offset): string
-    {
-        $datalen = strlen($data);
-        $tag = gmp_init(0, 10);
-        while (true) {
-            if ($offset >= $datalen) {
-                throw new DecodeException(
-                    "Unexpected end of data while decoding" .
-                         " long form identifier.");
-            }
-            $byte = ord($data[$offset++]);
-            $tag <<= 7;
-            $tag |= 0x7f & $byte;
-            // last byte has bit 8 set to zero
-            if (!(0x80 & $byte)) {
-                break;
-            }
-        }
-        return gmp_strval($tag, 10);
-    }
+	/**
+	 * Parse long form tag.
+	 *
+	 * @param string $data DER data
+	 * @param int $offset Reference to the variable containing offset to data
+	 * @throws DecodeException If decoding fails
+	 * @return string Tag number
+	 */
+	private static function _decodeLongFormTag(string $data, int &$offset): string
+	{
+		$datalen = strlen($data);
+		$tag = gmp_init(0, 10);
+		while (true) {
+			if ($offset >= $datalen) {
+				throw new DecodeException(
+					"Unexpected end of data while decoding" .
+						 " long form identifier.");
+			}
+			$byte = ord($data[$offset++]);
+			$tag <<= 7;
+			$tag |= 0x7f & $byte;
+			// last byte has bit 8 set to zero
+			if (!(0x80 & $byte)) {
+				break;
+			}
+		}
+		return gmp_strval($tag, 10);
+	}
     
-    /**
-     *
-     * @see Encodable::toDER()
-     * @return string
-     */
-    public function toDER(): string
-    {
-        $bytes = [];
-        $byte = $this->_class << 6 | $this->_pc << 5;
-        $tag = $this->_tag->gmpObj();
-        if ($tag < 0x1f) {
-            $bytes[] = $byte | $tag;
-        } else { // long-form identifier
-            $bytes[] = $byte | 0x1f;
-            $octets = [];
-            for (; $tag > 0; $tag >>= 7) {
-                array_push($octets, gmp_intval(0x80 | ($tag & 0x7f)));
-            }
-            // last octet has bit 8 set to zero
-            $octets[0] &= 0x7f;
-            foreach (array_reverse($octets) as $octet) {
-                $bytes[] = $octet;
-            }
-        }
-        return pack("C*", ...$bytes);
-    }
+	/**
+	 *
+	 * @see Encodable::toDER()
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		$bytes = [];
+		$byte = $this->_class << 6 | $this->_pc << 5;
+		$tag = $this->_tag->gmpObj();
+		if ($tag < 0x1f) {
+			$bytes[] = $byte | $tag;
+		} else { // long-form identifier
+			$bytes[] = $byte | 0x1f;
+			$octets = [];
+			for (; $tag > 0; $tag >>= 7) {
+				array_push($octets, gmp_intval(0x80 | ($tag & 0x7f)));
+			}
+			// last octet has bit 8 set to zero
+			$octets[0] &= 0x7f;
+			foreach (array_reverse($octets) as $octet) {
+				$bytes[] = $octet;
+			}
+		}
+		return pack("C*", ...$bytes);
+	}
     
-    /**
-     * Get class of the type.
-     *
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_class;
-    }
+	/**
+	 * Get class of the type.
+	 *
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_class;
+	}
     
-    /**
-     * Get P/C.
-     *
-     * @return int
-     */
-    public function pc(): int
-    {
-        return $this->_pc;
-    }
+	/**
+	 * Get P/C.
+	 *
+	 * @return int
+	 */
+	public function pc(): int
+	{
+		return $this->_pc;
+	}
     
-    /**
-     * Get the tag number.
-     *
-     * @return string Base 10 integer string
-     */
-    public function tag(): string
-    {
-        return $this->_tag->base10();
-    }
+	/**
+	 * Get the tag number.
+	 *
+	 * @return string Base 10 integer string
+	 */
+	public function tag(): string
+	{
+		return $this->_tag->base10();
+	}
     
-    /**
-     * Get the tag as an integer.
-     *
-     * @return int
-     */
-    public function intTag(): int
-    {
-        return $this->_tag->intVal();
-    }
+	/**
+	 * Get the tag as an integer.
+	 *
+	 * @return int
+	 */
+	public function intTag(): int
+	{
+		return $this->_tag->intVal();
+	}
     
-    /**
-     * Check whether type is of an universal class.
-     *
-     * @return boolean
-     */
-    public function isUniversal(): bool
-    {
-        return self::CLASS_UNIVERSAL == $this->_class;
-    }
+	/**
+	 * Check whether type is of an universal class.
+	 *
+	 * @return boolean
+	 */
+	public function isUniversal(): bool
+	{
+		return self::CLASS_UNIVERSAL == $this->_class;
+	}
     
-    /**
-     * Check whether type is of an application class.
-     *
-     * @return boolean
-     */
-    public function isApplication(): bool
-    {
-        return self::CLASS_APPLICATION == $this->_class;
-    }
+	/**
+	 * Check whether type is of an application class.
+	 *
+	 * @return boolean
+	 */
+	public function isApplication(): bool
+	{
+		return self::CLASS_APPLICATION == $this->_class;
+	}
     
-    /**
-     * Check whether type is of a context specific class.
-     *
-     * @return boolean
-     */
-    public function isContextSpecific(): bool
-    {
-        return self::CLASS_CONTEXT_SPECIFIC == $this->_class;
-    }
+	/**
+	 * Check whether type is of a context specific class.
+	 *
+	 * @return boolean
+	 */
+	public function isContextSpecific(): bool
+	{
+		return self::CLASS_CONTEXT_SPECIFIC == $this->_class;
+	}
     
-    /**
-     * Check whether type is of a private class.
-     *
-     * @return boolean
-     */
-    public function isPrivate(): bool
-    {
-        return self::CLASS_PRIVATE == $this->_class;
-    }
+	/**
+	 * Check whether type is of a private class.
+	 *
+	 * @return boolean
+	 */
+	public function isPrivate(): bool
+	{
+		return self::CLASS_PRIVATE == $this->_class;
+	}
     
-    /**
-     * Check whether content is primitive type.
-     *
-     * @return boolean
-     */
-    public function isPrimitive(): bool
-    {
-        return self::PRIMITIVE == $this->_pc;
-    }
+	/**
+	 * Check whether content is primitive type.
+	 *
+	 * @return boolean
+	 */
+	public function isPrimitive(): bool
+	{
+		return self::PRIMITIVE == $this->_pc;
+	}
     
-    /**
-     * Check hether content is constructed type.
-     *
-     * @return boolean
-     */
-    public function isConstructed(): bool
-    {
-        return self::CONSTRUCTED == $this->_pc;
-    }
+	/**
+	 * Check hether content is constructed type.
+	 *
+	 * @return boolean
+	 */
+	public function isConstructed(): bool
+	{
+		return self::CONSTRUCTED == $this->_pc;
+	}
     
-    /**
-     * Get self with given type class.
-     *
-     * @param int $class One of <code>CLASS_*</code> enumerations
-     * @return self
-     */
-    public function withClass(int $class): Identifier
-    {
-        $obj = clone $this;
-        $obj->_class = $class;
-        return $obj;
-    }
+	/**
+	 * Get self with given type class.
+	 *
+	 * @param int $class One of <code>CLASS_*</code> enumerations
+	 * @return self
+	 */
+	public function withClass(int $class): Identifier
+	{
+		$obj = clone $this;
+		$obj->_class = $class;
+		return $obj;
+	}
     
-    /**
-     * Get self with given type tag.
-     *
-     * @param int|string $tag Tag number
-     * @return self
-     */
-    public function withTag($tag): Identifier
-    {
-        $obj = clone $this;
-        $obj->_tag = new BigInt($tag);
-        return $obj;
-    }
+	/**
+	 * Get self with given type tag.
+	 *
+	 * @param int|string $tag Tag number
+	 * @return self
+	 */
+	public function withTag($tag): Identifier
+	{
+		$obj = clone $this;
+		$obj->_tag = new BigInt($tag);
+		return $obj;
+	}
     
-    /**
-     * Get human readable name of the type class.
-     *
-     * @param int $class
-     * @return string
-     */
-    public static function classToName(int $class): string
-    {
-        if (!array_key_exists($class, self::MAP_CLASS_TO_NAME)) {
-            return "CLASS $class";
-        }
-        return self::MAP_CLASS_TO_NAME[$class];
-    }
+	/**
+	 * Get human readable name of the type class.
+	 *
+	 * @param int $class
+	 * @return string
+	 */
+	public static function classToName(int $class): string
+	{
+		if (!array_key_exists($class, self::MAP_CLASS_TO_NAME)) {
+			return "CLASS $class";
+		}
+		return self::MAP_CLASS_TO_NAME[$class];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
      *
      * @var array
      */
-    const MAP_CLASS_TO_NAME = [ /* @formatter:off */
+    const MAP_CLASS_TO_NAME = [/* @formatter:off */
         self::CLASS_UNIVERSAL => "UNIVERSAL", 
         self::CLASS_APPLICATION => "APPLICATION", 
         self::CLASS_CONTEXT_SPECIFIC => "CONTEXT SPECIFIC", 
@@ -84,7 +84,7 @@ 
      * @throws DecodeException If decoding fails
      * @return self
      */
-    public static function fromDER(string $data, int &$offset = null): Identifier
+    public static function fromDER(string $data, int & $offset = null): Identifier
     {
         $idx = $offset ? $offset : 0;
         $datalen = strlen($data);
@@ -117,7 +117,7 @@ 
      * @throws DecodeException If decoding fails
      * @return string Tag number
      */
-    private static function _decodeLongFormTag(string $data, int &$offset): string
+    private static function _decodeLongFormTag(string $data, int & $offset): string
     {
         $datalen = strlen($data);
         $tag = gmp_init(0, 10);

lib/ASN1/Type/Tagged/DERTaggedType.php

Indentation +93 added lines, -93 removed lines

@@ -20,106 +20,106 @@
  * 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 data.
-     *
-     * @var int
-     */
-    private $_offset;
+	/**
+	 * Offset to data.
+	 *
+	 * @var int
+	 */
+	private $_offset;
     
-    /**
-     * Constructor.
-     *
-     * @param Identifier $identifier
-     * @param string $data
-     * @param int $offset Offset to next byte after identifier
-     */
-    public function __construct(Identifier $identifier, string $data, int $offset)
-    {
-        $this->_identifier = $identifier;
-        $this->_data = $data;
-        $this->_offset = $offset;
-        $this->_typeTag = $identifier->intTag();
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Identifier $identifier
+	 * @param string $data
+	 * @param int $offset Offset to next byte after identifier
+	 */
+	public function __construct(Identifier $identifier, string $data, int $offset)
+	{
+		$this->_identifier = $identifier;
+		$this->_data = $data;
+		$this->_offset = $offset;
+		$this->_typeTag = $identifier->intTag();
+	}
     
-    /**
-     *
-     * @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
-    {
-        $idx = $this->_offset;
-        $length = Length::expectFromDER($this->_data, $idx)->intLength();
-        return substr($this->_data, $idx, $length);
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$idx = $this->_offset;
+		$length = Length::expectFromDER($this->_data, $idx)->intLength();
+		return substr($this->_data, $idx, $length);
+	}
     
-    /**
-     *
-     * {@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->_offset;
-        Length::expectFromDER($this->_data, $idx);
-        $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->_offset;
+		Length::expectFromDER($this->_data, $idx);
+		$element = Element::fromDER($this->_data, $idx);
+		if (isset($expectedTag)) {
+			$element->expectType($expectedTag);
+		}
+		return $element->asUnspecified();
+	}
 }

lib/ASN1/Type/UnspecifiedType.php

Indentation +646 added lines, -646 removed lines

@@ -17,650 +17,650 @@
  */
 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 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 boolean type.
-     *
-     * @throws \UnexpectedValueException If the element is not a boolean
-     * @return 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 boolean type.
+	 *
+	 * @throws \UnexpectedValueException If the element is not a boolean
+	 * @return 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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/Tagged/ImplicitlyTaggedType.php

Indentation +51 added lines, -51 removed lines

@@ -17,58 +17,58 @@
  */
 class ImplicitlyTaggedType extends TaggedTypeWrap implements ImplicitTagging
 {
-    /**
-     * Constructor.
-     *
-     * @param int $tag Tag number
-     * @param Element $element Wrapped element
-     * @param int $class Type class
-     */
-    public function __construct(int $tag, Element $element,
-        int $class = Identifier::CLASS_CONTEXT_SPECIFIC)
-    {
-        $this->_typeTag = $tag;
-        $this->_element = $element;
-        $this->_class = $class;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $tag Tag number
+	 * @param Element $element Wrapped element
+	 * @param int $class Type class
+	 */
+	public function __construct(int $tag, Element $element,
+		int $class = Identifier::CLASS_CONTEXT_SPECIFIC)
+	{
+		$this->_typeTag = $tag;
+		$this->_element = $element;
+		$this->_class = $class;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        // depends on the underlying type
-        return $this->_element->isConstructed();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		// depends on the underlying type
+		return $this->_element->isConstructed();
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        // get only the content of the wrapped element.
-        return $this->_element->_encodedContentDER();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		// get only the content of the wrapped element.
+		return $this->_element->_encodedContentDER();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
-     * @return UnspecifiedType
-     */
-    public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
-    {
-        $this->_element->expectType($tag);
-        if ($this->_element->typeClass() != $class) {
-            throw new \UnexpectedValueException(
-                sprintf("Type class %s expected, got %s.",
-                    Identifier::classToName($class),
-                    Identifier::classToName($this->_element->typeClass())));
-        }
-        return $this->_element->asUnspecified();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
+	 * @return UnspecifiedType
+	 */
+	public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		$this->_element->expectType($tag);
+		if ($this->_element->typeClass() != $class) {
+			throw new \UnexpectedValueException(
+				sprintf("Type class %s expected, got %s.",
+					Identifier::classToName($class),
+					Identifier::classToName($this->_element->typeClass())));
+		}
+		return $this->_element->asUnspecified();
+	}
 }

lib/ASN1/Type/Tagged/ContextSpecificTaggedType.php

Indentation +21 added lines, -21 removed lines

@@ -11,27 +11,27 @@
  */
 abstract class TaggedTypeWrap extends TaggedType
 {
-    /**
-     * Wrapped element.
-     *
-     * @var \ASN1\Element $_element
-     */
-    protected $_element;
+	/**
+	 * Wrapped element.
+	 *
+	 * @var \ASN1\Element $_element
+	 */
+	protected $_element;
     
-    /**
-     * Type class.
-     *
-     * @var int
-     */
-    protected $_class;
+	/**
+	 * Type class.
+	 *
+	 * @var int
+	 */
+	protected $_class;
     
-    /**
-     *
-     * @see \ASN1\Element::typeClass()
-     * @return int
-     */
-    public function typeClass(): int
-    {
-        return $this->_class;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::typeClass()
+	 * @return int
+	 */
+	public function typeClass(): int
+	{
+		return $this->_class;
+	}
 }

lib/ASN1/Type/Tagged/ApplicationType.php

Indentation +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@
  */
 class ApplicationType extends DERTaggedType
 {
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $type = new self($identifier, $data, $idx);
-        $length = Length::expectFromDER($data, $idx)->intLength();
-        $offset = $idx + $length;
-        return $type;
-    }
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$type = new self($identifier, $data, $idx);
+		$length = Length::expectFromDER($data, $idx)->intLength();
+		$offset = $idx + $length;
+		return $type;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 class ApplicationType extends DERTaggedType
 {
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $type = new self($identifier, $data, $idx);

lib/ASN1/Type/Tagged/ExplicitlyTaggedType.php

Indentation +46 added lines, -46 removed lines

@@ -16,53 +16,53 @@
  */
 class ExplicitlyTaggedType extends TaggedTypeWrap implements ExplicitTagging
 {
-    /**
-     * Constructor.
-     *
-     * @param int $tag Tag number
-     * @param Element $element Wrapped element
-     * @param int $class Type class
-     */
-    public function __construct(int $tag, Element $element,
-        int $class = Identifier::CLASS_CONTEXT_SPECIFIC)
-    {
-        $this->_typeTag = $tag;
-        $this->_element = $element;
-        $this->_class = $class;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $tag Tag number
+	 * @param Element $element Wrapped element
+	 * @param int $class Type class
+	 */
+	public function __construct(int $tag, Element $element,
+		int $class = Identifier::CLASS_CONTEXT_SPECIFIC)
+	{
+		$this->_typeTag = $tag;
+		$this->_element = $element;
+		$this->_class = $class;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::isConstructed()
-     * @return bool
-     */
-    public function isConstructed(): bool
-    {
-        return true;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::isConstructed()
+	 * @return bool
+	 */
+	public function isConstructed(): bool
+	{
+		return true;
+	}
     
-    /**
-     *
-     * @see \ASN1\Element::_encodedContentDER()
-     * @return string
-     */
-    protected function _encodedContentDER(): string
-    {
-        // get the full encoding of the wrapped element
-        return $this->_element->toDER();
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		// get the full encoding of the wrapped element
+		return $this->_element->toDER();
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
-     * @return UnspecifiedType
-     */
-    public function explicit($expectedTag = null): UnspecifiedType
-    {
-        if (isset($expectedTag)) {
-            $this->_element->expectType($expectedTag);
-        }
-        return $this->_element->asUnspecified();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
+	 * @return UnspecifiedType
+	 */
+	public function explicit($expectedTag = null): UnspecifiedType
+	{
+		if (isset($expectedTag)) {
+			$this->_element->expectType($expectedTag);
+		}
+		return $this->_element->asUnspecified();
+	}
 }