sop / x501

lib/X501/StringPrep/MapStep.php

Indentation +28 added lines, -28 removed lines

@@ -12,34 +12,34 @@
  */
 class MapStep implements PrepareStep
 {
-    /**
-     * Whether to apply case folding.
-     *
-     * @var bool $_fold
-     */
-    protected $_fold;
+	/**
+	 * Whether to apply case folding.
+	 *
+	 * @var bool $_fold
+	 */
+	protected $_fold;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $fold_case Whether to apply case folding
-     */
-    public function __construct(bool $fold_case = false)
-    {
-        $this->_fold = $fold_case;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $fold_case Whether to apply case folding
+	 */
+	public function __construct(bool $fold_case = false)
+	{
+		$this->_fold = $fold_case;
+	}
     
-    /**
-     *
-     * @param string $string UTF-8 encoded string
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // @todo Implement character mappings
-        if ($this->_fold) {
-            $string = mb_convert_case($string, MB_CASE_LOWER, "UTF-8");
-        }
-        return $string;
-    }
+	/**
+	 *
+	 * @param string $string UTF-8 encoded string
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// @todo Implement character mappings
+		if ($this->_fold) {
+			$string = mb_convert_case($string, MB_CASE_LOWER, "UTF-8");
+		}
+		return $string;
+	}
 }

lib/X501/StringPrep/PrepareStep.php

Indentation +7 added lines, -7 removed lines

@@ -12,11 +12,11 @@
  */
 interface PrepareStep
 {
-    /**
-     * Apply string preparation step.
-     *
-     * @param string $string String to prepare
-     * @return string Prepared string
-     */
-    public function apply(string $string): string;
+	/**
+	 * Apply string preparation step.
+	 *
+	 * @param string $string String to prepare
+	 * @return string Prepared string
+	 */
+	public function apply(string $string): string;
 }

lib/X501/StringPrep/CheckBidiStep.php

Indentation +10 added lines, -10 removed lines

@@ -12,14 +12,14 @@
  */
 class CheckBidiStep implements PrepareStep
 {
-    /**
-     *
-     * @param string $string UTF-8 encoded string
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // @todo Implement
-        return $string;
-    }
+	/**
+	 *
+	 * @param string $string UTF-8 encoded string
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// @todo Implement
+		return $string;
+	}
 }

lib/X501/StringPrep/ProhibitStep.php

Indentation +12 added lines, -12 removed lines

@@ -12,16 +12,16 @@
  */
 class ProhibitStep implements PrepareStep
 {
-    /**
-     *
-     * @throws \UnexpectedValueException If string contains prohibited
-     *         characters
-     * @param string $string UTF-8 encoded string
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // @todo Implement
-        return $string;
-    }
+	/**
+	 *
+	 * @throws \UnexpectedValueException If string contains prohibited
+	 *         characters
+	 * @param string $string UTF-8 encoded string
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// @todo Implement
+		return $string;
+	}
 }

lib/X501/StringPrep/InsignificantNonSubstringSpaceStep.php

Indentation +18 added lines, -18 removed lines

@@ -14,22 +14,22 @@
  */
 class InsignificantNonSubstringSpaceStep implements PrepareStep
 {
-    /**
-     *
-     * @param string $string UTF-8 encoded string
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // if value contains no non-space characters
-        if (preg_match('/^\p{Zs}*$/u', $string)) {
-            return "  ";
-        }
-        // trim leading and trailing spaces
-        $string = preg_replace('/^\p{Zs}+/u', '', $string);
-        $string = preg_replace('/\p{Zs}+$/u', '', $string);
-        // convert inner space sequences to two U+0020 characters
-        $string = preg_replace('/\p{Zs}+/u', "  ", $string);
-        return " $string ";
-    }
+	/**
+	 *
+	 * @param string $string UTF-8 encoded string
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// if value contains no non-space characters
+		if (preg_match('/^\p{Zs}*$/u', $string)) {
+			return "  ";
+		}
+		// trim leading and trailing spaces
+		$string = preg_replace('/^\p{Zs}+/u', '', $string);
+		$string = preg_replace('/\p{Zs}+$/u', '', $string);
+		// convert inner space sequences to two U+0020 characters
+		$string = preg_replace('/\p{Zs}+/u', "  ", $string);
+		return " $string ";
+	}
 }

lib/X501/ASN1/Feature/TypedAttribute.php

Indentation +24 added lines, -24 removed lines

@@ -11,30 +11,30 @@
  */
 trait TypedAttribute
 {
-    /**
-     * Attribute type.
-     *
-     * @var AttributeType $_type
-     */
-    protected $_type;
+	/**
+	 * Attribute type.
+	 *
+	 * @var AttributeType $_type
+	 */
+	protected $_type;
     
-    /**
-     * Get attribute type.
-     *
-     * @return AttributeType
-     */
-    public function type(): AttributeType
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get attribute type.
+	 *
+	 * @return AttributeType
+	 */
+	public function type(): AttributeType
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Get OID of the attribute.
-     *
-     * @return string
-     */
-    public function oid(): string
-    {
-        return $this->_type->oid();
-    }
+	/**
+	 * Get OID of the attribute.
+	 *
+	 * @return string
+	 */
+	public function oid(): string
+	{
+		return $this->_type->oid();
+	}
 }

lib/X501/ASN1/Name.php

Indentation +183 added lines, -183 removed lines

@@ -21,199 +21,199 @@
  */
 class Name implements \Countable, \IteratorAggregate
 {
-    /**
-     * Relative distinguished name components.
-     *
-     * @var RDN[] $_rdns
-     */
-    protected $_rdns;
+	/**
+	 * Relative distinguished name components.
+	 *
+	 * @var RDN[] $_rdns
+	 */
+	protected $_rdns;
     
-    /**
-     * Constructor.
-     *
-     * @param RDN ...$rdns RDN components
-     */
-    public function __construct(RDN ...$rdns)
-    {
-        $this->_rdns = $rdns;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param RDN ...$rdns RDN components
+	 */
+	public function __construct(RDN ...$rdns)
+	{
+		$this->_rdns = $rdns;
+	}
     
-    /**
-     * 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 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.
-     *
-     * @link https://tools.ietf.org/html/rfc1779
-     * @param string $str
-     * @return self
-     */
-    public static function fromString(string $str): self
-    {
-        $rdns = array();
-        foreach (DNParser::parseString($str) as $nameComponent) {
-            $attribs = array();
-            foreach ($nameComponent as list($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);
-    }
+	/**
+	 * Initialize from distinguished name string.
+	 *
+	 * @link https://tools.ietf.org/html/rfc1779
+	 * @param string $str
+	 * @return self
+	 */
+	public static function fromString(string $str): self
+	{
+		$rdns = array();
+		foreach (DNParser::parseString($str) as $nameComponent) {
+			$attribs = array();
+			foreach ($nameComponent as list($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);
-    }
+	/**
+	 * 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.
-     *
-     * @link 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);
-    }
+	/**
+	 * Get distinguised name string conforming to RFC 2253.
+	 *
+	 * @link 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.
-     *
-     * @link 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;
-    }
+	/**
+	 * Whether name is semantically equal to other.
+	 * Comparison conforms to RFC 4518 string preparation algorithm.
+	 *
+	 * @link 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 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.");
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 *
+	 * @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 array_sum(
-            array_map(
-                function (RDN $rdn) use ($oid) {
-                    return count($rdn->allOf($oid));
-                }, $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 array_sum(
+			array_map(
+				function (RDN $rdn) use ($oid) {
+					return count($rdn->allOf($oid));
+				}, $this->_rdns));
+	}
     
-    /**
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_rdns);
-    }
+	/**
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_rdns);
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,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);
@@ -90,7 +90,7 @@ 
     public function toASN1(): Sequence
     {
         $elements = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toASN1();
             }, $this->_rdns);
         return new Sequence(...$elements);
@@ -105,7 +105,7 @@ 
     public function toString(): string
     {
         $parts = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toString();
             }, array_reverse($this->_rdns));
         return implode(",", $parts);
@@ -193,7 +193,7 @@ 
         $oid = AttributeType::attrNameToOID($name);
         return array_sum(
             array_map(
-                function (RDN $rdn) use ($oid) {
+                function(RDN $rdn) use ($oid) {
                     return count($rdn->allOf($oid));
                 }, $this->_rdns));
     }

lib/X501/ASN1/AttributeTypeAndValue.php

Indentation +98 added lines, -98 removed lines

@@ -16,111 +16,111 @@
  */
 class AttributeTypeAndValue
 {
-    use TypedAttribute;
+	use TypedAttribute;
     
-    /**
-     * Attribute value.
-     *
-     * @var AttributeValue $_value
-     */
-    protected $_value;
+	/**
+	 * Attribute value.
+	 *
+	 * @var AttributeValue $_value
+	 */
+	protected $_value;
     
-    /**
-     * Constructor.
-     *
-     * @param AttributeType $type Attribute type
-     * @param AttributeValue $value Attribute value
-     */
-    public function __construct(AttributeType $type, AttributeValue $value)
-    {
-        $this->_type = $type;
-        $this->_value = $value;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeType $type Attribute type
+	 * @param AttributeValue $value Attribute value
+	 */
+	public function __construct(AttributeType $type, AttributeValue $value)
+	{
+		$this->_type = $type;
+		$this->_value = $value;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
-        $value = AttributeValue::fromASN1ByOID($type->oid(), $seq->at(1));
-        return new self($type, $value);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
+		$value = AttributeValue::fromASN1ByOID($type->oid(), $seq->at(1));
+		return new self($type, $value);
+	}
     
-    /**
-     * Convenience method to initialize from attribute value.
-     *
-     * @param AttributeValue $value Attribute value
-     * @return self
-     */
-    public static function fromAttributeValue(AttributeValue $value): self
-    {
-        return new self(new AttributeType($value->oid()), $value);
-    }
+	/**
+	 * Convenience method to initialize from attribute value.
+	 *
+	 * @param AttributeValue $value Attribute value
+	 * @return self
+	 */
+	public static function fromAttributeValue(AttributeValue $value): self
+	{
+		return new self(new AttributeType($value->oid()), $value);
+	}
     
-    /**
-     * Get attribute value.
-     *
-     * @return AttributeValue
-     */
-    public function value(): AttributeValue
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get attribute value.
+	 *
+	 * @return AttributeValue
+	 */
+	public function value(): AttributeValue
+	{
+		return $this->_value;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence($this->_type->toASN1(), $this->_value->toASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence($this->_type->toASN1(), $this->_value->toASN1());
+	}
     
-    /**
-     * Get attributeTypeAndValue string conforming to RFC 2253.
-     *
-     * @link https://tools.ietf.org/html/rfc2253#section-2.3
-     * @return string
-     */
-    public function toString(): string
-    {
-        return $this->_type->typeName() . "=" . $this->_value->rfc2253String();
-    }
+	/**
+	 * Get attributeTypeAndValue string conforming to RFC 2253.
+	 *
+	 * @link https://tools.ietf.org/html/rfc2253#section-2.3
+	 * @return string
+	 */
+	public function toString(): string
+	{
+		return $this->_type->typeName() . "=" . $this->_value->rfc2253String();
+	}
     
-    /**
-     * Check whether attribute is semantically equal to other.
-     *
-     * @param AttributeTypeAndValue $other Object to compare to
-     * @return bool
-     */
-    public function equals(AttributeTypeAndValue $other): bool
-    {
-        // check that attribute types match
-        if ($this->oid() !== $other->oid()) {
-            return false;
-        }
-        $matcher = $this->_value->equalityMatchingRule();
-        $result = $matcher->compare($this->_value->stringValue(),
-            $other->_value->stringValue());
-        // match
-        if ($result) {
-            return true;
-        }
-        // no match or Undefined
-        return false;
-    }
+	/**
+	 * Check whether attribute is semantically equal to other.
+	 *
+	 * @param AttributeTypeAndValue $other Object to compare to
+	 * @return bool
+	 */
+	public function equals(AttributeTypeAndValue $other): bool
+	{
+		// check that attribute types match
+		if ($this->oid() !== $other->oid()) {
+			return false;
+		}
+		$matcher = $this->_value->equalityMatchingRule();
+		$result = $matcher->compare($this->_value->stringValue(),
+			$other->_value->stringValue());
+		// match
+		if ($result) {
+			return true;
+		}
+		// no match or Undefined
+		return false;
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 }

lib/X501/ASN1/RDN.php

Indentation +154 added lines, -154 removed lines

@@ -16,169 +16,169 @@
  */
 class RDN implements \Countable, \IteratorAggregate
 {
-    /**
-     * Attributes.
-     *
-     * @var AttributeTypeAndValue[] $_attribs
-     */
-    protected $_attribs;
+	/**
+	 * Attributes.
+	 *
+	 * @var AttributeTypeAndValue[] $_attribs
+	 */
+	protected $_attribs;
     
-    /**
-     * Constructor.
-     *
-     * @param AttributeTypeAndValue ...$attribs One or more attributes
-     */
-    public function __construct(AttributeTypeAndValue ...$attribs)
-    {
-        if (!count($attribs)) {
-            throw new \UnexpectedValueException(
-                "RDN must have at least one AttributeTypeAndValue.");
-        }
-        $this->_attribs = $attribs;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeTypeAndValue ...$attribs One or more attributes
+	 */
+	public function __construct(AttributeTypeAndValue ...$attribs)
+	{
+		if (!count($attribs)) {
+			throw new \UnexpectedValueException(
+				"RDN must have at least one AttributeTypeAndValue.");
+		}
+		$this->_attribs = $attribs;
+	}
     
-    /**
-     * Convenience method to initialize RDN from AttributeValue objects.
-     *
-     * @param AttributeValue ...$values One or more attributes
-     * @return self
-     */
-    public static function fromAttributeValues(AttributeValue ...$values): self
-    {
-        $attribs = array_map(
-            function (AttributeValue $value) {
-                return new AttributeTypeAndValue(
-                    new AttributeType($value->oid()), $value);
-            }, $values);
-        return new self(...$attribs);
-    }
+	/**
+	 * Convenience method to initialize RDN from AttributeValue objects.
+	 *
+	 * @param AttributeValue ...$values One or more attributes
+	 * @return self
+	 */
+	public static function fromAttributeValues(AttributeValue ...$values): self
+	{
+		$attribs = array_map(
+			function (AttributeValue $value) {
+				return new AttributeTypeAndValue(
+					new AttributeType($value->oid()), $value);
+			}, $values);
+		return new self(...$attribs);
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Set $set
-     * @return self
-     */
-    public static function fromASN1(Set $set): self
-    {
-        $attribs = array_map(
-            function (UnspecifiedType $el) {
-                return AttributeTypeAndValue::fromASN1($el->asSequence());
-            }, $set->elements());
-        return new self(...$attribs);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Set $set
+	 * @return self
+	 */
+	public static function fromASN1(Set $set): self
+	{
+		$attribs = array_map(
+			function (UnspecifiedType $el) {
+				return AttributeTypeAndValue::fromASN1($el->asSequence());
+			}, $set->elements());
+		return new self(...$attribs);
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Set
-     */
-    public function toASN1(): Set
-    {
-        $elements = array_map(
-            function (AttributeTypeAndValue $tv) {
-                return $tv->toASN1();
-            }, $this->_attribs);
-        $set = new Set(...$elements);
-        return $set->sortedSetOf();
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Set
+	 */
+	public function toASN1(): Set
+	{
+		$elements = array_map(
+			function (AttributeTypeAndValue $tv) {
+				return $tv->toASN1();
+			}, $this->_attribs);
+		$set = new Set(...$elements);
+		return $set->sortedSetOf();
+	}
     
-    /**
-     * Get name-component string conforming to RFC 2253.
-     *
-     * @link https://tools.ietf.org/html/rfc2253#section-2.2
-     * @return string
-     */
-    public function toString(): string
-    {
-        $parts = array_map(
-            function (AttributeTypeAndValue $tv) {
-                return $tv->toString();
-            }, $this->_attribs);
-        return implode("+", $parts);
-    }
+	/**
+	 * Get name-component string conforming to RFC 2253.
+	 *
+	 * @link https://tools.ietf.org/html/rfc2253#section-2.2
+	 * @return string
+	 */
+	public function toString(): string
+	{
+		$parts = array_map(
+			function (AttributeTypeAndValue $tv) {
+				return $tv->toString();
+			}, $this->_attribs);
+		return implode("+", $parts);
+	}
     
-    /**
-     * Check whether RDN is semantically equal to other.
-     *
-     * @param RDN $other Object to compare to
-     * @return bool
-     */
-    public function equals(RDN $other): bool
-    {
-        // if attribute count doesn't match
-        if (count($this) != count($other)) {
-            return false;
-        }
-        $attribs1 = $this->_attribs;
-        $attribs2 = $other->_attribs;
-        // if there's multiple attributes, sort using SET OF rules
-        if (count($attribs1) > 1) {
-            $attribs1 = self::fromASN1($this->toASN1())->_attribs;
-            $attribs2 = self::fromASN1($other->toASN1())->_attribs;
-        }
-        for ($i = count($attribs1) - 1; $i >= 0; --$i) {
-            $tv1 = $attribs1[$i];
-            $tv2 = $attribs2[$i];
-            if (!$tv1->equals($tv2)) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Check whether RDN is semantically equal to other.
+	 *
+	 * @param RDN $other Object to compare to
+	 * @return bool
+	 */
+	public function equals(RDN $other): bool
+	{
+		// if attribute count doesn't match
+		if (count($this) != count($other)) {
+			return false;
+		}
+		$attribs1 = $this->_attribs;
+		$attribs2 = $other->_attribs;
+		// if there's multiple attributes, sort using SET OF rules
+		if (count($attribs1) > 1) {
+			$attribs1 = self::fromASN1($this->toASN1())->_attribs;
+			$attribs2 = self::fromASN1($other->toASN1())->_attribs;
+		}
+		for ($i = count($attribs1) - 1; $i >= 0; --$i) {
+			$tv1 = $attribs1[$i];
+			$tv2 = $attribs2[$i];
+			if (!$tv1->equals($tv2)) {
+				return false;
+			}
+		}
+		return true;
+	}
     
-    /**
-     * Get all AttributeTypeAndValue objects.
-     *
-     * @return AttributeTypeAndValue[]
-     */
-    public function all(): array
-    {
-        return $this->_attribs;
-    }
+	/**
+	 * Get all AttributeTypeAndValue objects.
+	 *
+	 * @return AttributeTypeAndValue[]
+	 */
+	public function all(): array
+	{
+		return $this->_attribs;
+	}
     
-    /**
-     * Get all AttributeTypeAndValue objects of the given attribute type.
-     *
-     * @param string $name Attribute OID or name
-     * @return AttributeTypeAndValue[]
-     */
-    public function allOf(string $name): array
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        $attribs = array_filter($this->_attribs,
-            function (AttributeTypeAndValue $tv) use ($oid) {
-                return $tv->oid() == $oid;
-            });
-        return array_values($attribs);
-    }
+	/**
+	 * Get all AttributeTypeAndValue objects of the given attribute type.
+	 *
+	 * @param string $name Attribute OID or name
+	 * @return AttributeTypeAndValue[]
+	 */
+	public function allOf(string $name): array
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		$attribs = array_filter($this->_attribs,
+			function (AttributeTypeAndValue $tv) use ($oid) {
+				return $tv->oid() == $oid;
+			});
+		return array_values($attribs);
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_attribs);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_attribs);
+	}
     
-    /**
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_attribs);
-    }
+	/**
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_attribs);
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
     public static function fromAttributeValues(AttributeValue ...$values): self
     {
         $attribs = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return new AttributeTypeAndValue(
                     new AttributeType($value->oid()), $value);
             }, $values);
@@ -62,7 +62,7 @@ 
     public static function fromASN1(Set $set): self
     {
         $attribs = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return AttributeTypeAndValue::fromASN1($el->asSequence());
             }, $set->elements());
         return new self(...$attribs);
@@ -76,7 +76,7 @@ 
     public function toASN1(): Set
     {
         $elements = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toASN1();
             }, $this->_attribs);
         $set = new Set(...$elements);
@@ -92,7 +92,7 @@ 
     public function toString(): string
     {
         $parts = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toString();
             }, $this->_attribs);
         return implode("+", $parts);
@@ -147,7 +147,7 @@ 
     {
         $oid = AttributeType::attrNameToOID($name);
         $attribs = array_filter($this->_attribs,
-            function (AttributeTypeAndValue $tv) use ($oid) {
+            function(AttributeTypeAndValue $tv) use ($oid) {
                 return $tv->oid() == $oid;
             });
         return array_values($attribs);