sop / x501

lib/X501/ASN1/Name.php

Indentation +204 added lines, -204 removed lines

@@ -20,208 +20,208 @@
  */
 class Name implements \Countable, \IteratorAggregate
 {
-    /**
-     * Relative distinguished name components.
-     *
-     * @var RDN[]
-     */
-    protected $_rdns;
-
-    /**
-     * Constructor.
-     *
-     * @param RDN ...$rdns RDN components
-     */
-    public function __construct(RDN ...$rdns)
-    {
-        $this->_rdns = $rdns;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $rdns = array_map(
-            function (UnspecifiedType $el) {
-                return RDN::fromASN1($el->asSet());
-            }, $seq->elements());
-        return new self(...$rdns);
-    }
-
-    /**
-     * Initialize from distinguished name string.
-     *
-     * @see https://tools.ietf.org/html/rfc1779
-     *
-     * @param string $str
-     *
-     * @return self
-     */
-    public static function fromString(string $str): self
-    {
-        $rdns = [];
-        foreach (DNParser::parseString($str) as $nameComponent) {
-            $attribs = [];
-            foreach ($nameComponent as [$name, $val]) {
-                $type = AttributeType::fromName($name);
-                // hexstrings are parsed to ASN.1 elements
-                if ($val instanceof Element) {
-                    $el = $val;
-                } else {
-                    $el = AttributeType::asn1StringForType($type->oid(), $val);
-                }
-                $value = AttributeValue::fromASN1ByOID($type->oid(),
-                    $el->asUnspecified());
-                $attribs[] = new AttributeTypeAndValue($type, $value);
-            }
-            $rdns[] = new RDN(...$attribs);
-        }
-        return new self(...$rdns);
-    }
-
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array_map(
-            function (RDN $rdn) {
-                return $rdn->toASN1();
-            }, $this->_rdns);
-        return new Sequence(...$elements);
-    }
-
-    /**
-     * Get distinguised name string conforming to RFC 2253.
-     *
-     * @see https://tools.ietf.org/html/rfc2253#section-2.1
-     *
-     * @return string
-     */
-    public function toString(): string
-    {
-        $parts = array_map(
-            function (RDN $rdn) {
-                return $rdn->toString();
-            }, array_reverse($this->_rdns));
-        return implode(',', $parts);
-    }
-
-    /**
-     * Whether name is semantically equal to other.
-     *
-     * Comparison conforms to RFC 4518 string preparation algorithm.
-     *
-     * @see https://tools.ietf.org/html/rfc4518
-     *
-     * @param Name $other Object to compare to
-     *
-     * @return bool
-     */
-    public function equals(Name $other): bool
-    {
-        // if RDN count doesn't match
-        if (count($this) != count($other)) {
-            return false;
-        }
-        for ($i = count($this) - 1; $i >= 0; --$i) {
-            $rdn1 = $this->_rdns[$i];
-            $rdn2 = $other->_rdns[$i];
-            if (!$rdn1->equals($rdn2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get all RDN objects.
-     *
-     * @return RDN[]
-     */
-    public function all(): array
-    {
-        return $this->_rdns;
-    }
-
-    /**
-     * Get the first AttributeValue of given type.
-     *
-     * Relative name components shall be traversed in encoding order, which is
-     * reversed in regards to the string representation.
-     * Multi-valued RDN with multiple attributes of the requested type is
-     * ambiguous and shall throw an exception.
-     *
-     * @param string $name Attribute OID or name
-     *
-     * @throws \RuntimeException If attribute cannot be resolved
-     *
-     * @return AttributeValue
-     */
-    public function firstValueOf(string $name): AttributeValue
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        foreach ($this->_rdns as $rdn) {
-            $tvs = $rdn->allOf($oid);
-            if (count($tvs) > 1) {
-                throw new \RangeException("RDN with multiple {$name} attributes.");
-            }
-            if (1 == count($tvs)) {
-                return $tvs[0]->value();
-            }
-        }
-        throw new \RangeException("Attribute {$name} not found.");
-    }
-
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_rdns);
-    }
-
-    /**
-     * Get the number of attributes of given type.
-     *
-     * @param string $name Attribute OID or name
-     *
-     * @return int
-     */
-    public function countOfType(string $name): int
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        return (int) array_sum(
-            array_map(
-                function (RDN $rdn) use ($oid): int {
-                    return count($rdn->allOf($oid));
-                }, $this->_rdns));
-    }
-
-    /**
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_rdns);
-    }
+	/**
+	 * Relative distinguished name components.
+	 *
+	 * @var RDN[]
+	 */
+	protected $_rdns;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RDN ...$rdns RDN components
+	 */
+	public function __construct(RDN ...$rdns)
+	{
+		$this->_rdns = $rdns;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$rdns = array_map(
+			function (UnspecifiedType $el) {
+				return RDN::fromASN1($el->asSet());
+			}, $seq->elements());
+		return new self(...$rdns);
+	}
+
+	/**
+	 * Initialize from distinguished name string.
+	 *
+	 * @see https://tools.ietf.org/html/rfc1779
+	 *
+	 * @param string $str
+	 *
+	 * @return self
+	 */
+	public static function fromString(string $str): self
+	{
+		$rdns = [];
+		foreach (DNParser::parseString($str) as $nameComponent) {
+			$attribs = [];
+			foreach ($nameComponent as [$name, $val]) {
+				$type = AttributeType::fromName($name);
+				// hexstrings are parsed to ASN.1 elements
+				if ($val instanceof Element) {
+					$el = $val;
+				} else {
+					$el = AttributeType::asn1StringForType($type->oid(), $val);
+				}
+				$value = AttributeValue::fromASN1ByOID($type->oid(),
+					$el->asUnspecified());
+				$attribs[] = new AttributeTypeAndValue($type, $value);
+			}
+			$rdns[] = new RDN(...$attribs);
+		}
+		return new self(...$rdns);
+	}
+
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array_map(
+			function (RDN $rdn) {
+				return $rdn->toASN1();
+			}, $this->_rdns);
+		return new Sequence(...$elements);
+	}
+
+	/**
+	 * Get distinguised name string conforming to RFC 2253.
+	 *
+	 * @see https://tools.ietf.org/html/rfc2253#section-2.1
+	 *
+	 * @return string
+	 */
+	public function toString(): string
+	{
+		$parts = array_map(
+			function (RDN $rdn) {
+				return $rdn->toString();
+			}, array_reverse($this->_rdns));
+		return implode(',', $parts);
+	}
+
+	/**
+	 * Whether name is semantically equal to other.
+	 *
+	 * Comparison conforms to RFC 4518 string preparation algorithm.
+	 *
+	 * @see https://tools.ietf.org/html/rfc4518
+	 *
+	 * @param Name $other Object to compare to
+	 *
+	 * @return bool
+	 */
+	public function equals(Name $other): bool
+	{
+		// if RDN count doesn't match
+		if (count($this) != count($other)) {
+			return false;
+		}
+		for ($i = count($this) - 1; $i >= 0; --$i) {
+			$rdn1 = $this->_rdns[$i];
+			$rdn2 = $other->_rdns[$i];
+			if (!$rdn1->equals($rdn2)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Get all RDN objects.
+	 *
+	 * @return RDN[]
+	 */
+	public function all(): array
+	{
+		return $this->_rdns;
+	}
+
+	/**
+	 * Get the first AttributeValue of given type.
+	 *
+	 * Relative name components shall be traversed in encoding order, which is
+	 * reversed in regards to the string representation.
+	 * Multi-valued RDN with multiple attributes of the requested type is
+	 * ambiguous and shall throw an exception.
+	 *
+	 * @param string $name Attribute OID or name
+	 *
+	 * @throws \RuntimeException If attribute cannot be resolved
+	 *
+	 * @return AttributeValue
+	 */
+	public function firstValueOf(string $name): AttributeValue
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		foreach ($this->_rdns as $rdn) {
+			$tvs = $rdn->allOf($oid);
+			if (count($tvs) > 1) {
+				throw new \RangeException("RDN with multiple {$name} attributes.");
+			}
+			if (1 == count($tvs)) {
+				return $tvs[0]->value();
+			}
+		}
+		throw new \RangeException("Attribute {$name} not found.");
+	}
+
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_rdns);
+	}
+
+	/**
+	 * Get the number of attributes of given type.
+	 *
+	 * @param string $name Attribute OID or name
+	 *
+	 * @return int
+	 */
+	public function countOfType(string $name): int
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		return (int) array_sum(
+			array_map(
+				function (RDN $rdn) use ($oid): int {
+					return count($rdn->allOf($oid));
+				}, $this->_rdns));
+	}
+
+	/**
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_rdns);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\ASN1;
 
@@ -55,7 +55,7 @@ 
     public static function fromASN1(Sequence $seq): self
     {
         $rdns = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return RDN::fromASN1($el->asSet());
             }, $seq->elements());
         return new self(...$rdns);
@@ -100,7 +100,7 @@ 
     public function toASN1(): Sequence
     {
         $elements = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toASN1();
             }, $this->_rdns);
         return new Sequence(...$elements);
@@ -116,7 +116,7 @@ 
     public function toString(): string
     {
         $parts = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toString();
             }, array_reverse($this->_rdns));
         return implode(',', $parts);
@@ -210,7 +210,7 @@ 
         $oid = AttributeType::attrNameToOID($name);
         return (int) array_sum(
             array_map(
-                function (RDN $rdn) use ($oid): int {
+                function(RDN $rdn) use ($oid): int {
                     return count($rdn->allOf($oid));
                 }, $this->_rdns));
     }