sop / asn1

lib/ASN1/Type/TaggedType.php

Indentation +77 added lines, -77 removed lines

@@ -17,85 +17,85 @@
  */
 abstract class TaggedType extends Element
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        $type = new DERTaggedType($identifier, $data, $idx);
-        $length = Length::expectFromDER($data, $idx);
-        $offset = $idx + $length->length();
-        return $type;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		$type = new DERTaggedType($identifier, $data, $idx);
+		$length = Length::expectFromDER($data, $idx);
+		$offset = $idx + $length->length();
+		return $type;
+	}
     
-    /**
-     * Check whether element supports explicit tagging.
-     *
-     * @param int|null $expectedTag Optional outer tag expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return ExplicitTagging
-     */
-    public function expectExplicit(int $expectedTag = null): ExplicitTagging
-    {
-        $el = $this;
-        if (!$el instanceof ExplicitTagging) {
-            throw new \UnexpectedValueException(
-                "Element doesn't implement explicit tagging.");
-        }
-        if (isset($expectedTag)) {
-            $el->expectTagged($expectedTag);
-        }
-        return $el;
-    }
+	/**
+	 * Check whether element supports explicit tagging.
+	 *
+	 * @param int|null $expectedTag Optional outer tag expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return ExplicitTagging
+	 */
+	public function expectExplicit(int $expectedTag = null): ExplicitTagging
+	{
+		$el = $this;
+		if (!$el instanceof ExplicitTagging) {
+			throw new \UnexpectedValueException(
+				"Element doesn't implement explicit tagging.");
+		}
+		if (isset($expectedTag)) {
+			$el->expectTagged($expectedTag);
+		}
+		return $el;
+	}
     
-    /**
-     * Get the wrapped inner element employing explicit tagging.
-     *
-     * @param int|null $expectedTag Optional outer tag expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return UnspecifiedType
-     */
-    public function asExplicit($expectedTag = null): UnspecifiedType
-    {
-        return $this->expectExplicit($expectedTag)->explicit();
-    }
+	/**
+	 * Get the wrapped inner element employing explicit tagging.
+	 *
+	 * @param int|null $expectedTag Optional outer tag expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return UnspecifiedType
+	 */
+	public function asExplicit($expectedTag = null): UnspecifiedType
+	{
+		return $this->expectExplicit($expectedTag)->explicit();
+	}
     
-    /**
-     * Check whether element supports implicit tagging.
-     *
-     * @param int|null $expectedTag Optional outer tag expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return ImplicitTagging
-     */
-    public function expectImplicit($expectedTag = null): ImplicitTagging
-    {
-        $el = $this;
-        if (!$el instanceof ImplicitTagging) {
-            throw new \UnexpectedValueException(
-                "Element doesn't implement implicit tagging.");
-        }
-        if (isset($expectedTag)) {
-            $el->expectTagged($expectedTag);
-        }
-        return $el;
-    }
+	/**
+	 * Check whether element supports implicit tagging.
+	 *
+	 * @param int|null $expectedTag Optional outer tag expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return ImplicitTagging
+	 */
+	public function expectImplicit($expectedTag = null): ImplicitTagging
+	{
+		$el = $this;
+		if (!$el instanceof ImplicitTagging) {
+			throw new \UnexpectedValueException(
+				"Element doesn't implement implicit tagging.");
+		}
+		if (isset($expectedTag)) {
+			$el->expectTagged($expectedTag);
+		}
+		return $el;
+	}
     
-    /**
-     * Get the wrapped inner element employing implicit tagging.
-     *
-     * @param int $tag Type tag of the inner element
-     * @param int|null $expectedTag Optional outer tag expectation
-     * @param int $expectedClass Optional inner type class expectation
-     * @throws \UnexpectedValueException If expectation fails
-     * @return UnspecifiedType
-     */
-    public function asImplicit($tag, $expectedTag = null,
-        int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
-    {
-        return $this->expectImplicit($expectedTag)->implicit($tag,
-            $expectedClass);
-    }
+	/**
+	 * Get the wrapped inner element employing implicit tagging.
+	 *
+	 * @param int $tag Type tag of the inner element
+	 * @param int|null $expectedTag Optional outer tag expectation
+	 * @param int $expectedClass Optional inner type class expectation
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return UnspecifiedType
+	 */
+	public function asImplicit($tag, $expectedTag = null,
+		int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
+	{
+		return $this->expectImplicit($expectedTag)->implicit($tag,
+			$expectedClass);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      * {@inheritdoc}
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         $type = new DERTaggedType($identifier, $data, $idx);

lib/ASN1/Type/Structure.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
      * @return self
      */
     protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
+        int & $offset): ElementBase
     {
         $idx = $offset;
         if (!$identifier->isConstructed()) {
@@ -236,7 +236,7 @@ 
     {
         if (!isset($this->_unspecifiedTypes)) {
             $this->_unspecifiedTypes = array_map(
-                function (Element $el) {
+                function(Element $el) {
                     return new UnspecifiedType($el);
                 }, $this->_elements);
         }

Indentation +310 added lines, -310 removed lines

@@ -14,336 +14,336 @@
  * Base class for the constructed types.
  */
 abstract class Structure extends Element implements 
-    \Countable,
-    \IteratorAggregate
+	\Countable,
+	\IteratorAggregate
 {
-    use UniversalClass;
+	use UniversalClass;
     
-    /**
-     * Array of elements in the structure.
-     *
-     * @var Element[] $_elements
-     */
-    protected $_elements;
+	/**
+	 * Array of elements in the structure.
+	 *
+	 * @var Element[] $_elements
+	 */
+	protected $_elements;
     
-    /**
-     * Lookup table for the tagged elements.
-     *
-     * @var TaggedType[]|null $_taggedMap
-     */
-    private $_taggedMap;
+	/**
+	 * Lookup table for the tagged elements.
+	 *
+	 * @var TaggedType[]|null $_taggedMap
+	 */
+	private $_taggedMap;
     
-    /**
-     * Cache variable of elements wrapped into UnspecifiedType objects.
-     *
-     * @var UnspecifiedType[]|null $_unspecifiedTypes
-     */
-    private $_unspecifiedTypes;
+	/**
+	 * Cache variable of elements wrapped into UnspecifiedType objects.
+	 *
+	 * @var UnspecifiedType[]|null $_unspecifiedTypes
+	 */
+	private $_unspecifiedTypes;
     
-    /**
-     * Constructor.
-     * 
-     * @param Element ...$elements Any number of elements
-     */
-    public function __construct(Element ...$elements)
-    {
-        $this->_elements = $elements;
-    }
+	/**
+	 * Constructor.
+	 * 
+	 * @param Element ...$elements Any number of elements
+	 */
+	public function __construct(Element ...$elements)
+	{
+		$this->_elements = $elements;
+	}
     
-    /**
-     * Clone magic method.
-     */
-    public function __clone()
-    {
-        // clear cache-variables
-        $this->_taggedMap = null;
-        $this->_unspecifiedTypes = null;
-    }
+	/**
+	 * Clone magic method.
+	 */
+	public function __clone()
+	{
+		// clear cache-variables
+		$this->_taggedMap = null;
+		$this->_unspecifiedTypes = null;
+	}
     
-    /**
-     *
-     * @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
-    {
-        $data = "";
-        foreach ($this->_elements as $element) {
-            $data .= $element->toDER();
-        }
-        return $data;
-    }
+	/**
+	 *
+	 * @see \ASN1\Element::_encodedContentDER()
+	 * @return string
+	 */
+	protected function _encodedContentDER(): string
+	{
+		$data = "";
+		foreach ($this->_elements as $element) {
+			$data .= $element->toDER();
+		}
+		return $data;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @see \ASN1\Element::_decodeFromDER()
-     * @return self
-     */
-    protected static function _decodeFromDER(Identifier $identifier, string $data,
-        int &$offset): ElementBase
-    {
-        $idx = $offset;
-        if (!$identifier->isConstructed()) {
-            throw new DecodeException(
-                "Structured element must have constructed bit set.");
-        }
-        $length = Length::expectFromDER($data, $idx);
-        $end = $idx + $length->length();
-        $elements = [];
-        while ($idx < $end) {
-            $elements[] = Element::fromDER($data, $idx);
-            // check that element didn't overflow length
-            if ($idx > $end) {
-                throw new DecodeException(
-                    "Structure's content overflows length.");
-            }
-        }
-        $offset = $idx;
-        // return instance by static late binding
-        return new static(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @see \ASN1\Element::_decodeFromDER()
+	 * @return self
+	 */
+	protected static function _decodeFromDER(Identifier $identifier, string $data,
+		int &$offset): ElementBase
+	{
+		$idx = $offset;
+		if (!$identifier->isConstructed()) {
+			throw new DecodeException(
+				"Structured element must have constructed bit set.");
+		}
+		$length = Length::expectFromDER($data, $idx);
+		$end = $idx + $length->length();
+		$elements = [];
+		while ($idx < $end) {
+			$elements[] = Element::fromDER($data, $idx);
+			// check that element didn't overflow length
+			if ($idx > $end) {
+				throw new DecodeException(
+					"Structure's content overflows length.");
+			}
+		}
+		$offset = $idx;
+		// return instance by static late binding
+		return new static(...$elements);
+	}
     
-    /**
-     * Explode DER structure to DER encoded components that it contains.
-     *
-     * @param string $data
-     * @throws DecodeException
-     * @return string[]
-     */
-    public static function explodeDER(string $data): array
-    {
-        $offset = 0;
-        $identifier = Identifier::fromDER($data, $offset);
-        if (!$identifier->isConstructed()) {
-            throw new DecodeException("Element is not constructed.");
-        }
-        $length = Length::expectFromDER($data, $offset);
-        $end = $offset + $length->length();
-        $parts = [];
-        while ($offset < $end) {
-            // start of the element
-            $idx = $offset;
-            // skip identifier
-            Identifier::fromDER($data, $offset);
-            // decode element length
-            $length = Length::expectFromDER($data, $offset);
-            // extract der encoding of the element
-            $parts[] = substr($data, $idx, $offset - $idx + $length->length());
-            // update offset over content
-            $offset += $length->length();
-        }
-        return $parts;
-    }
+	/**
+	 * Explode DER structure to DER encoded components that it contains.
+	 *
+	 * @param string $data
+	 * @throws DecodeException
+	 * @return string[]
+	 */
+	public static function explodeDER(string $data): array
+	{
+		$offset = 0;
+		$identifier = Identifier::fromDER($data, $offset);
+		if (!$identifier->isConstructed()) {
+			throw new DecodeException("Element is not constructed.");
+		}
+		$length = Length::expectFromDER($data, $offset);
+		$end = $offset + $length->length();
+		$parts = [];
+		while ($offset < $end) {
+			// start of the element
+			$idx = $offset;
+			// skip identifier
+			Identifier::fromDER($data, $offset);
+			// decode element length
+			$length = Length::expectFromDER($data, $offset);
+			// extract der encoding of the element
+			$parts[] = substr($data, $idx, $offset - $idx + $length->length());
+			// update offset over content
+			$offset += $length->length();
+		}
+		return $parts;
+	}
     
-    /**
-     * Get self with an element at the given index replaced by another.
-     *
-     * @param int $idx Element index
-     * @param Element $el New element to insert into the structure
-     * @throws \OutOfBoundsException
-     * @return self
-     */
-    public function withReplaced(int $idx, Element $el): self
-    {
-        if (!isset($this->_elements[$idx])) {
-            throw new \OutOfBoundsException(
-                "Structure doesn't have element at index $idx.");
-        }
-        $obj = clone $this;
-        $obj->_elements[$idx] = $el;
-        return $obj;
-    }
+	/**
+	 * Get self with an element at the given index replaced by another.
+	 *
+	 * @param int $idx Element index
+	 * @param Element $el New element to insert into the structure
+	 * @throws \OutOfBoundsException
+	 * @return self
+	 */
+	public function withReplaced(int $idx, Element $el): self
+	{
+		if (!isset($this->_elements[$idx])) {
+			throw new \OutOfBoundsException(
+				"Structure doesn't have element at index $idx.");
+		}
+		$obj = clone $this;
+		$obj->_elements[$idx] = $el;
+		return $obj;
+	}
     
-    /**
-     * Get self with an element inserted before the given index.
-     *
-     * @param int $idx Element index
-     * @param Element $el New element to insert into the structure
-     * @throws \OutOfBoundsException
-     * @return self
-     */
-    public function withInserted(int $idx, Element $el): self
-    {
-        if (count($this->_elements) < $idx || $idx < 0) {
-            throw new \OutOfBoundsException("Index $idx is out of bounds.");
-        }
-        $obj = clone $this;
-        array_splice($obj->_elements, $idx, 0, [$el]);
-        return $obj;
-    }
+	/**
+	 * Get self with an element inserted before the given index.
+	 *
+	 * @param int $idx Element index
+	 * @param Element $el New element to insert into the structure
+	 * @throws \OutOfBoundsException
+	 * @return self
+	 */
+	public function withInserted(int $idx, Element $el): self
+	{
+		if (count($this->_elements) < $idx || $idx < 0) {
+			throw new \OutOfBoundsException("Index $idx is out of bounds.");
+		}
+		$obj = clone $this;
+		array_splice($obj->_elements, $idx, 0, [$el]);
+		return $obj;
+	}
     
-    /**
-     * Get self with an element appended to the end.
-     *
-     * @param Element $el Element to insert into the structure
-     * @return self
-     */
-    public function withAppended(Element $el): self
-    {
-        $obj = clone $this;
-        array_push($obj->_elements, $el);
-        return $obj;
-    }
+	/**
+	 * Get self with an element appended to the end.
+	 *
+	 * @param Element $el Element to insert into the structure
+	 * @return self
+	 */
+	public function withAppended(Element $el): self
+	{
+		$obj = clone $this;
+		array_push($obj->_elements, $el);
+		return $obj;
+	}
     
-    /**
-     * Get self with an element prepended in the beginning.
-     *
-     * @param Element $el Element to insert into the structure
-     * @return self
-     */
-    public function withPrepended(Element $el): self
-    {
-        $obj = clone $this;
-        array_unshift($obj->_elements, $el);
-        return $obj;
-    }
+	/**
+	 * Get self with an element prepended in the beginning.
+	 *
+	 * @param Element $el Element to insert into the structure
+	 * @return self
+	 */
+	public function withPrepended(Element $el): self
+	{
+		$obj = clone $this;
+		array_unshift($obj->_elements, $el);
+		return $obj;
+	}
     
-    /**
-     * Get self with an element at the given index removed.
-     *
-     * @param int $idx Element index
-     * @throws \OutOfBoundsException
-     * @return self
-     */
-    public function withoutElement($idx): self
-    {
-        if (!isset($this->_elements[$idx])) {
-            throw new \OutOfBoundsException(
-                "Structure doesn't have element at index $idx.");
-        }
-        $obj = clone $this;
-        array_splice($obj->_elements, $idx, 1);
-        return $obj;
-    }
+	/**
+	 * Get self with an element at the given index removed.
+	 *
+	 * @param int $idx Element index
+	 * @throws \OutOfBoundsException
+	 * @return self
+	 */
+	public function withoutElement($idx): self
+	{
+		if (!isset($this->_elements[$idx])) {
+			throw new \OutOfBoundsException(
+				"Structure doesn't have element at index $idx.");
+		}
+		$obj = clone $this;
+		array_splice($obj->_elements, $idx, 1);
+		return $obj;
+	}
     
-    /**
-     * Get elements in the structure.
-     *
-     * @return UnspecifiedType[]
-     */
-    public function elements(): array
-    {
-        if (!isset($this->_unspecifiedTypes)) {
-            $this->_unspecifiedTypes = array_map(
-                function (Element $el) {
-                    return new UnspecifiedType($el);
-                }, $this->_elements);
-        }
-        return $this->_unspecifiedTypes;
-    }
+	/**
+	 * Get elements in the structure.
+	 *
+	 * @return UnspecifiedType[]
+	 */
+	public function elements(): array
+	{
+		if (!isset($this->_unspecifiedTypes)) {
+			$this->_unspecifiedTypes = array_map(
+				function (Element $el) {
+					return new UnspecifiedType($el);
+				}, $this->_elements);
+		}
+		return $this->_unspecifiedTypes;
+	}
     
-    /**
-     * Check whether the structure has an element at the given index, optionally
-     * satisfying given tag expectation.
-     *
-     * @param int $idx Index 0..n
-     * @param int|null $expectedTag Optional type tag expectation
-     * @return bool
-     */
-    public function has(int $idx, $expectedTag = null): bool
-    {
-        if (!isset($this->_elements[$idx])) {
-            return false;
-        }
-        if (isset($expectedTag)) {
-            if (!$this->_elements[$idx]->isType($expectedTag)) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Check whether the structure has an element at the given index, optionally
+	 * satisfying given tag expectation.
+	 *
+	 * @param int $idx Index 0..n
+	 * @param int|null $expectedTag Optional type tag expectation
+	 * @return bool
+	 */
+	public function has(int $idx, $expectedTag = null): bool
+	{
+		if (!isset($this->_elements[$idx])) {
+			return false;
+		}
+		if (isset($expectedTag)) {
+			if (!$this->_elements[$idx]->isType($expectedTag)) {
+				return false;
+			}
+		}
+		return true;
+	}
     
-    /**
-     * Get the element at the given index, optionally checking that the element
-     * has a given tag.
-     *
-     * NOTE! Expectation checking is deprecated and should be done
-     * with UnspecifiedType.
-     *
-     * @param int $idx Index 0..n
-     * @param int|null $expectedTag Optional type tag expectation
-     * @throws \OutOfBoundsException If element doesn't exists
-     * @throws \UnexpectedValueException If expectation fails
-     * @return UnspecifiedType
-     */
-    public function at(int $idx, $expectedTag = null): UnspecifiedType
-    {
-        if (!isset($this->_elements[$idx])) {
-            throw new \OutOfBoundsException(
-                "Structure doesn't have an element at index $idx.");
-        }
-        $element = $this->_elements[$idx];
-        if (isset($expectedTag)) {
-            $element->expectType($expectedTag);
-        }
-        return new UnspecifiedType($element);
-    }
+	/**
+	 * Get the element at the given index, optionally checking that the element
+	 * has a given tag.
+	 *
+	 * NOTE! Expectation checking is deprecated and should be done
+	 * with UnspecifiedType.
+	 *
+	 * @param int $idx Index 0..n
+	 * @param int|null $expectedTag Optional type tag expectation
+	 * @throws \OutOfBoundsException If element doesn't exists
+	 * @throws \UnexpectedValueException If expectation fails
+	 * @return UnspecifiedType
+	 */
+	public function at(int $idx, $expectedTag = null): UnspecifiedType
+	{
+		if (!isset($this->_elements[$idx])) {
+			throw new \OutOfBoundsException(
+				"Structure doesn't have an element at index $idx.");
+		}
+		$element = $this->_elements[$idx];
+		if (isset($expectedTag)) {
+			$element->expectType($expectedTag);
+		}
+		return new UnspecifiedType($element);
+	}
     
-    /**
-     * Check whether the structure contains a context specific element with a
-     * given tag.
-     *
-     * @param int $tag Tag number
-     * @return boolean
-     */
-    public function hasTagged($tag): bool
-    {
-        // lazily build lookup map
-        if (!isset($this->_taggedMap)) {
-            $this->_taggedMap = [];
-            foreach ($this->_elements as $element) {
-                if ($element->isTagged()) {
-                    $this->_taggedMap[$element->tag()] = $element;
-                }
-            }
-        }
-        return isset($this->_taggedMap[$tag]);
-    }
+	/**
+	 * Check whether the structure contains a context specific element with a
+	 * given tag.
+	 *
+	 * @param int $tag Tag number
+	 * @return boolean
+	 */
+	public function hasTagged($tag): bool
+	{
+		// lazily build lookup map
+		if (!isset($this->_taggedMap)) {
+			$this->_taggedMap = [];
+			foreach ($this->_elements as $element) {
+				if ($element->isTagged()) {
+					$this->_taggedMap[$element->tag()] = $element;
+				}
+			}
+		}
+		return isset($this->_taggedMap[$tag]);
+	}
     
-    /**
-     * Get a context specific element tagged with a given tag.
-     *
-     * @param int $tag
-     * @throws \LogicException If tag doesn't exists
-     * @return TaggedType
-     */
-    public function getTagged($tag): TaggedType
-    {
-        if (!$this->hasTagged($tag)) {
-            throw new \LogicException("No tagged element for tag $tag.");
-        }
-        return $this->_taggedMap[$tag];
-    }
+	/**
+	 * Get a context specific element tagged with a given tag.
+	 *
+	 * @param int $tag
+	 * @throws \LogicException If tag doesn't exists
+	 * @return TaggedType
+	 */
+	public function getTagged($tag): TaggedType
+	{
+		if (!$this->hasTagged($tag)) {
+			throw new \LogicException("No tagged element for tag $tag.");
+		}
+		return $this->_taggedMap[$tag];
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_elements);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_elements);
+	}
     
-    /**
-     * Get an iterator for the UnspecifiedElement objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->elements());
-    }
+	/**
+	 * Get an iterator for the UnspecifiedElement objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->elements());
+	}
 }

lib/ASN1/Type/PrimitiveString.php

Indentation +35 added lines, -35 removed lines

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

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Primitive/BitString.php

Indentation +181 added lines, -181 removed lines

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

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Primitive/NullType.php

Indentation +34 added lines, -34 removed lines

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

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Primitive/Boolean.php

Indentation +55 added lines, -55 removed lines

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

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Primitive/RelativeOID.php

Indentation +32 added lines, -32 removed lines

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

Spacing +1 added lines, -1 removed lines

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

lib/ASN1/Type/Primitive/ObjectIdentifier.php

Indentation +147 added lines, -147 removed lines

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

Spacing +2 added lines, -2 removed lines

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

lib/ASN1/Type/Primitive/GeneralizedTime.php

Indentation +102 added lines, -102 removed lines

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

Spacing +1 added lines, -1 removed lines

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