sop / x509

lib/X509/GeneralName/GeneralNames.php

Indentation +167 added lines, -167 removed lines

@@ -18,183 +18,183 @@
  */
 class GeneralNames implements \Countable, \IteratorAggregate
 {
-    /**
-     * GeneralName objects.
-     *
-     * @var GeneralName[] $_names
-     */
-    protected $_names;
+	/**
+	 * GeneralName objects.
+	 *
+	 * @var GeneralName[] $_names
+	 */
+	protected $_names;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName ...$names One or more GeneralName objects
-     */
-    public function __construct(GeneralName ...$names)
-    {
-        $this->_names = $names;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName ...$names One or more GeneralName objects
+	 */
+	public function __construct(GeneralName ...$names)
+	{
+		$this->_names = $names;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        if (!count($seq)) {
-            throw new \UnexpectedValueException(
-                "GeneralNames must have at least one GeneralName.");
-        }
-        $names = array_map(
-            function (UnspecifiedType $el) {
-                return GeneralName::fromASN1($el->asTagged());
-            }, $seq->elements());
-        return new self(...$names);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		if (!count($seq)) {
+			throw new \UnexpectedValueException(
+				"GeneralNames must have at least one GeneralName.");
+		}
+		$names = array_map(
+			function (UnspecifiedType $el) {
+				return GeneralName::fromASN1($el->asTagged());
+			}, $seq->elements());
+		return new self(...$names);
+	}
     
-    /**
-     * Find first GeneralName by given tag.
-     *
-     * @param int $tag
-     * @return GeneralName|null
-     */
-    protected function _findFirst(int $tag)
-    {
-        foreach ($this->_names as $name) {
-            if ($name->tag() == $tag) {
-                return $name;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Find first GeneralName by given tag.
+	 *
+	 * @param int $tag
+	 * @return GeneralName|null
+	 */
+	protected function _findFirst(int $tag)
+	{
+		foreach ($this->_names as $name) {
+			if ($name->tag() == $tag) {
+				return $name;
+			}
+		}
+		return null;
+	}
     
-    /**
-     * Check whether GeneralNames contains a GeneralName of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     * @return bool
-     */
-    public function has(int $tag): bool
-    {
-        return null !== $this->_findFirst($tag);
-    }
+	/**
+	 * Check whether GeneralNames contains a GeneralName of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 * @return bool
+	 */
+	public function has(int $tag): bool
+	{
+		return null !== $this->_findFirst($tag);
+	}
     
-    /**
-     * Get first GeneralName of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     * @throws \OutOfBoundsException
-     * @return GeneralName
-     */
-    public function firstOf(int $tag): GeneralName
-    {
-        $name = $this->_findFirst($tag);
-        if (!$name) {
-            throw new \UnexpectedValueException("No GeneralName by tag $tag.");
-        }
-        return $name;
-    }
+	/**
+	 * Get first GeneralName of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 * @throws \OutOfBoundsException
+	 * @return GeneralName
+	 */
+	public function firstOf(int $tag): GeneralName
+	{
+		$name = $this->_findFirst($tag);
+		if (!$name) {
+			throw new \UnexpectedValueException("No GeneralName by tag $tag.");
+		}
+		return $name;
+	}
     
-    /**
-     * Get all GeneralName objects of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     * @return GeneralName[]
-     */
-    public function allOf(int $tag): array
-    {
-        $names = array_filter($this->_names,
-            function (GeneralName $name) use ($tag) {
-                return $name->tag() == $tag;
-            });
-        return array_values($names);
-    }
+	/**
+	 * Get all GeneralName objects of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 * @return GeneralName[]
+	 */
+	public function allOf(int $tag): array
+	{
+		$names = array_filter($this->_names,
+			function (GeneralName $name) use ($tag) {
+				return $name->tag() == $tag;
+			});
+		return array_values($names);
+	}
     
-    /**
-     * Get value of the first 'dNSName' type.
-     *
-     * @return string
-     */
-    public function firstDNS(): string
-    {
-        $gn = $this->firstOf(GeneralName::TAG_DNS_NAME);
-        if (!$gn instanceof DNSName) {
-            throw new \RuntimeException(
-                DNSName::class . " expected, got " . get_class($gn));
-        }
-        return $gn->name();
-    }
+	/**
+	 * Get value of the first 'dNSName' type.
+	 *
+	 * @return string
+	 */
+	public function firstDNS(): string
+	{
+		$gn = $this->firstOf(GeneralName::TAG_DNS_NAME);
+		if (!$gn instanceof DNSName) {
+			throw new \RuntimeException(
+				DNSName::class . " expected, got " . get_class($gn));
+		}
+		return $gn->name();
+	}
     
-    /**
-     * Get value of the first 'directoryName' type.
-     *
-     * @return Name
-     */
-    public function firstDN(): Name
-    {
-        $gn = $this->firstOf(GeneralName::TAG_DIRECTORY_NAME);
-        if (!$gn instanceof DirectoryName) {
-            throw new \RuntimeException(
-                DirectoryName::class . " expected, got " . get_class($gn));
-        }
-        return $gn->dn();
-    }
+	/**
+	 * Get value of the first 'directoryName' type.
+	 *
+	 * @return Name
+	 */
+	public function firstDN(): Name
+	{
+		$gn = $this->firstOf(GeneralName::TAG_DIRECTORY_NAME);
+		if (!$gn instanceof DirectoryName) {
+			throw new \RuntimeException(
+				DirectoryName::class . " expected, got " . get_class($gn));
+		}
+		return $gn->dn();
+	}
     
-    /**
-     * Get value of the first 'uniformResourceIdentifier' type.
-     *
-     * @return string
-     */
-    public function firstURI(): string
-    {
-        $gn = $this->firstOf(GeneralName::TAG_URI);
-        if (!$gn instanceof UniformResourceIdentifier) {
-            throw new \RuntimeException(
-                UniformResourceIdentifier::class . " expected, got " .
-                     get_class($gn));
-        }
-        return $gn->uri();
-    }
+	/**
+	 * Get value of the first 'uniformResourceIdentifier' type.
+	 *
+	 * @return string
+	 */
+	public function firstURI(): string
+	{
+		$gn = $this->firstOf(GeneralName::TAG_URI);
+		if (!$gn instanceof UniformResourceIdentifier) {
+			throw new \RuntimeException(
+				UniformResourceIdentifier::class . " expected, got " .
+					 get_class($gn));
+		}
+		return $gn->uri();
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        if (!count($this->_names)) {
-            throw new \LogicException(
-                "GeneralNames must have at least one GeneralName.");
-        }
-        $elements = array_map(
-            function (GeneralName $name) {
-                return $name->toASN1();
-            }, $this->_names);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		if (!count($this->_names)) {
+			throw new \LogicException(
+				"GeneralNames must have at least one GeneralName.");
+		}
+		$elements = array_map(
+			function (GeneralName $name) {
+				return $name->toASN1();
+			}, $this->_names);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_names);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_names);
+	}
     
-    /**
-     * Get iterator for GeneralName objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_names);
-    }
+	/**
+	 * Get iterator for GeneralName objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_names);
+	}
 }

lib/X509/GeneralName/IPv4Address.php

Indentation +37 added lines, -37 removed lines

@@ -6,42 +6,42 @@
 
 class IPv4Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     * @throws \InvalidArgumentException
-     * @return self
-     */
-    public static function fromOctets(string $octets): self
-    {
-        $mask = null;
-        $bytes = unpack("C*", $octets);
-        switch (count($bytes)) {
-            case 4:
-                $ip = implode(".", $bytes);
-                break;
-            case 8:
-                $ip = implode(".", array_slice($bytes, 0, 4));
-                $mask = implode(".", array_slice($bytes, 4, 4));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv4 octet length.");
-        }
-        return new self($ip, $mask);
-    }
+	/**
+	 * Initialize from octets.
+	 *
+	 * @param string $octets
+	 * @throws \InvalidArgumentException
+	 * @return self
+	 */
+	public static function fromOctets(string $octets): self
+	{
+		$mask = null;
+		$bytes = unpack("C*", $octets);
+		switch (count($bytes)) {
+			case 4:
+				$ip = implode(".", $bytes);
+				break;
+			case 8:
+				$ip = implode(".", array_slice($bytes, 0, 4));
+				$mask = implode(".", array_slice($bytes, 4, 4));
+				break;
+			default:
+				throw new \UnexpectedValueException("Invalid IPv4 octet length.");
+		}
+		return new self($ip, $mask);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _octets(): string
-    {
-        $bytes = array_map("intval", explode(".", $this->_ip));
-        if (isset($this->_mask)) {
-            $bytes = array_merge($bytes,
-                array_map("intval", explode(".", $this->_mask)));
-        }
-        return pack("C*", ...$bytes);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _octets(): string
+	{
+		$bytes = array_map("intval", explode(".", $this->_ip));
+		if (isset($this->_mask)) {
+			$bytes = array_merge($bytes,
+				array_map("intval", explode(".", $this->_mask)));
+		}
+		return pack("C*", ...$bytes);
+	}
 }

lib/X509/GeneralName/OtherName.php

Indentation +76 added lines, -76 removed lines

@@ -19,87 +19,87 @@
  */
 class OtherName extends GeneralName
 {
-    /**
-     * Type OID.
-     *
-     * @var string $_type
-     */
-    protected $_type;
+	/**
+	 * Type OID.
+	 *
+	 * @var string $_type
+	 */
+	protected $_type;
     
-    /**
-     * Value.
-     *
-     * @var Element $_element
-     */
-    protected $_element;
+	/**
+	 * Value.
+	 *
+	 * @var Element $_element
+	 */
+	protected $_element;
     
-    /**
-     * Constructor.
-     *
-     * @param string $type_id OID
-     * @param Element $el
-     */
-    public function __construct(string $type_id, Element $el)
-    {
-        $this->_tag = self::TAG_OTHER_NAME;
-        $this->_type = $type_id;
-        $this->_element = $el;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $type_id OID
+	 * @param Element $el
+	 */
+	public function __construct(string $type_id, Element $el)
+	{
+		$this->_tag = self::TAG_OTHER_NAME;
+		$this->_type = $type_id;
+		$this->_element = $el;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        $seq = $el->asSequence();
-        $type_id = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        $value = $seq->getTagged(0)
-            ->asExplicit()
-            ->asElement();
-        return new self($type_id, $value);
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		$seq = $el->asSequence();
+		$type_id = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		$value = $seq->getTagged(0)
+			->asExplicit()
+			->asElement();
+		return new self($type_id, $value);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_type . "/#" . bin2hex($this->_element->toDER());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_type . "/#" . bin2hex($this->_element->toDER());
+	}
     
-    /**
-     * Get type OID.
-     *
-     * @return string
-     */
-    public function type(): string
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get type OID.
+	 *
+	 * @return string
+	 */
+	public function type(): string
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Get value element.
-     *
-     * @return Element
-     */
-    public function value(): Element
-    {
-        return $this->_element;
-    }
+	/**
+	 * Get value element.
+	 *
+	 * @return Element
+	 */
+	public function value(): Element
+	{
+		return $this->_element;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new Sequence(new ObjectIdentifier($this->_type),
-                new ExplicitlyTaggedType(0, $this->_element)));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new Sequence(new ObjectIdentifier($this->_type),
+				new ExplicitlyTaggedType(0, $this->_element)));
+	}
 }

lib/X509/GeneralName/IPv6Address.php

Indentation +51 added lines, -51 removed lines

@@ -6,57 +6,57 @@
 
 class IPv6Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     * @throws \InvalidArgumentException
-     * @return self
-     */
-    public static function fromOctets(string $octets): self
-    {
-        $mask = null;
-        $words = unpack("n*", $octets);
-        switch (count($words)) {
-            case 8:
-                $ip = self::_wordsToIPv6String($words);
-                break;
-            case 16:
-                $ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
-                $mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv6 octet length.");
-        }
-        return new self($ip, $mask);
-    }
+	/**
+	 * Initialize from octets.
+	 *
+	 * @param string $octets
+	 * @throws \InvalidArgumentException
+	 * @return self
+	 */
+	public static function fromOctets(string $octets): self
+	{
+		$mask = null;
+		$words = unpack("n*", $octets);
+		switch (count($words)) {
+			case 8:
+				$ip = self::_wordsToIPv6String($words);
+				break;
+			case 16:
+				$ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
+				$mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
+				break;
+			default:
+				throw new \UnexpectedValueException("Invalid IPv6 octet length.");
+		}
+		return new self($ip, $mask);
+	}
     
-    /**
-     * Convert an array of 16 bit words to an IPv6 string representation.
-     *
-     * @param int[] $words
-     * @return string
-     */
-    protected static function _wordsToIPv6String(array $words): string
-    {
-        $groups = array_map(
-            function ($word) {
-                return sprintf("%04x", $word);
-            }, $words);
-        return implode(":", $groups);
-    }
+	/**
+	 * Convert an array of 16 bit words to an IPv6 string representation.
+	 *
+	 * @param int[] $words
+	 * @return string
+	 */
+	protected static function _wordsToIPv6String(array $words): string
+	{
+		$groups = array_map(
+			function ($word) {
+				return sprintf("%04x", $word);
+			}, $words);
+		return implode(":", $groups);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _octets(): string
-    {
-        $words = array_map("hexdec", explode(":", $this->_ip));
-        if (isset($this->_mask)) {
-            $words = array_merge($words,
-                array_map("hexdec", explode(":", $this->_mask)));
-        }
-        return pack("n*", ...$words);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _octets(): string
+	{
+		$words = array_map("hexdec", explode(":", $this->_ip));
+		if (isset($this->_mask)) {
+			$words = array_merge($words,
+				array_map("hexdec", explode(":", $this->_mask)));
+		}
+		return pack("n*", ...$words);
+	}
 }

lib/X509/GeneralName/UniformResourceIdentifier.php

Indentation +50 added lines, -50 removed lines

@@ -17,59 +17,59 @@
  */
 class UniformResourceIdentifier extends GeneralName
 {
-    /**
-     * URI.
-     *
-     * @var string $_uri
-     */
-    protected $_uri;
+	/**
+	 * URI.
+	 *
+	 * @var string $_uri
+	 */
+	protected $_uri;
     
-    /**
-     * Constructor.
-     *
-     * @param string $uri
-     */
-    public function __construct(string $uri)
-    {
-        $this->_tag = self::TAG_URI;
-        $this->_uri = $uri;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uri
+	 */
+	public function __construct(string $uri)
+	{
+		$this->_tag = self::TAG_URI;
+		$this->_uri = $uri;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        return new self($el->asIA5String()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		return new self($el->asIA5String()->string());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_uri;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_uri;
+	}
     
-    /**
-     * Get URI.
-     *
-     * @return string
-     */
-    public function uri(): string
-    {
-        return $this->_uri;
-    }
+	/**
+	 * Get URI.
+	 *
+	 * @return string
+	 */
+	public function uri(): string
+	{
+		return $this->_uri;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_uri));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_uri));
+	}
 }

lib/X509/GeneralName/RegisteredID.php

Indentation +51 added lines, -51 removed lines

@@ -16,60 +16,60 @@
  */
 class RegisteredID extends GeneralName
 {
-    /**
-     * Object identifier.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
+	/**
+	 * Object identifier.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
     
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_tag = self::TAG_REGISTERED_ID;
-        $this->_oid = $oid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_tag = self::TAG_REGISTERED_ID;
+		$this->_oid = $oid;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        return new self($el->asObjectIdentifier()->oid());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		return new self($el->asObjectIdentifier()->oid());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_oid;
+	}
     
-    /**
-     * Get object identifier in dotted format.
-     *
-     * @return string OID
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get object identifier in dotted format.
+	 *
+	 * @return string OID
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new ObjectIdentifier($this->_oid));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new ObjectIdentifier($this->_oid));
+	}
 }

lib/X509/GeneralName/IPAddress.php

Indentation +85 added lines, -85 removed lines

@@ -19,97 +19,97 @@
  */
 abstract class IPAddress extends GeneralName
 {
-    /**
-     * IP address.
-     *
-     * @var string $_ip
-     */
-    protected $_ip;
+	/**
+	 * IP address.
+	 *
+	 * @var string $_ip
+	 */
+	protected $_ip;
     
-    /**
-     * Subnet mask.
-     *
-     * @var string|null $_mask
-     */
-    protected $_mask;
+	/**
+	 * Subnet mask.
+	 *
+	 * @var string|null $_mask
+	 */
+	protected $_mask;
     
-    /**
-     * Get octet representation of the IP address.
-     *
-     * @return string
-     */
-    abstract protected function _octets();
+	/**
+	 * Get octet representation of the IP address.
+	 *
+	 * @return string
+	 */
+	abstract protected function _octets();
     
-    /**
-     * Constructor.
-     *
-     * @param string $ip
-     * @param string|null $mask
-     */
-    public function __construct(string $ip, $mask = null)
-    {
-        $this->_tag = self::TAG_IP_ADDRESS;
-        $this->_ip = $ip;
-        $this->_mask = $mask;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $ip
+	 * @param string|null $mask
+	 */
+	public function __construct(string $ip, $mask = null)
+	{
+		$this->_tag = self::TAG_IP_ADDRESS;
+		$this->_ip = $ip;
+		$this->_mask = $mask;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        $octets = $el->asOctetString()->string();
-        switch (strlen($octets)) {
-            case 4:
-            case 8:
-                return IPv4Address::fromOctets($octets);
-            case 16:
-            case 32:
-                return IPv6Address::fromOctets($octets);
-            default:
-                throw new \UnexpectedValueException(
-                    "Invalid octet length for IP address.");
-        }
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		$octets = $el->asOctetString()->string();
+		switch (strlen($octets)) {
+			case 4:
+			case 8:
+				return IPv4Address::fromOctets($octets);
+			case 16:
+			case 32:
+				return IPv6Address::fromOctets($octets);
+			default:
+				throw new \UnexpectedValueException(
+					"Invalid octet length for IP address.");
+		}
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : "");
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : "");
+	}
     
-    /**
-     * Get IP address as a string.
-     *
-     * @return string
-     */
-    public function address(): string
-    {
-        return $this->_ip;
-    }
+	/**
+	 * Get IP address as a string.
+	 *
+	 * @return string
+	 */
+	public function address(): string
+	{
+		return $this->_ip;
+	}
     
-    /**
-     * Get subnet mask as a string.
-     *
-     * @return string
-     */
-    public function mask(): string
-    {
-        return $this->_mask;
-    }
+	/**
+	 * Get subnet mask as a string.
+	 *
+	 * @return string
+	 */
+	public function mask(): string
+	{
+		return $this->_mask;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new OctetString($this->_octets()));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new OctetString($this->_octets()));
+	}
 }

lib/X509/GeneralName/DirectoryName.php

Indentation +62 added lines, -62 removed lines

@@ -16,72 +16,72 @@
  */
 class DirectoryName extends GeneralName
 {
-    /**
-     * Directory name.
-     *
-     * @var Name $_dn
-     */
-    protected $_dn;
+	/**
+	 * Directory name.
+	 *
+	 * @var Name $_dn
+	 */
+	protected $_dn;
     
-    /**
-     * Constructor.
-     *
-     * @param Name $dn
-     */
-    public function __construct(Name $dn)
-    {
-        $this->_tag = self::TAG_DIRECTORY_NAME;
-        $this->_dn = $dn;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Name $dn
+	 */
+	public function __construct(Name $dn)
+	{
+		$this->_tag = self::TAG_DIRECTORY_NAME;
+		$this->_dn = $dn;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        return new self(Name::fromASN1($el->asSequence()));
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		return new self(Name::fromASN1($el->asSequence()));
+	}
     
-    /**
-     * Initialize from distinguished name string.
-     *
-     * @param string $str
-     * @return self
-     */
-    public static function fromDNString(string $str): self
-    {
-        return new self(Name::fromString($str));
-    }
+	/**
+	 * Initialize from distinguished name string.
+	 *
+	 * @param string $str
+	 * @return self
+	 */
+	public static function fromDNString(string $str): self
+	{
+		return new self(Name::fromString($str));
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_dn->toString();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_dn->toString();
+	}
     
-    /**
-     * Get directory name.
-     *
-     * @return Name
-     */
-    public function dn(): Name
-    {
-        return $this->_dn;
-    }
+	/**
+	 * Get directory name.
+	 *
+	 * @return Name
+	 */
+	public function dn(): Name
+	{
+		return $this->_dn;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        // Name type is itself a CHOICE, so explicit tagging must be
-        // employed to avoid ambiguities
-        return new ExplicitlyTaggedType($this->_tag, $this->_dn->toASN1());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		// Name type is itself a CHOICE, so explicit tagging must be
+		// employed to avoid ambiguities
+		return new ExplicitlyTaggedType($this->_tag, $this->_dn->toASN1());
+	}
 }

lib/X509/GeneralName/DNSName.php

Indentation +50 added lines, -50 removed lines

@@ -16,59 +16,59 @@
  */
 class DNSName extends GeneralName
 {
-    /**
-     * DNS name.
-     *
-     * @var string
-     */
-    protected $_name;
+	/**
+	 * DNS name.
+	 *
+	 * @var string
+	 */
+	protected $_name;
     
-    /**
-     * Constructor.
-     *
-     * @param string $name Domain name
-     */
-    public function __construct(string $name)
-    {
-        $this->_tag = self::TAG_DNS_NAME;
-        $this->_name = $name;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name Domain name
+	 */
+	public function __construct(string $name)
+	{
+		$this->_tag = self::TAG_DNS_NAME;
+		$this->_name = $name;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        return new self($el->asIA5String()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		return new self($el->asIA5String()->string());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_name;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_name;
+	}
     
-    /**
-     * Get DNS name.
-     *
-     * @return string
-     */
-    public function name(): string
-    {
-        return $this->_name;
-    }
+	/**
+	 * Get DNS name.
+	 *
+	 * @return string
+	 */
+	public function name(): string
+	{
+		return $this->_name;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_name));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_name));
+	}
 }