sop / x501

lib/X501/ASN1/RDN.php

Indentation +158 added lines, -158 removed lines

@@ -15,173 +15,173 @@
  */
 class RDN implements \Countable, \IteratorAggregate
 {
-    /**
-     * Attributes.
-     *
-     * @var AttributeTypeAndValue[]
-     */
-    protected $_attribs;
+	/**
+	 * Attributes.
+	 *
+	 * @var AttributeTypeAndValue[]
+	 */
+	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;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 
-    /**
-     * 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.
-     *
-     * @see 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.
+	 *
+	 * @see 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);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\ASN1;
 
@@ -54,7 +54,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);
@@ -71,7 +71,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);
@@ -85,7 +85,7 @@ 
     public function toASN1(): Set
     {
         $elements = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toASN1();
             }, $this->_attribs);
         $set = new Set(...$elements);
@@ -102,7 +102,7 @@ 
     public function toString(): string
     {
         $parts = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toString();
             }, $this->_attribs);
         return implode('+', $parts);
@@ -159,7 +159,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);

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);
+	}
 }

lib/X501/ASN1/AttributeType.php

Indentation +424 added lines, -424 removed lines

@@ -17,441 +17,441 @@
  */
 class AttributeType
 {
-    // OID's from 2.5.4 arc
-    const OID_OBJECT_CLASS = '2.5.4.0';
-    const OID_ALIASED_ENTRY_NAME = '2.5.4.1';
-    const OID_KNOWLEDGE_INFORMATION = '2.5.4.2';
-    const OID_COMMON_NAME = '2.5.4.3';
-    const OID_SURNAME = '2.5.4.4';
-    const OID_SERIAL_NUMBER = '2.5.4.5';
-    const OID_COUNTRY_NAME = '2.5.4.6';
-    const OID_LOCALITY_NAME = '2.5.4.7';
-    const OID_STATE_OR_PROVINCE_NAME = '2.5.4.8';
-    const OID_STREET_ADDRESS = '2.5.4.9';
-    const OID_ORGANIZATION_NAME = '2.5.4.10';
-    const OID_ORGANIZATIONAL_UNIT_NAME = '2.5.4.11';
-    const OID_TITLE = '2.5.4.12';
-    const OID_DESCRIPTION = '2.5.4.13';
-    const OID_SEARCH_GUIDE = '2.5.4.14';
-    const OID_BUSINESS_CATEGORY = '2.5.4.15';
-    const OID_POSTAL_ADDRESS = '2.5.4.16';
-    const OID_POSTAL_CODE = '2.5.4.17';
-    const OID_POST_OFFICE_BOX = '2.5.4.18';
-    const OID_PHYSICAL_DELIVERY_OFFICE_NAME = '2.5.4.19';
-    const OID_TELEPHONE_NUMBER = '2.5.4.20';
-    const OID_TELEX_NUMBER = '2.5.4.21';
-    const OID_TELETEX_TERMINAL_IDENTIFIER = '2.5.4.22';
-    const OID_FACSIMILE_TELEPHONE_NUMBER = '2.5.4.23';
-    const OID_X121_ADDRESS = '2.5.4.24';
-    const OID_INTERNATIONAL_ISDN_NUMBER = '2.5.4.25';
-    const OID_REGISTERED_ADDRESS = '2.5.4.26';
-    const OID_DESTINATION_INDICATOR = '2.5.4.27';
-    const OID_PREFERRED_DELIVERY_METHOD = '2.5.4.28';
-    const OID_PRESENTATION_ADDRESS = '2.5.4.29';
-    const OID_SUPPORTED_APPLICATION_CONTEXT = '2.5.4.30';
-    const OID_MEMBER = '2.5.4.31';
-    const OID_OWNER = '2.5.4.32';
-    const OID_ROLE_OCCUPANT = '2.5.4.33';
-    const OID_SEE_ALSO = '2.5.4.34';
-    const OID_USER_PASSWORD = '2.5.4.35';
-    const OID_USER_CERTIFICATE = '2.5.4.36';
-    const OID_CA_CERTIFICATE = '2.5.4.37';
-    const OID_AUTHORITY_REVOCATION_LIST = '2.5.4.38';
-    const OID_CERTIFICATE_REVOCATION_LIST = '2.5.4.39';
-    const OID_CROSS_CERTIFICATE_PAIR = '2.5.4.40';
-    const OID_NAME = '2.5.4.41';
-    const OID_GIVEN_NAME = '2.5.4.42';
-    const OID_INITIALS = '2.5.4.43';
-    const OID_GENERATION_QUALIFIER = '2.5.4.44';
-    const OID_UNIQUE_IDENTIFIER = '2.5.4.45';
-    const OID_DN_QUALIFIER = '2.5.4.46';
-    const OID_ENHANCED_SEARCH_GUIDE = '2.5.4.47';
-    const OID_PROTOCOL_INFORMATION = '2.5.4.48';
-    const OID_DISTINGUISHED_NAME = '2.5.4.49';
-    const OID_UNIQUE_MEMBER = '2.5.4.50';
-    const OID_HOUSE_IDENTIFIER = '2.5.4.51';
-    const OID_SUPPORTED_ALGORITHMS = '2.5.4.52';
-    const OID_DELTA_REVOCATION_LIST = '2.5.4.53';
-    const OID_DMD_NAME = '2.5.4.54';
-    const OID_CLEARANCE = '2.5.4.55';
-    const OID_DEFAULT_DIR_QOP = '2.5.4.56';
-    const OID_ATTRIBUTE_INTEGRITY_INFO = '2.5.4.57';
-    const OID_ATTRIBUTE_CERTIFICATE = '2.5.4.58';
-    const OID_ATTRIBUTE_CERTIFICATE_REVOCATION_LIST = '2.5.4.59';
-    const OID_CONF_KEY_INFO = '2.5.4.60';
-    const OID_AA_CERTIFICATE = '2.5.4.61';
-    const OID_ATTRIBUTE_DESCRIPTOR_CERTIFICATE = '2.5.4.62';
-    const OID_ATTRIBUTE_AUTHORITY_REVOCATION_LIST = '2.5.4.63';
-    const OID_FAMILY_INFORMATION = '2.5.4.64';
-    const OID_PSEUDONYM = '2.5.4.65';
-    const OID_COMMUNICATIONS_SERVICE = '2.5.4.66';
-    const OID_COMMUNICATIONS_NETWORK = '2.5.4.67';
-    const OID_CERTIFICATION_PRACTICE_STMT = '2.5.4.68';
-    const OID_CERTIFICATE_POLICY = '2.5.4.69';
-    const OID_PKI_PATH = '2.5.4.70';
-    const OID_PRIV_POLICY = '2.5.4.71';
-    const OID_ROLE = '2.5.4.72';
-    const OID_DELEGATION_PATH = '2.5.4.73';
-    const OID_PROT_PRIV_POLICY = '2.5.4.74';
-    const OID_XML_PRIVILEGE_INFO = '2.5.4.75';
-    const OID_XML_PRIV_POLICY = '2.5.4.76';
-    const OID_UUID_PAIR = '2.5.4.77';
-    const OID_TAG_OID = '2.5.4.78';
-    const OID_UII_FORMAT = '2.5.4.79';
-    const OID_UII_IN_URH = '2.5.4.80';
-    const OID_CONTENT_URL = '2.5.4.81';
-    const OID_PERMISSION = '2.5.4.82';
-    const OID_URI = '2.5.4.83';
-    const OID_PWD_ATTRIBUTE = '2.5.4.84';
-    const OID_USER_PWD = '2.5.4.85';
-    const OID_URN = '2.5.4.86';
-    const OID_URL = '2.5.4.87';
-    const OID_UTM_COORDINATES = '2.5.4.88';
-    const OID_URNC = '2.5.4.89';
-    const OID_UII = '2.5.4.90';
-    const OID_EPC = '2.5.4.91';
-    const OID_TAG_AFI = '2.5.4.92';
-    const OID_EPC_FORMAT = '2.5.4.93';
-    const OID_EPC_IN_URN = '2.5.4.94';
-    const OID_LDAP_URL = '2.5.4.95';
-    const OID_TAG_LOCATION = '2.5.4.96';
-    const OID_ORGANIZATION_IDENTIFIER = '2.5.4.97';
+	// OID's from 2.5.4 arc
+	const OID_OBJECT_CLASS = '2.5.4.0';
+	const OID_ALIASED_ENTRY_NAME = '2.5.4.1';
+	const OID_KNOWLEDGE_INFORMATION = '2.5.4.2';
+	const OID_COMMON_NAME = '2.5.4.3';
+	const OID_SURNAME = '2.5.4.4';
+	const OID_SERIAL_NUMBER = '2.5.4.5';
+	const OID_COUNTRY_NAME = '2.5.4.6';
+	const OID_LOCALITY_NAME = '2.5.4.7';
+	const OID_STATE_OR_PROVINCE_NAME = '2.5.4.8';
+	const OID_STREET_ADDRESS = '2.5.4.9';
+	const OID_ORGANIZATION_NAME = '2.5.4.10';
+	const OID_ORGANIZATIONAL_UNIT_NAME = '2.5.4.11';
+	const OID_TITLE = '2.5.4.12';
+	const OID_DESCRIPTION = '2.5.4.13';
+	const OID_SEARCH_GUIDE = '2.5.4.14';
+	const OID_BUSINESS_CATEGORY = '2.5.4.15';
+	const OID_POSTAL_ADDRESS = '2.5.4.16';
+	const OID_POSTAL_CODE = '2.5.4.17';
+	const OID_POST_OFFICE_BOX = '2.5.4.18';
+	const OID_PHYSICAL_DELIVERY_OFFICE_NAME = '2.5.4.19';
+	const OID_TELEPHONE_NUMBER = '2.5.4.20';
+	const OID_TELEX_NUMBER = '2.5.4.21';
+	const OID_TELETEX_TERMINAL_IDENTIFIER = '2.5.4.22';
+	const OID_FACSIMILE_TELEPHONE_NUMBER = '2.5.4.23';
+	const OID_X121_ADDRESS = '2.5.4.24';
+	const OID_INTERNATIONAL_ISDN_NUMBER = '2.5.4.25';
+	const OID_REGISTERED_ADDRESS = '2.5.4.26';
+	const OID_DESTINATION_INDICATOR = '2.5.4.27';
+	const OID_PREFERRED_DELIVERY_METHOD = '2.5.4.28';
+	const OID_PRESENTATION_ADDRESS = '2.5.4.29';
+	const OID_SUPPORTED_APPLICATION_CONTEXT = '2.5.4.30';
+	const OID_MEMBER = '2.5.4.31';
+	const OID_OWNER = '2.5.4.32';
+	const OID_ROLE_OCCUPANT = '2.5.4.33';
+	const OID_SEE_ALSO = '2.5.4.34';
+	const OID_USER_PASSWORD = '2.5.4.35';
+	const OID_USER_CERTIFICATE = '2.5.4.36';
+	const OID_CA_CERTIFICATE = '2.5.4.37';
+	const OID_AUTHORITY_REVOCATION_LIST = '2.5.4.38';
+	const OID_CERTIFICATE_REVOCATION_LIST = '2.5.4.39';
+	const OID_CROSS_CERTIFICATE_PAIR = '2.5.4.40';
+	const OID_NAME = '2.5.4.41';
+	const OID_GIVEN_NAME = '2.5.4.42';
+	const OID_INITIALS = '2.5.4.43';
+	const OID_GENERATION_QUALIFIER = '2.5.4.44';
+	const OID_UNIQUE_IDENTIFIER = '2.5.4.45';
+	const OID_DN_QUALIFIER = '2.5.4.46';
+	const OID_ENHANCED_SEARCH_GUIDE = '2.5.4.47';
+	const OID_PROTOCOL_INFORMATION = '2.5.4.48';
+	const OID_DISTINGUISHED_NAME = '2.5.4.49';
+	const OID_UNIQUE_MEMBER = '2.5.4.50';
+	const OID_HOUSE_IDENTIFIER = '2.5.4.51';
+	const OID_SUPPORTED_ALGORITHMS = '2.5.4.52';
+	const OID_DELTA_REVOCATION_LIST = '2.5.4.53';
+	const OID_DMD_NAME = '2.5.4.54';
+	const OID_CLEARANCE = '2.5.4.55';
+	const OID_DEFAULT_DIR_QOP = '2.5.4.56';
+	const OID_ATTRIBUTE_INTEGRITY_INFO = '2.5.4.57';
+	const OID_ATTRIBUTE_CERTIFICATE = '2.5.4.58';
+	const OID_ATTRIBUTE_CERTIFICATE_REVOCATION_LIST = '2.5.4.59';
+	const OID_CONF_KEY_INFO = '2.5.4.60';
+	const OID_AA_CERTIFICATE = '2.5.4.61';
+	const OID_ATTRIBUTE_DESCRIPTOR_CERTIFICATE = '2.5.4.62';
+	const OID_ATTRIBUTE_AUTHORITY_REVOCATION_LIST = '2.5.4.63';
+	const OID_FAMILY_INFORMATION = '2.5.4.64';
+	const OID_PSEUDONYM = '2.5.4.65';
+	const OID_COMMUNICATIONS_SERVICE = '2.5.4.66';
+	const OID_COMMUNICATIONS_NETWORK = '2.5.4.67';
+	const OID_CERTIFICATION_PRACTICE_STMT = '2.5.4.68';
+	const OID_CERTIFICATE_POLICY = '2.5.4.69';
+	const OID_PKI_PATH = '2.5.4.70';
+	const OID_PRIV_POLICY = '2.5.4.71';
+	const OID_ROLE = '2.5.4.72';
+	const OID_DELEGATION_PATH = '2.5.4.73';
+	const OID_PROT_PRIV_POLICY = '2.5.4.74';
+	const OID_XML_PRIVILEGE_INFO = '2.5.4.75';
+	const OID_XML_PRIV_POLICY = '2.5.4.76';
+	const OID_UUID_PAIR = '2.5.4.77';
+	const OID_TAG_OID = '2.5.4.78';
+	const OID_UII_FORMAT = '2.5.4.79';
+	const OID_UII_IN_URH = '2.5.4.80';
+	const OID_CONTENT_URL = '2.5.4.81';
+	const OID_PERMISSION = '2.5.4.82';
+	const OID_URI = '2.5.4.83';
+	const OID_PWD_ATTRIBUTE = '2.5.4.84';
+	const OID_USER_PWD = '2.5.4.85';
+	const OID_URN = '2.5.4.86';
+	const OID_URL = '2.5.4.87';
+	const OID_UTM_COORDINATES = '2.5.4.88';
+	const OID_URNC = '2.5.4.89';
+	const OID_UII = '2.5.4.90';
+	const OID_EPC = '2.5.4.91';
+	const OID_TAG_AFI = '2.5.4.92';
+	const OID_EPC_FORMAT = '2.5.4.93';
+	const OID_EPC_IN_URN = '2.5.4.94';
+	const OID_LDAP_URL = '2.5.4.95';
+	const OID_TAG_LOCATION = '2.5.4.96';
+	const OID_ORGANIZATION_IDENTIFIER = '2.5.4.97';
 
-    // Miscellany attribute OID's
-    const OID_CLEARANCE_X501 = '2.5.1.5.55';
+	// Miscellany attribute OID's
+	const OID_CLEARANCE_X501 = '2.5.1.5.55';
 
-    /**
-     * Default ASN.1 string types for attributes.
-     *
-     * Attributes not mapped here shall use UTF8String as a default type.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ATTR_TO_STR_TYPE = [
-        self::OID_DN_QUALIFIER => Element::TYPE_PRINTABLE_STRING,
-        self::OID_COUNTRY_NAME => Element::TYPE_PRINTABLE_STRING,
-        self::OID_SERIAL_NUMBER => Element::TYPE_PRINTABLE_STRING,
-    ];
+	/**
+	 * Default ASN.1 string types for attributes.
+	 *
+	 * Attributes not mapped here shall use UTF8String as a default type.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ATTR_TO_STR_TYPE = [
+		self::OID_DN_QUALIFIER => Element::TYPE_PRINTABLE_STRING,
+		self::OID_COUNTRY_NAME => Element::TYPE_PRINTABLE_STRING,
+		self::OID_SERIAL_NUMBER => Element::TYPE_PRINTABLE_STRING,
+	];
 
-    /**
-     * OID to attribute names mapping.
-     *
-     * First name is the primary name. If there's more than one name, others may
-     * be used as an alias.
-     *
-     * Generated using ldap-attribs.py.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_NAME = [
-        '0.9.2342.19200300.100.1.1' => ['uid', 'userid'],
-        '0.9.2342.19200300.100.1.2' => ['textEncodedORAddress'],
-        '0.9.2342.19200300.100.1.3' => ['mail', 'rfc822Mailbox'],
-        '0.9.2342.19200300.100.1.4' => ['info'],
-        '0.9.2342.19200300.100.1.5' => ['drink', 'favouriteDrink'],
-        '0.9.2342.19200300.100.1.6' => ['roomNumber'],
-        '0.9.2342.19200300.100.1.7' => ['photo'],
-        '0.9.2342.19200300.100.1.8' => ['userClass'],
-        '0.9.2342.19200300.100.1.9' => ['host'],
-        '0.9.2342.19200300.100.1.10' => ['manager'],
-        '0.9.2342.19200300.100.1.11' => ['documentIdentifier'],
-        '0.9.2342.19200300.100.1.12' => ['documentTitle'],
-        '0.9.2342.19200300.100.1.13' => ['documentVersion'],
-        '0.9.2342.19200300.100.1.14' => ['documentAuthor'],
-        '0.9.2342.19200300.100.1.15' => ['documentLocation'],
-        '0.9.2342.19200300.100.1.20' => ['homePhone', 'homeTelephoneNumber'],
-        '0.9.2342.19200300.100.1.21' => ['secretary'],
-        '0.9.2342.19200300.100.1.22' => ['otherMailbox'],
-        '0.9.2342.19200300.100.1.25' => ['dc', 'domainComponent'],
-        '0.9.2342.19200300.100.1.26' => ['aRecord'],
-        '0.9.2342.19200300.100.1.27' => ['mDRecord'],
-        '0.9.2342.19200300.100.1.28' => ['mXRecord'],
-        '0.9.2342.19200300.100.1.29' => ['nSRecord'],
-        '0.9.2342.19200300.100.1.30' => ['sOARecord'],
-        '0.9.2342.19200300.100.1.31' => ['cNAMERecord'],
-        '0.9.2342.19200300.100.1.37' => ['associatedDomain'],
-        '0.9.2342.19200300.100.1.38' => ['associatedName'],
-        '0.9.2342.19200300.100.1.39' => ['homePostalAddress'],
-        '0.9.2342.19200300.100.1.40' => ['personalTitle'],
-        '0.9.2342.19200300.100.1.41' => ['mobile', 'mobileTelephoneNumber'],
-        '0.9.2342.19200300.100.1.42' => ['pager', 'pagerTelephoneNumber'],
-        '0.9.2342.19200300.100.1.43' => ['co', 'friendlyCountryName'],
-        '0.9.2342.19200300.100.1.44' => ['uniqueIdentifier'],
-        '0.9.2342.19200300.100.1.45' => ['organizationalStatus'],
-        '0.9.2342.19200300.100.1.46' => ['janetMailbox'],
-        '0.9.2342.19200300.100.1.47' => ['mailPreferenceOption'],
-        '0.9.2342.19200300.100.1.48' => ['buildingName'],
-        '0.9.2342.19200300.100.1.49' => ['dSAQuality'],
-        '0.9.2342.19200300.100.1.50' => ['singleLevelQuality'],
-        '0.9.2342.19200300.100.1.51' => ['subtreeMinimumQuality'],
-        '0.9.2342.19200300.100.1.52' => ['subtreeMaximumQuality'],
-        '0.9.2342.19200300.100.1.53' => ['personalSignature'],
-        '0.9.2342.19200300.100.1.54' => ['dITRedirect'],
-        '0.9.2342.19200300.100.1.55' => ['audio'],
-        '0.9.2342.19200300.100.1.56' => ['documentPublisher'],
-        '0.9.2342.19200300.100.1.60' => ['jpegPhoto'],
-        '1.2.840.113549.1.9.1' => ['email', 'emailAddress', 'pkcs9email'],
-        '1.2.840.113556.1.2.102' => ['memberOf'],
-        '1.3.6.1.1.1.1.0' => ['uidNumber'],
-        '1.3.6.1.1.1.1.1' => ['gidNumber'],
-        '1.3.6.1.1.1.1.2' => ['gecos'],
-        '1.3.6.1.1.1.1.3' => ['homeDirectory'],
-        '1.3.6.1.1.1.1.4' => ['loginShell'],
-        '1.3.6.1.1.1.1.5' => ['shadowLastChange'],
-        '1.3.6.1.1.1.1.6' => ['shadowMin'],
-        '1.3.6.1.1.1.1.7' => ['shadowMax'],
-        '1.3.6.1.1.1.1.8' => ['shadowWarning'],
-        '1.3.6.1.1.1.1.9' => ['shadowInactive'],
-        '1.3.6.1.1.1.1.10' => ['shadowExpire'],
-        '1.3.6.1.1.1.1.11' => ['shadowFlag'],
-        '1.3.6.1.1.1.1.12' => ['memberUid'],
-        '1.3.6.1.1.1.1.13' => ['memberNisNetgroup'],
-        '1.3.6.1.1.1.1.14' => ['nisNetgroupTriple'],
-        '1.3.6.1.1.1.1.15' => ['ipServicePort'],
-        '1.3.6.1.1.1.1.16' => ['ipServiceProtocol'],
-        '1.3.6.1.1.1.1.17' => ['ipProtocolNumber'],
-        '1.3.6.1.1.1.1.18' => ['oncRpcNumber'],
-        '1.3.6.1.1.1.1.19' => ['ipHostNumber'],
-        '1.3.6.1.1.1.1.20' => ['ipNetworkNumber'],
-        '1.3.6.1.1.1.1.21' => ['ipNetmaskNumber'],
-        '1.3.6.1.1.1.1.22' => ['macAddress'],
-        '1.3.6.1.1.1.1.23' => ['bootParameter'],
-        '1.3.6.1.1.1.1.24' => ['bootFile'],
-        '1.3.6.1.1.1.1.26' => ['nisMapName'],
-        '1.3.6.1.1.1.1.27' => ['nisMapEntry'],
-        '1.3.6.1.1.4' => ['vendorName'],
-        '1.3.6.1.1.5' => ['vendorVersion'],
-        '1.3.6.1.1.16.4' => ['entryUUID'],
-        '1.3.6.1.1.20' => ['entryDN'],
-        '2.5.4.0' => ['objectClass'],
-        '2.5.4.1' => ['aliasedObjectName', 'aliasedEntryName'],
-        '2.5.4.2' => ['knowledgeInformation'],
-        '2.5.4.3' => ['cn', 'commonName'],
-        '2.5.4.4' => ['sn', 'surname'],
-        '2.5.4.5' => ['serialNumber'],
-        '2.5.4.6' => ['c', 'countryName'],
-        '2.5.4.7' => ['l', 'localityName'],
-        '2.5.4.8' => ['st', 'stateOrProvinceName'],
-        '2.5.4.9' => ['street', 'streetAddress'],
-        '2.5.4.10' => ['o', 'organizationName'],
-        '2.5.4.11' => ['ou', 'organizationalUnitName'],
-        '2.5.4.12' => ['title'],
-        '2.5.4.13' => ['description'],
-        '2.5.4.14' => ['searchGuide'],
-        '2.5.4.15' => ['businessCategory'],
-        '2.5.4.16' => ['postalAddress'],
-        '2.5.4.17' => ['postalCode'],
-        '2.5.4.18' => ['postOfficeBox'],
-        '2.5.4.19' => ['physicalDeliveryOfficeName'],
-        '2.5.4.20' => ['telephoneNumber'],
-        '2.5.4.21' => ['telexNumber'],
-        '2.5.4.22' => ['teletexTerminalIdentifier'],
-        '2.5.4.23' => ['facsimileTelephoneNumber', 'fax'],
-        '2.5.4.24' => ['x121Address'],
-        '2.5.4.25' => ['internationaliSDNNumber'],
-        '2.5.4.26' => ['registeredAddress'],
-        '2.5.4.27' => ['destinationIndicator'],
-        '2.5.4.28' => ['preferredDeliveryMethod'],
-        '2.5.4.29' => ['presentationAddress'],
-        '2.5.4.30' => ['supportedApplicationContext'],
-        '2.5.4.31' => ['member'],
-        '2.5.4.32' => ['owner'],
-        '2.5.4.33' => ['roleOccupant'],
-        '2.5.4.34' => ['seeAlso'],
-        '2.5.4.35' => ['userPassword'],
-        '2.5.4.36' => ['userCertificate'],
-        '2.5.4.37' => ['cACertificate'],
-        '2.5.4.38' => ['authorityRevocationList'],
-        '2.5.4.39' => ['certificateRevocationList'],
-        '2.5.4.40' => ['crossCertificatePair'],
-        '2.5.4.41' => ['name'],
-        '2.5.4.42' => ['givenName', 'gn'],
-        '2.5.4.43' => ['initials'],
-        '2.5.4.44' => ['generationQualifier'],
-        '2.5.4.45' => ['x500UniqueIdentifier'],
-        '2.5.4.46' => ['dnQualifier'],
-        '2.5.4.47' => ['enhancedSearchGuide'],
-        '2.5.4.48' => ['protocolInformation'],
-        '2.5.4.49' => ['distinguishedName'],
-        '2.5.4.50' => ['uniqueMember'],
-        '2.5.4.51' => ['houseIdentifier'],
-        '2.5.4.52' => ['supportedAlgorithms'],
-        '2.5.4.53' => ['deltaRevocationList'],
-        '2.5.4.54' => ['dmdName'],
-        '2.5.4.65' => ['pseudonym'],
-        '2.5.18.1' => ['createTimestamp'],
-        '2.5.18.2' => ['modifyTimestamp'],
-        '2.5.18.3' => ['creatorsName'],
-        '2.5.18.4' => ['modifiersName'],
-        '2.5.18.5' => ['administrativeRole'],
-        '2.5.18.6' => ['subtreeSpecification'],
-        '2.5.18.9' => ['hasSubordinates'],
-        '2.5.18.10' => ['subschemaSubentry'],
-        '2.5.21.1' => ['dITStructureRules'],
-        '2.5.21.2' => ['dITContentRules'],
-        '2.5.21.4' => ['matchingRules'],
-        '2.5.21.5' => ['attributeTypes'],
-        '2.5.21.6' => ['objectClasses'],
-        '2.5.21.7' => ['nameForms'],
-        '2.5.21.8' => ['matchingRuleUse'],
-        '2.5.21.9' => ['structuralObjectClass'],
-        '2.16.840.1.113730.3.1.1' => ['carLicense'],
-        '2.16.840.1.113730.3.1.2' => ['departmentNumber'],
-        '2.16.840.1.113730.3.1.3' => ['employeeNumber'],
-        '2.16.840.1.113730.3.1.4' => ['employeeType'],
-        '2.16.840.1.113730.3.1.34' => ['ref'],
-        '2.16.840.1.113730.3.1.39' => ['preferredLanguage'],
-        '2.16.840.1.113730.3.1.40' => ['userSMIMECertificate'],
-        '2.16.840.1.113730.3.1.216' => ['userPKCS12'],
-        '2.16.840.1.113730.3.1.241' => ['displayName'],
-    ];
+	/**
+	 * OID to attribute names mapping.
+	 *
+	 * First name is the primary name. If there's more than one name, others may
+	 * be used as an alias.
+	 *
+	 * Generated using ldap-attribs.py.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_NAME = [
+		'0.9.2342.19200300.100.1.1' => ['uid', 'userid'],
+		'0.9.2342.19200300.100.1.2' => ['textEncodedORAddress'],
+		'0.9.2342.19200300.100.1.3' => ['mail', 'rfc822Mailbox'],
+		'0.9.2342.19200300.100.1.4' => ['info'],
+		'0.9.2342.19200300.100.1.5' => ['drink', 'favouriteDrink'],
+		'0.9.2342.19200300.100.1.6' => ['roomNumber'],
+		'0.9.2342.19200300.100.1.7' => ['photo'],
+		'0.9.2342.19200300.100.1.8' => ['userClass'],
+		'0.9.2342.19200300.100.1.9' => ['host'],
+		'0.9.2342.19200300.100.1.10' => ['manager'],
+		'0.9.2342.19200300.100.1.11' => ['documentIdentifier'],
+		'0.9.2342.19200300.100.1.12' => ['documentTitle'],
+		'0.9.2342.19200300.100.1.13' => ['documentVersion'],
+		'0.9.2342.19200300.100.1.14' => ['documentAuthor'],
+		'0.9.2342.19200300.100.1.15' => ['documentLocation'],
+		'0.9.2342.19200300.100.1.20' => ['homePhone', 'homeTelephoneNumber'],
+		'0.9.2342.19200300.100.1.21' => ['secretary'],
+		'0.9.2342.19200300.100.1.22' => ['otherMailbox'],
+		'0.9.2342.19200300.100.1.25' => ['dc', 'domainComponent'],
+		'0.9.2342.19200300.100.1.26' => ['aRecord'],
+		'0.9.2342.19200300.100.1.27' => ['mDRecord'],
+		'0.9.2342.19200300.100.1.28' => ['mXRecord'],
+		'0.9.2342.19200300.100.1.29' => ['nSRecord'],
+		'0.9.2342.19200300.100.1.30' => ['sOARecord'],
+		'0.9.2342.19200300.100.1.31' => ['cNAMERecord'],
+		'0.9.2342.19200300.100.1.37' => ['associatedDomain'],
+		'0.9.2342.19200300.100.1.38' => ['associatedName'],
+		'0.9.2342.19200300.100.1.39' => ['homePostalAddress'],
+		'0.9.2342.19200300.100.1.40' => ['personalTitle'],
+		'0.9.2342.19200300.100.1.41' => ['mobile', 'mobileTelephoneNumber'],
+		'0.9.2342.19200300.100.1.42' => ['pager', 'pagerTelephoneNumber'],
+		'0.9.2342.19200300.100.1.43' => ['co', 'friendlyCountryName'],
+		'0.9.2342.19200300.100.1.44' => ['uniqueIdentifier'],
+		'0.9.2342.19200300.100.1.45' => ['organizationalStatus'],
+		'0.9.2342.19200300.100.1.46' => ['janetMailbox'],
+		'0.9.2342.19200300.100.1.47' => ['mailPreferenceOption'],
+		'0.9.2342.19200300.100.1.48' => ['buildingName'],
+		'0.9.2342.19200300.100.1.49' => ['dSAQuality'],
+		'0.9.2342.19200300.100.1.50' => ['singleLevelQuality'],
+		'0.9.2342.19200300.100.1.51' => ['subtreeMinimumQuality'],
+		'0.9.2342.19200300.100.1.52' => ['subtreeMaximumQuality'],
+		'0.9.2342.19200300.100.1.53' => ['personalSignature'],
+		'0.9.2342.19200300.100.1.54' => ['dITRedirect'],
+		'0.9.2342.19200300.100.1.55' => ['audio'],
+		'0.9.2342.19200300.100.1.56' => ['documentPublisher'],
+		'0.9.2342.19200300.100.1.60' => ['jpegPhoto'],
+		'1.2.840.113549.1.9.1' => ['email', 'emailAddress', 'pkcs9email'],
+		'1.2.840.113556.1.2.102' => ['memberOf'],
+		'1.3.6.1.1.1.1.0' => ['uidNumber'],
+		'1.3.6.1.1.1.1.1' => ['gidNumber'],
+		'1.3.6.1.1.1.1.2' => ['gecos'],
+		'1.3.6.1.1.1.1.3' => ['homeDirectory'],
+		'1.3.6.1.1.1.1.4' => ['loginShell'],
+		'1.3.6.1.1.1.1.5' => ['shadowLastChange'],
+		'1.3.6.1.1.1.1.6' => ['shadowMin'],
+		'1.3.6.1.1.1.1.7' => ['shadowMax'],
+		'1.3.6.1.1.1.1.8' => ['shadowWarning'],
+		'1.3.6.1.1.1.1.9' => ['shadowInactive'],
+		'1.3.6.1.1.1.1.10' => ['shadowExpire'],
+		'1.3.6.1.1.1.1.11' => ['shadowFlag'],
+		'1.3.6.1.1.1.1.12' => ['memberUid'],
+		'1.3.6.1.1.1.1.13' => ['memberNisNetgroup'],
+		'1.3.6.1.1.1.1.14' => ['nisNetgroupTriple'],
+		'1.3.6.1.1.1.1.15' => ['ipServicePort'],
+		'1.3.6.1.1.1.1.16' => ['ipServiceProtocol'],
+		'1.3.6.1.1.1.1.17' => ['ipProtocolNumber'],
+		'1.3.6.1.1.1.1.18' => ['oncRpcNumber'],
+		'1.3.6.1.1.1.1.19' => ['ipHostNumber'],
+		'1.3.6.1.1.1.1.20' => ['ipNetworkNumber'],
+		'1.3.6.1.1.1.1.21' => ['ipNetmaskNumber'],
+		'1.3.6.1.1.1.1.22' => ['macAddress'],
+		'1.3.6.1.1.1.1.23' => ['bootParameter'],
+		'1.3.6.1.1.1.1.24' => ['bootFile'],
+		'1.3.6.1.1.1.1.26' => ['nisMapName'],
+		'1.3.6.1.1.1.1.27' => ['nisMapEntry'],
+		'1.3.6.1.1.4' => ['vendorName'],
+		'1.3.6.1.1.5' => ['vendorVersion'],
+		'1.3.6.1.1.16.4' => ['entryUUID'],
+		'1.3.6.1.1.20' => ['entryDN'],
+		'2.5.4.0' => ['objectClass'],
+		'2.5.4.1' => ['aliasedObjectName', 'aliasedEntryName'],
+		'2.5.4.2' => ['knowledgeInformation'],
+		'2.5.4.3' => ['cn', 'commonName'],
+		'2.5.4.4' => ['sn', 'surname'],
+		'2.5.4.5' => ['serialNumber'],
+		'2.5.4.6' => ['c', 'countryName'],
+		'2.5.4.7' => ['l', 'localityName'],
+		'2.5.4.8' => ['st', 'stateOrProvinceName'],
+		'2.5.4.9' => ['street', 'streetAddress'],
+		'2.5.4.10' => ['o', 'organizationName'],
+		'2.5.4.11' => ['ou', 'organizationalUnitName'],
+		'2.5.4.12' => ['title'],
+		'2.5.4.13' => ['description'],
+		'2.5.4.14' => ['searchGuide'],
+		'2.5.4.15' => ['businessCategory'],
+		'2.5.4.16' => ['postalAddress'],
+		'2.5.4.17' => ['postalCode'],
+		'2.5.4.18' => ['postOfficeBox'],
+		'2.5.4.19' => ['physicalDeliveryOfficeName'],
+		'2.5.4.20' => ['telephoneNumber'],
+		'2.5.4.21' => ['telexNumber'],
+		'2.5.4.22' => ['teletexTerminalIdentifier'],
+		'2.5.4.23' => ['facsimileTelephoneNumber', 'fax'],
+		'2.5.4.24' => ['x121Address'],
+		'2.5.4.25' => ['internationaliSDNNumber'],
+		'2.5.4.26' => ['registeredAddress'],
+		'2.5.4.27' => ['destinationIndicator'],
+		'2.5.4.28' => ['preferredDeliveryMethod'],
+		'2.5.4.29' => ['presentationAddress'],
+		'2.5.4.30' => ['supportedApplicationContext'],
+		'2.5.4.31' => ['member'],
+		'2.5.4.32' => ['owner'],
+		'2.5.4.33' => ['roleOccupant'],
+		'2.5.4.34' => ['seeAlso'],
+		'2.5.4.35' => ['userPassword'],
+		'2.5.4.36' => ['userCertificate'],
+		'2.5.4.37' => ['cACertificate'],
+		'2.5.4.38' => ['authorityRevocationList'],
+		'2.5.4.39' => ['certificateRevocationList'],
+		'2.5.4.40' => ['crossCertificatePair'],
+		'2.5.4.41' => ['name'],
+		'2.5.4.42' => ['givenName', 'gn'],
+		'2.5.4.43' => ['initials'],
+		'2.5.4.44' => ['generationQualifier'],
+		'2.5.4.45' => ['x500UniqueIdentifier'],
+		'2.5.4.46' => ['dnQualifier'],
+		'2.5.4.47' => ['enhancedSearchGuide'],
+		'2.5.4.48' => ['protocolInformation'],
+		'2.5.4.49' => ['distinguishedName'],
+		'2.5.4.50' => ['uniqueMember'],
+		'2.5.4.51' => ['houseIdentifier'],
+		'2.5.4.52' => ['supportedAlgorithms'],
+		'2.5.4.53' => ['deltaRevocationList'],
+		'2.5.4.54' => ['dmdName'],
+		'2.5.4.65' => ['pseudonym'],
+		'2.5.18.1' => ['createTimestamp'],
+		'2.5.18.2' => ['modifyTimestamp'],
+		'2.5.18.3' => ['creatorsName'],
+		'2.5.18.4' => ['modifiersName'],
+		'2.5.18.5' => ['administrativeRole'],
+		'2.5.18.6' => ['subtreeSpecification'],
+		'2.5.18.9' => ['hasSubordinates'],
+		'2.5.18.10' => ['subschemaSubentry'],
+		'2.5.21.1' => ['dITStructureRules'],
+		'2.5.21.2' => ['dITContentRules'],
+		'2.5.21.4' => ['matchingRules'],
+		'2.5.21.5' => ['attributeTypes'],
+		'2.5.21.6' => ['objectClasses'],
+		'2.5.21.7' => ['nameForms'],
+		'2.5.21.8' => ['matchingRuleUse'],
+		'2.5.21.9' => ['structuralObjectClass'],
+		'2.16.840.1.113730.3.1.1' => ['carLicense'],
+		'2.16.840.1.113730.3.1.2' => ['departmentNumber'],
+		'2.16.840.1.113730.3.1.3' => ['employeeNumber'],
+		'2.16.840.1.113730.3.1.4' => ['employeeType'],
+		'2.16.840.1.113730.3.1.34' => ['ref'],
+		'2.16.840.1.113730.3.1.39' => ['preferredLanguage'],
+		'2.16.840.1.113730.3.1.40' => ['userSMIMECertificate'],
+		'2.16.840.1.113730.3.1.216' => ['userPKCS12'],
+		'2.16.840.1.113730.3.1.241' => ['displayName'],
+	];
 
-    /**
-     * OID of the attribute.
-     *
-     * @var string
-     */
-    protected $_oid;
+	/**
+	 * OID of the attribute.
+	 *
+	 * @var string
+	 */
+	protected $_oid;
 
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param ObjectIdentifier $oi
-     *
-     * @return self
-     */
-    public static function fromASN1(ObjectIdentifier $oi): self
-    {
-        return new self($oi->oid());
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param ObjectIdentifier $oi
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(ObjectIdentifier $oi): self
+	{
+		return new self($oi->oid());
+	}
 
-    /**
-     * Initialize from attribute name.
-     *
-     * @param string $name
-     *
-     * @return self
-     */
-    public static function fromName(string $name): self
-    {
-        $oid = self::attrNameToOID($name);
-        return new self($oid);
-    }
+	/**
+	 * Initialize from attribute name.
+	 *
+	 * @param string $name
+	 *
+	 * @return self
+	 */
+	public static function fromName(string $name): self
+	{
+		$oid = self::attrNameToOID($name);
+		return new self($oid);
+	}
 
-    /**
-     * Get OID of the attribute.
-     *
-     * @return string OID in dotted format
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get OID of the attribute.
+	 *
+	 * @return string OID in dotted format
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
 
-    /**
-     * Get name of the attribute.
-     *
-     * @return string
-     */
-    public function typeName(): string
-    {
-        if (array_key_exists($this->_oid, self::MAP_OID_TO_NAME)) {
-            return self::MAP_OID_TO_NAME[$this->_oid][0];
-        }
-        return $this->_oid;
-    }
+	/**
+	 * Get name of the attribute.
+	 *
+	 * @return string
+	 */
+	public function typeName(): string
+	{
+		if (array_key_exists($this->_oid, self::MAP_OID_TO_NAME)) {
+			return self::MAP_OID_TO_NAME[$this->_oid][0];
+		}
+		return $this->_oid;
+	}
 
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return ObjectIdentifier
-     */
-    public function toASN1(): ObjectIdentifier
-    {
-        return new ObjectIdentifier($this->_oid);
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return ObjectIdentifier
+	 */
+	public function toASN1(): ObjectIdentifier
+	{
+		return new ObjectIdentifier($this->_oid);
+	}
 
-    /**
-     * Convert attribute name to OID.
-     *
-     * @param string $name Primary attribute name or an alias
-     *
-     * @throws \OutOfBoundsException
-     *
-     * @return string OID in dotted format
-     */
-    public static function attrNameToOID(string $name): string
-    {
-        // if already in OID form
-        if (preg_match('/^[0-9]+(?:\.[0-9]+)*$/', $name)) {
-            return $name;
-        }
-        $map = self::_oidReverseMap();
-        $k = strtolower($name);
-        if (!isset($map[$k])) {
-            throw new \OutOfBoundsException("No OID for {$name}.");
-        }
-        return $map[$k];
-    }
+	/**
+	 * Convert attribute name to OID.
+	 *
+	 * @param string $name Primary attribute name or an alias
+	 *
+	 * @throws \OutOfBoundsException
+	 *
+	 * @return string OID in dotted format
+	 */
+	public static function attrNameToOID(string $name): string
+	{
+		// if already in OID form
+		if (preg_match('/^[0-9]+(?:\.[0-9]+)*$/', $name)) {
+			return $name;
+		}
+		$map = self::_oidReverseMap();
+		$k = strtolower($name);
+		if (!isset($map[$k])) {
+			throw new \OutOfBoundsException("No OID for {$name}.");
+		}
+		return $map[$k];
+	}
 
-    /**
-     * Get ASN.1 string for given attribute type.
-     *
-     * @param string $oid Attribute OID
-     * @param string $str String
-     *
-     * @throws \LogicException
-     *
-     * @return StringType
-     */
-    public static function asn1StringForType(string $oid, string $str): StringType
-    {
-        if (!array_key_exists($oid, self::MAP_ATTR_TO_STR_TYPE)) {
-            return new UTF8String($str);
-        }
-        switch (self::MAP_ATTR_TO_STR_TYPE[$oid]) {
-            case Element::TYPE_PRINTABLE_STRING:
-                return new PrintableString($str);
-            // @codeCoverageIgnoreStart
-            default:
-                // only reachable during development
-                throw new \LogicException();
-        }
-        // @codeCoverageIgnoreEnd
-    }
+	/**
+	 * Get ASN.1 string for given attribute type.
+	 *
+	 * @param string $oid Attribute OID
+	 * @param string $str String
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return StringType
+	 */
+	public static function asn1StringForType(string $oid, string $str): StringType
+	{
+		if (!array_key_exists($oid, self::MAP_ATTR_TO_STR_TYPE)) {
+			return new UTF8String($str);
+		}
+		switch (self::MAP_ATTR_TO_STR_TYPE[$oid]) {
+			case Element::TYPE_PRINTABLE_STRING:
+				return new PrintableString($str);
+			// @codeCoverageIgnoreStart
+			default:
+				// only reachable during development
+				throw new \LogicException();
+		}
+		// @codeCoverageIgnoreEnd
+	}
 
-    /**
-     * Get name to OID lookup map.
-     *
-     * @return array
-     */
-    private static function _oidReverseMap(): array
-    {
-        static $map;
-        if (!isset($map)) {
-            $map = [];
-            // for each attribute type
-            foreach (self::MAP_OID_TO_NAME as $oid => $names) {
-                // for primary name and aliases
-                foreach ($names as $name) {
-                    $map[strtolower($name)] = $oid;
-                }
-            }
-        }
-        return $map;
-    }
+	/**
+	 * Get name to OID lookup map.
+	 *
+	 * @return array
+	 */
+	private static function _oidReverseMap(): array
+	{
+		static $map;
+		if (!isset($map)) {
+			$map = [];
+			// for each attribute type
+			foreach (self::MAP_OID_TO_NAME as $oid => $names) {
+				// for primary name and aliases
+				foreach ($names as $name) {
+					$map[strtolower($name)] = $oid;
+				}
+			}
+		}
+		return $map;
+	}
 }

lib/X501/ASN1/AttributeValue/Feature/DirectoryString.php

Indentation +152 added lines, -152 removed lines

@@ -24,156 +24,156 @@
  */
 abstract class DirectoryString extends AttributeValue
 {
-    /**
-     * Teletex string syntax.
-     *
-     * @var int
-     */
-    const TELETEX = Element::TYPE_T61_STRING;
-
-    /**
-     * Printable string syntax.
-     *
-     * @var int
-     */
-    const PRINTABLE = Element::TYPE_PRINTABLE_STRING;
-
-    /**
-     * BMP string syntax.
-     *
-     * @var int
-     */
-    const BMP = Element::TYPE_BMP_STRING;
-
-    /**
-     * Universal string syntax.
-     *
-     * @var int
-     */
-    const UNIVERSAL = Element::TYPE_UNIVERSAL_STRING;
-
-    /**
-     * UTF-8 string syntax.
-     *
-     * @var int
-     */
-    const UTF8 = Element::TYPE_UTF8_STRING;
-
-    /**
-     * Mapping from syntax enumeration to ASN.1 class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_TAG_TO_CLASS = [
-        self::TELETEX => T61String::class,
-        self::PRINTABLE => PrintableString::class,
-        self::UNIVERSAL => UniversalString::class,
-        self::UTF8 => UTF8String::class,
-        self::BMP => BMPString::class,
-    ];
-
-    /**
-     * ASN.1 type tag for the chosen syntax.
-     *
-     * @var int
-     */
-    protected $_stringTag;
-
-    /**
-     * String value.
-     *
-     * @var string
-     */
-    protected $_string;
-
-    /**
-     * Constructor.
-     *
-     * @param string $value      String value
-     * @param int    $string_tag Syntax choice
-     */
-    public function __construct(string $value, int $string_tag)
-    {
-        $this->_string = $value;
-        $this->_stringTag = $string_tag;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el): AttributeValue
-    {
-        $tag = $el->tag();
-        self::_tagToASN1Class($tag);
-        return new static($el->asString()->string(), $tag);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function toASN1(): Element
-    {
-        $cls = self::_tagToASN1Class($this->_stringTag);
-        return new $cls($this->_string);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function stringValue(): string
-    {
-        return $this->_string;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function equalityMatchingRule(): MatchingRule
-    {
-        return new CaseIgnoreMatch($this->_stringTag);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function rfc2253String(): string
-    {
-        // TeletexString is encoded as binary
-        if (self::TELETEX === $this->_stringTag) {
-            return $this->_transcodedString();
-        }
-        return DNParser::escapeString($this->_transcodedString());
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function _transcodedString(): string
-    {
-        $step = new TranscodeStep($this->_stringTag);
-        return $step->apply($this->_string);
-    }
-
-    /**
-     * Get ASN.1 class name for given DirectoryString type tag.
-     *
-     * @param int $tag
-     *
-     * @throws \UnexpectedValueException
-     *
-     * @return string
-     */
-    private static function _tagToASN1Class(int $tag): string
-    {
-        if (!array_key_exists($tag, self::MAP_TAG_TO_CLASS)) {
-            throw new \UnexpectedValueException(
-                'Type ' . Element::tagToName($tag) .
-                ' is not valid DirectoryString.');
-        }
-        return self::MAP_TAG_TO_CLASS[$tag];
-    }
+	/**
+	 * Teletex string syntax.
+	 *
+	 * @var int
+	 */
+	const TELETEX = Element::TYPE_T61_STRING;
+
+	/**
+	 * Printable string syntax.
+	 *
+	 * @var int
+	 */
+	const PRINTABLE = Element::TYPE_PRINTABLE_STRING;
+
+	/**
+	 * BMP string syntax.
+	 *
+	 * @var int
+	 */
+	const BMP = Element::TYPE_BMP_STRING;
+
+	/**
+	 * Universal string syntax.
+	 *
+	 * @var int
+	 */
+	const UNIVERSAL = Element::TYPE_UNIVERSAL_STRING;
+
+	/**
+	 * UTF-8 string syntax.
+	 *
+	 * @var int
+	 */
+	const UTF8 = Element::TYPE_UTF8_STRING;
+
+	/**
+	 * Mapping from syntax enumeration to ASN.1 class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_TAG_TO_CLASS = [
+		self::TELETEX => T61String::class,
+		self::PRINTABLE => PrintableString::class,
+		self::UNIVERSAL => UniversalString::class,
+		self::UTF8 => UTF8String::class,
+		self::BMP => BMPString::class,
+	];
+
+	/**
+	 * ASN.1 type tag for the chosen syntax.
+	 *
+	 * @var int
+	 */
+	protected $_stringTag;
+
+	/**
+	 * String value.
+	 *
+	 * @var string
+	 */
+	protected $_string;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $value      String value
+	 * @param int    $string_tag Syntax choice
+	 */
+	public function __construct(string $value, int $string_tag)
+	{
+		$this->_string = $value;
+		$this->_stringTag = $string_tag;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el): AttributeValue
+	{
+		$tag = $el->tag();
+		self::_tagToASN1Class($tag);
+		return new static($el->asString()->string(), $tag);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function toASN1(): Element
+	{
+		$cls = self::_tagToASN1Class($this->_stringTag);
+		return new $cls($this->_string);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function stringValue(): string
+	{
+		return $this->_string;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function equalityMatchingRule(): MatchingRule
+	{
+		return new CaseIgnoreMatch($this->_stringTag);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function rfc2253String(): string
+	{
+		// TeletexString is encoded as binary
+		if (self::TELETEX === $this->_stringTag) {
+			return $this->_transcodedString();
+		}
+		return DNParser::escapeString($this->_transcodedString());
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function _transcodedString(): string
+	{
+		$step = new TranscodeStep($this->_stringTag);
+		return $step->apply($this->_string);
+	}
+
+	/**
+	 * Get ASN.1 class name for given DirectoryString type tag.
+	 *
+	 * @param int $tag
+	 *
+	 * @throws \UnexpectedValueException
+	 *
+	 * @return string
+	 */
+	private static function _tagToASN1Class(int $tag): string
+	{
+		if (!array_key_exists($tag, self::MAP_TAG_TO_CLASS)) {
+			throw new \UnexpectedValueException(
+				'Type ' . Element::tagToName($tag) .
+				' is not valid DirectoryString.');
+		}
+		return self::MAP_TAG_TO_CLASS[$tag];
+	}
 }

lib/X501/ASN1/Attribute.php

Indentation +147 added lines, -147 removed lines

@@ -17,161 +17,161 @@
  */
 class Attribute implements \Countable, \IteratorAggregate
 {
-    use TypedAttribute;
+	use TypedAttribute;
 
-    /**
-     * Attribute values.
-     *
-     * @var AttributeValue[]
-     */
-    protected $_values;
+	/**
+	 * Attribute values.
+	 *
+	 * @var AttributeValue[]
+	 */
+	protected $_values;
 
-    /**
-     * Constructor.
-     *
-     * @param AttributeType  $type      Attribute type
-     * @param AttributeValue ...$values Attribute values
-     */
-    public function __construct(AttributeType $type, AttributeValue ...$values)
-    {
-        // check that attribute values have correct oid
-        array_walk($values,
-            function (AttributeValue $value) use ($type) {
-                if ($value->oid() !== $type->oid()) {
-                    throw new \LogicException('Attribute OID mismatch.');
-                }
-            });
-        $this->_type = $type;
-        $this->_values = $values;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeType  $type      Attribute type
+	 * @param AttributeValue ...$values Attribute values
+	 */
+	public function __construct(AttributeType $type, AttributeValue ...$values)
+	{
+		// check that attribute values have correct oid
+		array_walk($values,
+			function (AttributeValue $value) use ($type) {
+				if ($value->oid() !== $type->oid()) {
+					throw new \LogicException('Attribute OID mismatch.');
+				}
+			});
+		$this->_type = $type;
+		$this->_values = $values;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
-        $values = array_map(
-            function (UnspecifiedType $el) use ($type) {
-                return AttributeValue::fromASN1ByOID($type->oid(), $el);
-            }, $seq->at(1)->asSet()->elements());
-        return new self($type, ...$values);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
+		$values = array_map(
+			function (UnspecifiedType $el) use ($type) {
+				return AttributeValue::fromASN1ByOID($type->oid(), $el);
+			}, $seq->at(1)->asSet()->elements());
+		return new self($type, ...$values);
+	}
 
-    /**
-     * Convenience method to initialize from attribute values.
-     *
-     * @param AttributeValue ...$values One or more values
-     *
-     * @throws \LogicException
-     *
-     * @return self
-     */
-    public static function fromAttributeValues(AttributeValue ...$values): self
-    {
-        // we need at least one value to determine OID
-        if (!count($values)) {
-            throw new \LogicException('No values.');
-        }
-        $oid = reset($values)->oid();
-        return new self(new AttributeType($oid), ...$values);
-    }
+	/**
+	 * Convenience method to initialize from attribute values.
+	 *
+	 * @param AttributeValue ...$values One or more values
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return self
+	 */
+	public static function fromAttributeValues(AttributeValue ...$values): self
+	{
+		// we need at least one value to determine OID
+		if (!count($values)) {
+			throw new \LogicException('No values.');
+		}
+		$oid = reset($values)->oid();
+		return new self(new AttributeType($oid), ...$values);
+	}
 
-    /**
-     * Get first value of the attribute.
-     *
-     * @throws \LogicException
-     *
-     * @return AttributeValue
-     */
-    public function first(): AttributeValue
-    {
-        if (!count($this->_values)) {
-            throw new \LogicException('Attribute contains no values.');
-        }
-        return $this->_values[0];
-    }
+	/**
+	 * Get first value of the attribute.
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return AttributeValue
+	 */
+	public function first(): AttributeValue
+	{
+		if (!count($this->_values)) {
+			throw new \LogicException('Attribute contains no values.');
+		}
+		return $this->_values[0];
+	}
 
-    /**
-     * Get all values.
-     *
-     * @return AttributeValue[]
-     */
-    public function values(): array
-    {
-        return $this->_values;
-    }
+	/**
+	 * Get all values.
+	 *
+	 * @return AttributeValue[]
+	 */
+	public function values(): array
+	{
+		return $this->_values;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $values = array_map(
-            function (AttributeValue $value) {
-                return $value->toASN1();
-            }, $this->_values);
-        $valueset = new Set(...$values);
-        return new Sequence($this->_type->toASN1(), $valueset->sortedSetOf());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$values = array_map(
+			function (AttributeValue $value) {
+				return $value->toASN1();
+			}, $this->_values);
+		$valueset = new Set(...$values);
+		return new Sequence($this->_type->toASN1(), $valueset->sortedSetOf());
+	}
 
-    /**
-     * Cast attribute values to another AttributeValue class.
-     *
-     * This method is generally used to cast UnknownAttributeValue values
-     * to specific objects when class is declared outside this package.
-     *
-     * The new class must be derived from AttributeValue and have the same OID
-     * as current attribute values.
-     *
-     * @param string $cls AttributeValue class name
-     *
-     * @throws \LogicException
-     *
-     * @return self
-     */
-    public function castValues(string $cls): self
-    {
-        $refl = new \ReflectionClass($cls);
-        if (!$refl->isSubclassOf(AttributeValue::class)) {
-            throw new \LogicException(
-                "{$cls} must be derived from " . AttributeValue::class . '.');
-        }
-        $oid = $this->oid();
-        $values = array_map(
-            function (AttributeValue $value) use ($cls, $oid) {
-                $value = $cls::fromSelf($value);
-                if ($value->oid() !== $oid) {
-                    throw new \LogicException('Attribute OID mismatch.');
-                }
-                return $value;
-            }, $this->_values);
-        return self::fromAttributeValues(...$values);
-    }
+	/**
+	 * Cast attribute values to another AttributeValue class.
+	 *
+	 * This method is generally used to cast UnknownAttributeValue values
+	 * to specific objects when class is declared outside this package.
+	 *
+	 * The new class must be derived from AttributeValue and have the same OID
+	 * as current attribute values.
+	 *
+	 * @param string $cls AttributeValue class name
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return self
+	 */
+	public function castValues(string $cls): self
+	{
+		$refl = new \ReflectionClass($cls);
+		if (!$refl->isSubclassOf(AttributeValue::class)) {
+			throw new \LogicException(
+				"{$cls} must be derived from " . AttributeValue::class . '.');
+		}
+		$oid = $this->oid();
+		$values = array_map(
+			function (AttributeValue $value) use ($cls, $oid) {
+				$value = $cls::fromSelf($value);
+				if ($value->oid() !== $oid) {
+					throw new \LogicException('Attribute OID mismatch.');
+				}
+				return $value;
+			}, $this->_values);
+		return self::fromAttributeValues(...$values);
+	}
 
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_values);
-    }
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_values);
+	}
 
-    /**
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_values);
-    }
+	/**
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_values);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\ASN1;
 
@@ -36,7 +36,7 @@ 
     {
         // check that attribute values have correct oid
         array_walk($values,
-            function (AttributeValue $value) use ($type) {
+            function(AttributeValue $value) use ($type) {
                 if ($value->oid() !== $type->oid()) {
                     throw new \LogicException('Attribute OID mismatch.');
                 }
@@ -56,7 +56,7 @@ 
     {
         $type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
         $values = array_map(
-            function (UnspecifiedType $el) use ($type) {
+            function(UnspecifiedType $el) use ($type) {
                 return AttributeValue::fromASN1ByOID($type->oid(), $el);
             }, $seq->at(1)->asSet()->elements());
         return new self($type, ...$values);
@@ -114,7 +114,7 @@ 
     public function toASN1(): Sequence
     {
         $values = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return $value->toASN1();
             }, $this->_values);
         $valueset = new Set(...$values);
@@ -145,7 +145,7 @@ 
         }
         $oid = $this->oid();
         $values = array_map(
-            function (AttributeValue $value) use ($cls, $oid) {
+            function(AttributeValue $value) use ($cls, $oid) {
                 $value = $cls::fromSelf($value);
                 if ($value->oid() !== $oid) {
                     throw new \LogicException('Attribute OID mismatch.');

lib/X501/MatchingRule/StringPrepMatchingRule.php

Indentation +24 added lines, -24 removed lines

@@ -11,30 +11,30 @@
  */
 abstract class StringPrepMatchingRule extends MatchingRule
 {
-    /**
-     * String preparer.
-     *
-     * @var StringPreparer
-     */
-    protected $_prep;
+	/**
+	 * String preparer.
+	 *
+	 * @var StringPreparer
+	 */
+	protected $_prep;
 
-    /**
-     * Constructor.
-     *
-     * @param StringPreparer $preparer
-     */
-    public function __construct(StringPreparer $preparer)
-    {
-        $this->_prep = $preparer;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param StringPreparer $preparer
+	 */
+	public function __construct(StringPreparer $preparer)
+	{
+		$this->_prep = $preparer;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function compare($assertion, $value): ?bool
-    {
-        $assertion = $this->_prep->prepare($assertion);
-        $value = $this->_prep->prepare($value);
-        return 0 === strcmp($assertion, $value);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value): ?bool
+	{
+		$assertion = $this->_prep->prepare($assertion);
+		$value = $this->_prep->prepare($value);
+		return 0 === strcmp($assertion, $value);
+	}
 }

lib/X501/MatchingRule/BinaryMatch.php

Indentation +7 added lines, -7 removed lines

@@ -11,11 +11,11 @@
  */
 class BinaryMatch extends MatchingRule
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function compare($assertion, $value): ?bool
-    {
-        return 0 === strcmp($assertion, $value);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value): ?bool
+	{
+		return 0 === strcmp($assertion, $value);
+	}
 }