sop / x509

lib/X509/GeneralName/IPv4Address.php

Indentation +37 added lines, -37 removed lines

@@ -4,42 +4,42 @@
 
 class IPv4Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     * @throws \InvalidArgumentException
-     * @return self
-     */
-    public static function fromOctets($octets)
-    {
-        $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($octets)
+	{
+		$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()
-    {
-        $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()
+	{
+		$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/IPAddress.php

Indentation +85 added lines, -85 removed lines

@@ -16,97 +16,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($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($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)
-    {
-        $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)
+	{
+		$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()
-    {
-        return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : "");
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : "");
+	}
     
-    /**
-     * Get IP address as a string.
-     *
-     * @return string
-     */
-    public function address()
-    {
-        return $this->_ip;
-    }
+	/**
+	 * Get IP address as a string.
+	 *
+	 * @return string
+	 */
+	public function address()
+	{
+		return $this->_ip;
+	}
     
-    /**
-     * Get subnet mask as a string.
-     *
-     * @return string
-     */
-    public function mask()
-    {
-        return $this->_mask;
-    }
+	/**
+	 * Get subnet mask as a string.
+	 *
+	 * @return string
+	 */
+	public function mask()
+	{
+		return $this->_mask;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1()
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new OctetString($this->_octets()));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new OctetString($this->_octets()));
+	}
 }

lib/X509/GeneralName/UniformResourceIdentifier.php

Indentation +50 added lines, -50 removed lines

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

lib/X509/GeneralName/DNSName.php

Indentation +50 added lines, -50 removed lines

@@ -13,59 +13,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($name)
-    {
-        $this->_tag = self::TAG_DNS_NAME;
-        $this->_name = $name;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $name Domain name
+	 */
+	public function __construct($name)
+	{
+		$this->_tag = self::TAG_DNS_NAME;
+		$this->_name = $name;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el)
-    {
-        return new self($el->asIA5String()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		return new self($el->asIA5String()->string());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string()
-    {
-        return $this->_name;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return $this->_name;
+	}
     
-    /**
-     * Get DNS name.
-     *
-     * @return string
-     */
-    public function name()
-    {
-        return $this->_name;
-    }
+	/**
+	 * Get DNS name.
+	 *
+	 * @return string
+	 */
+	public function name()
+	{
+		return $this->_name;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1()
-    {
-        return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_name));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_name));
+	}
 }

lib/X509/GeneralName/EDIPartyName.php

Indentation +39 added lines, -39 removed lines

@@ -15,47 +15,47 @@
  */
 class EDIPartyName extends GeneralName
 {
-    /**
-     *
-     * @var \ASN1\Element
-     */
-    protected $_element;
+	/**
+	 *
+	 * @var \ASN1\Element
+	 */
+	protected $_element;
     
-    /**
-     * Constructor.
-     */
-    protected function __construct()
-    {
-        $this->_tag = self::TAG_EDI_PARTY_NAME;
-    }
+	/**
+	 * Constructor.
+	 */
+	protected function __construct()
+	{
+		$this->_tag = self::TAG_EDI_PARTY_NAME;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el)
-    {
-        $obj = new self();
-        $obj->_element = $el->asSequence();
-        return $obj;
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		$obj = new self();
+		$obj->_element = $el->asSequence();
+		return $obj;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string()
-    {
-        return bin2hex($this->_element->toDER());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return bin2hex($this->_element->toDER());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1()
-    {
-        return new ImplicitlyTaggedType($this->_tag, $this->_element);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		return new ImplicitlyTaggedType($this->_tag, $this->_element);
+	}
 }

lib/X509/GeneralName/GeneralNames.php

Indentation +167 added lines, -167 removed lines

@@ -15,183 +15,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)
-    {
-        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)
+	{
+		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($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($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($tag)
-    {
-        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($tag)
+	{
+		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($tag)
-    {
-        $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($tag)
+	{
+		$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($tag)
-    {
-        $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($tag)
+	{
+		$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()
-    {
-        $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()
+	{
+		$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 \X501\ASN1\Name
-     */
-    public function firstDN()
-    {
-        $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 \X501\ASN1\Name
+	 */
+	public function firstDN()
+	{
+		$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()
-    {
-        $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()
+	{
+		$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()
-    {
-        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()
+	{
+		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()
-    {
-        return count($this->_names);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_names);
+	}
     
-    /**
-     * Get iterator for GeneralName objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_names);
-    }
+	/**
+	 * Get iterator for GeneralName objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_names);
+	}
 }

lib/X509/GeneralName/RFC822Name.php

Indentation +50 added lines, -50 removed lines

@@ -13,59 +13,59 @@
  */
 class RFC822Name extends GeneralName
 {
-    /**
-     * Email.
-     *
-     * @var string $_email
-     */
-    protected $_email;
+	/**
+	 * Email.
+	 *
+	 * @var string $_email
+	 */
+	protected $_email;
     
-    /**
-     * Constructor.
-     *
-     * @param string $email
-     */
-    public function __construct($email)
-    {
-        $this->_tag = self::TAG_RFC822_NAME;
-        $this->_email = $email;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $email
+	 */
+	public function __construct($email)
+	{
+		$this->_tag = self::TAG_RFC822_NAME;
+		$this->_email = $email;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el)
-    {
-        return new self($el->asIA5String()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		return new self($el->asIA5String()->string());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string()
-    {
-        return $this->_email;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return $this->_email;
+	}
     
-    /**
-     * Get email.
-     *
-     * @return string
-     */
-    public function email()
-    {
-        return $this->_email;
-    }
+	/**
+	 * Get email.
+	 *
+	 * @return string
+	 */
+	public function email()
+	{
+		return $this->_email;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1()
-    {
-        return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_email));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		return new ImplicitlyTaggedType($this->_tag, new IA5String($this->_email));
+	}
 }

lib/X509/GeneralName/OtherName.php

Indentation +72 added lines, -72 removed lines

@@ -16,82 +16,82 @@
  */
 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($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($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)
-    {
-        $seq = $el->asSequence();
-        $type_id = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        $value = $seq->getTagged(0)
-            ->asExplicit()
-            ->asElement();
-        return new self($type_id, $value);
-    }
-    public function string()
-    {
-        return $this->_type . "/#" . bin2hex($this->_element->toDER());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		$seq = $el->asSequence();
+		$type_id = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		$value = $seq->getTagged(0)
+			->asExplicit()
+			->asElement();
+		return new self($type_id, $value);
+	}
+	public function string()
+	{
+		return $this->_type . "/#" . bin2hex($this->_element->toDER());
+	}
     
-    /**
-     * Get type OID.
-     *
-     * @return string
-     */
-    public function type()
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get type OID.
+	 *
+	 * @return string
+	 */
+	public function type()
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Get value element.
-     *
-     * @return Element
-     */
-    public function value()
-    {
-        return $this->_element;
-    }
+	/**
+	 * Get value element.
+	 *
+	 * @return Element
+	 */
+	public function value()
+	{
+		return $this->_element;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1()
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new Sequence(new ObjectIdentifier($this->_type),
-                new ExplicitlyTaggedType(0, $this->_element)));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new Sequence(new ObjectIdentifier($this->_type),
+				new ExplicitlyTaggedType(0, $this->_element)));
+	}
 }

lib/X509/GeneralName/X400Address.php

Indentation +39 added lines, -39 removed lines

@@ -15,47 +15,47 @@
  */
 class X400Address extends GeneralName
 {
-    /**
-     *
-     * @var \ASN1\Element
-     */
-    protected $_element;
+	/**
+	 *
+	 * @var \ASN1\Element
+	 */
+	protected $_element;
     
-    /**
-     * Constructor.
-     */
-    protected function __construct()
-    {
-        $this->_tag = self::TAG_X400_ADDRESS;
-    }
+	/**
+	 * Constructor.
+	 */
+	protected function __construct()
+	{
+		$this->_tag = self::TAG_X400_ADDRESS;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el)
-    {
-        $obj = new self();
-        $obj->_element = $el->asSequence();
-        return $obj;
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		$obj = new self();
+		$obj->_element = $el->asSequence();
+		return $obj;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string()
-    {
-        return bin2hex($this->_element->toDER());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string()
+	{
+		return bin2hex($this->_element->toDER());
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1()
-    {
-        return new ImplicitlyTaggedType($this->_tag, $this->_element);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		return new ImplicitlyTaggedType($this->_tag, $this->_element);
+	}
 }