sop / x501

lib/X501/ASN1/AttributeValue/DescriptionValue.php

Indentation +11 added lines, -11 removed lines

@@ -13,15 +13,15 @@
  */
 class DescriptionValue extends DirectoryString
 {
-    /**
-     * Constructor.
-     *
-     * @param string $value String value
-     * @param int $string_tag Syntax choice
-     */
-    public function __construct($value, $string_tag = DirectoryString::UTF8)
-    {
-        $this->_oid = AttributeType::OID_DESCRIPTION;
-        parent::__construct($value, $string_tag);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $value String value
+	 * @param int $string_tag Syntax choice
+	 */
+	public function __construct($value, $string_tag = DirectoryString::UTF8)
+	{
+		$this->_oid = AttributeType::OID_DESCRIPTION;
+		parent::__construct($value, $string_tag);
+	}
 }

lib/X501/ASN1/AttributeValue/SerialNumberValue.php

Indentation +10 added lines, -10 removed lines

@@ -13,14 +13,14 @@
  */
 class SerialNumberValue extends PrintableStringValue
 {
-    /**
-     * Constructor.
-     *
-     * @param string $value String value
-     */
-    public function __construct($value)
-    {
-        $this->_oid = AttributeType::OID_SERIAL_NUMBER;
-        parent::__construct($value);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $value String value
+	 */
+	public function __construct($value)
+	{
+		$this->_oid = AttributeType::OID_SERIAL_NUMBER;
+		parent::__construct($value);
+	}
 }

lib/X501/ASN1/Feature/TypedAttribute.php

Indentation +24 added lines, -24 removed lines

@@ -9,30 +9,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()
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get attribute type.
+	 *
+	 * @return AttributeType
+	 */
+	public function type()
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Get OID of the attribute.
-     *
-     * @return string
-     */
-    public function oid()
-    {
-        return $this->_type->oid();
-    }
+	/**
+	 * Get OID of the attribute.
+	 *
+	 * @return string
+	 */
+	public function oid()
+	{
+		return $this->_type->oid();
+	}
 }

lib/X501/ASN1/AttributeTypeAndValue.php

Indentation +98 added lines, -98 removed lines

@@ -14,111 +14,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)
-    {
-        $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)
+	{
+		$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)
-    {
-        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)
+	{
+		return new self(new AttributeType($value->oid()), $value);
+	}
     
-    /**
-     * Get attribute value.
-     *
-     * @return AttributeValue
-     */
-    public function value()
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get attribute value.
+	 *
+	 * @return AttributeValue
+	 */
+	public function value()
+	{
+		return $this->_value;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        return new Sequence($this->_type->toASN1(), $this->_value->toASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		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()
-    {
-        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()
+	{
+		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)
-    {
-        // 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)
+	{
+		// 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

@@ -14,169 +14,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)
-    {
-        $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)
+	{
+		$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)
-    {
-        $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)
+	{
+		$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()
-    {
-        $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()
+	{
+		$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()
-    {
-        $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()
+	{
+		$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)
-    {
-        // 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)
+	{
+		// 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()
-    {
-        return $this->_attribs;
-    }
+	/**
+	 * Get all AttributeTypeAndValue objects.
+	 *
+	 * @return AttributeTypeAndValue[]
+	 */
+	public function all()
+	{
+		return $this->_attribs;
+	}
     
-    /**
-     * Get all AttributeTypeAndValue objects of the given attribute type.
-     *
-     * @param string $name Attribute OID or name
-     * @return AttributeTypeAndValue[]
-     */
-    public function allOf($name)
-    {
-        $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($name)
+	{
+		$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()
-    {
-        return count($this->_attribs);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_attribs);
+	}
     
-    /**
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_attribs);
-    }
+	/**
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		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

@@ -44,7 +44,7 @@ 
     public static function fromAttributeValues(AttributeValue ...$values)
     {
         $attribs = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return new AttributeTypeAndValue(
                     new AttributeType($value->oid()), $value);
             }, $values);
@@ -60,7 +60,7 @@ 
     public static function fromASN1(Set $set)
     {
         $attribs = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return AttributeTypeAndValue::fromASN1($el->asSequence());
             }, $set->elements());
         return new self(...$attribs);
@@ -74,7 +74,7 @@ 
     public function toASN1()
     {
         $elements = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toASN1();
             }, $this->_attribs);
         $set = new Set(...$elements);
@@ -90,7 +90,7 @@ 
     public function toString()
     {
         $parts = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toString();
             }, $this->_attribs);
         return implode("+", $parts);
@@ -145,7 +145,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 +183 added lines, -183 removed lines

@@ -19,199 +19,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)
-    {
-        $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)
+	{
+		$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($str)
-    {
-        $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($str)
+	{
+		$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()
-    {
-        $elements = array_map(
-            function (RDN $rdn) {
-                return $rdn->toASN1();
-            }, $this->_rdns);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		$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()
-    {
-        $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()
+	{
+		$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)
-    {
-        // 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)
+	{
+		// 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()
-    {
-        return $this->_rdns;
-    }
+	/**
+	 * Get all RDN objects.
+	 *
+	 * @return RDN[]
+	 */
+	public function all()
+	{
+		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($name)
-    {
-        $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($name)
+	{
+		$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()
-    {
-        return count($this->_rdns);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_rdns);
+	}
     
-    /**
-     * Get the number of attributes of given type.
-     *
-     * @param string $name Attribute OID or name
-     * @return int
-     */
-    public function countOfType($name)
-    {
-        $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($name)
+	{
+		$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()
-    {
-        return new \ArrayIterator($this->_rdns);
-    }
+	/**
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		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

@@ -45,7 +45,7 @@ 
     public static function fromASN1(Sequence $seq)
     {
         $rdns = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return RDN::fromASN1($el->asSet());
             }, $seq->elements());
         return new self(...$rdns);
@@ -88,7 +88,7 @@ 
     public function toASN1()
     {
         $elements = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toASN1();
             }, $this->_rdns);
         return new Sequence(...$elements);
@@ -103,7 +103,7 @@ 
     public function toString()
     {
         $parts = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toString();
             }, array_reverse($this->_rdns));
         return implode(",", $parts);
@@ -191,7 +191,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/Attribute.php

Indentation +143 added lines, -143 removed lines

@@ -16,157 +16,157 @@
  */
 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)
-    {
-        $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)
+	{
+		$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)
-    {
-        // 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)
+	{
+		// 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()
-    {
-        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()
+	{
+		if (!count($this->_values)) {
+			throw new \LogicException("Attribute contains no values.");
+		}
+		return $this->_values[0];
+	}
     
-    /**
-     * Get all values.
-     *
-     * @return AttributeValue[]
-     */
-    public function values()
-    {
-        return $this->_values;
-    }
+	/**
+	 * Get all values.
+	 *
+	 * @return AttributeValue[]
+	 */
+	public function values()
+	{
+		return $this->_values;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        $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()
+	{
+		$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($cls)
-    {
-        $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($cls)
+	{
+		$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()
-    {
-        return count($this->_values);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->_values);
+	}
     
-    /**
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator()
-    {
-        return new \ArrayIterator($this->_values);
-    }
+	/**
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->_values);
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -35,7 +35,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.");
                 }
@@ -54,7 +54,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()
@@ -111,7 +111,7 @@ 
     public function toASN1()
     {
         $values = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return $value->toASN1();
             }, $this->_values);
         $valueset = new Set(...$values);
@@ -140,7 +140,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.");