sop / x509

lib/X509/CertificationRequest/CertificationRequest.php

Indentation +154 added lines, -154 removed lines

@@ -18,172 +18,172 @@
  */
 class CertificationRequest
 {
-    /**
-     * Certification request info.
-     *
-     * @var CertificationRequestInfo $_certificationRequestInfo
-     */
-    protected $_certificationRequestInfo;
+	/**
+	 * Certification request info.
+	 *
+	 * @var CertificationRequestInfo $_certificationRequestInfo
+	 */
+	protected $_certificationRequestInfo;
     
-    /**
-     * Signature algorithm.
-     *
-     * @var SignatureAlgorithmIdentifier $_signatureAlgorithm
-     */
-    protected $_signatureAlgorithm;
+	/**
+	 * Signature algorithm.
+	 *
+	 * @var SignatureAlgorithmIdentifier $_signatureAlgorithm
+	 */
+	protected $_signatureAlgorithm;
     
-    /**
-     * Signature.
-     *
-     * @var Signature $_signature
-     */
-    protected $_signature;
+	/**
+	 * Signature.
+	 *
+	 * @var Signature $_signature
+	 */
+	protected $_signature;
     
-    /**
-     * Constructor.
-     *
-     * @param CertificationRequestInfo $info
-     * @param SignatureAlgorithmIdentifier $algo
-     * @param Signature $signature
-     */
-    public function __construct(CertificationRequestInfo $info,
-        SignatureAlgorithmIdentifier $algo, Signature $signature)
-    {
-        $this->_certificationRequestInfo = $info;
-        $this->_signatureAlgorithm = $algo;
-        $this->_signature = $signature;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param CertificationRequestInfo $info
+	 * @param SignatureAlgorithmIdentifier $algo
+	 * @param Signature $signature
+	 */
+	public function __construct(CertificationRequestInfo $info,
+		SignatureAlgorithmIdentifier $algo, Signature $signature)
+	{
+		$this->_certificationRequestInfo = $info;
+		$this->_signatureAlgorithm = $algo;
+		$this->_signature = $signature;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $info = CertificationRequestInfo::fromASN1($seq->at(0)->asSequence());
-        $algo = AlgorithmIdentifier::fromASN1($seq->at(1)->asSequence());
-        if (!$algo instanceof SignatureAlgorithmIdentifier) {
-            throw new \UnexpectedValueException(
-                "Unsupported signature algorithm " . $algo->oid() . ".");
-        }
-        $signature = Signature::fromSignatureData(
-            $seq->at(2)
-                ->asBitString()
-                ->string(), $algo);
-        return new self($info, $algo, $signature);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$info = CertificationRequestInfo::fromASN1($seq->at(0)->asSequence());
+		$algo = AlgorithmIdentifier::fromASN1($seq->at(1)->asSequence());
+		if (!$algo instanceof SignatureAlgorithmIdentifier) {
+			throw new \UnexpectedValueException(
+				"Unsupported signature algorithm " . $algo->oid() . ".");
+		}
+		$signature = Signature::fromSignatureData(
+			$seq->at(2)
+				->asBitString()
+				->string(), $algo);
+		return new self($info, $algo, $signature);
+	}
     
-    /**
-     * Initialize from DER.
-     *
-     * @param string $data
-     * @return self
-     */
-    public static function fromDER(string $data): self
-    {
-        return self::fromASN1(Sequence::fromDER($data));
-    }
+	/**
+	 * Initialize from DER.
+	 *
+	 * @param string $data
+	 * @return self
+	 */
+	public static function fromDER(string $data): self
+	{
+		return self::fromASN1(Sequence::fromDER($data));
+	}
     
-    /**
-     * Initialize from PEM.
-     *
-     * @param PEM $pem
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromPEM(PEM $pem): self
-    {
-        if ($pem->type() !== PEM::TYPE_CERTIFICATE_REQUEST) {
-            throw new \UnexpectedValueException("Invalid PEM type.");
-        }
-        return self::fromDER($pem->data());
-    }
+	/**
+	 * Initialize from PEM.
+	 *
+	 * @param PEM $pem
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromPEM(PEM $pem): self
+	{
+		if ($pem->type() !== PEM::TYPE_CERTIFICATE_REQUEST) {
+			throw new \UnexpectedValueException("Invalid PEM type.");
+		}
+		return self::fromDER($pem->data());
+	}
     
-    /**
-     * Get certification request info.
-     *
-     * @return CertificationRequestInfo
-     */
-    public function certificationRequestInfo(): CertificationRequestInfo
-    {
-        return $this->_certificationRequestInfo;
-    }
+	/**
+	 * Get certification request info.
+	 *
+	 * @return CertificationRequestInfo
+	 */
+	public function certificationRequestInfo(): CertificationRequestInfo
+	{
+		return $this->_certificationRequestInfo;
+	}
     
-    /**
-     * Get signature algorithm.
-     *
-     * @return SignatureAlgorithmIdentifier
-     */
-    public function signatureAlgorithm(): SignatureAlgorithmIdentifier
-    {
-        return $this->_signatureAlgorithm;
-    }
+	/**
+	 * Get signature algorithm.
+	 *
+	 * @return SignatureAlgorithmIdentifier
+	 */
+	public function signatureAlgorithm(): SignatureAlgorithmIdentifier
+	{
+		return $this->_signatureAlgorithm;
+	}
     
-    /**
-     * Get signature.
-     *
-     * @return Signature
-     */
-    public function signature(): Signature
-    {
-        return $this->_signature;
-    }
+	/**
+	 * Get signature.
+	 *
+	 * @return Signature
+	 */
+	public function signature(): Signature
+	{
+		return $this->_signature;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence($this->_certificationRequestInfo->toASN1(),
-            $this->_signatureAlgorithm->toASN1(), $this->_signature->bitString());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence($this->_certificationRequestInfo->toASN1(),
+			$this->_signatureAlgorithm->toASN1(), $this->_signature->bitString());
+	}
     
-    /**
-     * Get certification request as a DER.
-     *
-     * @return string
-     */
-    public function toDER(): string
-    {
-        return $this->toASN1()->toDER();
-    }
+	/**
+	 * Get certification request as a DER.
+	 *
+	 * @return string
+	 */
+	public function toDER(): string
+	{
+		return $this->toASN1()->toDER();
+	}
     
-    /**
-     * Get certification request as a PEM.
-     *
-     * @return PEM
-     */
-    public function toPEM(): PEM
-    {
-        return new PEM(PEM::TYPE_CERTIFICATE_REQUEST, $this->toDER());
-    }
+	/**
+	 * Get certification request as a PEM.
+	 *
+	 * @return PEM
+	 */
+	public function toPEM(): PEM
+	{
+		return new PEM(PEM::TYPE_CERTIFICATE_REQUEST, $this->toDER());
+	}
     
-    /**
-     * Verify certification request signature.
-     *
-     * @param Crypto|null $crypto Crypto engine, use default if not set
-     * @return bool True if signature matches
-     */
-    public function verify(Crypto $crypto = null): bool
-    {
-        $crypto = $crypto ?: Crypto::getDefault();
-        $data = $this->_certificationRequestInfo->toASN1()->toDER();
-        $pk_info = $this->_certificationRequestInfo->subjectPKInfo();
-        return $crypto->verify($data, $this->_signature, $pk_info,
-            $this->_signatureAlgorithm);
-    }
+	/**
+	 * Verify certification request signature.
+	 *
+	 * @param Crypto|null $crypto Crypto engine, use default if not set
+	 * @return bool True if signature matches
+	 */
+	public function verify(Crypto $crypto = null): bool
+	{
+		$crypto = $crypto ?: Crypto::getDefault();
+		$data = $this->_certificationRequestInfo->toASN1()->toDER();
+		$pk_info = $this->_certificationRequestInfo->subjectPKInfo();
+		return $crypto->verify($data, $this->_signature, $pk_info,
+			$this->_signatureAlgorithm);
+	}
     
-    /**
-     * Get certification request as a PEM formatted string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toPEM()->string();
-    }
+	/**
+	 * Get certification request as a PEM formatted string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toPEM()->string();
+	}
 }

lib/X509/CertificationRequest/Attribute/ExtensionRequestValue.php

Indentation +81 added lines, -81 removed lines

@@ -17,94 +17,94 @@
  */
 class ExtensionRequestValue extends AttributeValue
 {
-    const OID = "1.2.840.113549.1.9.14";
+	const OID = "1.2.840.113549.1.9.14";
     
-    /**
-     * Extensions.
-     *
-     * @var Extensions $_extensions
-     */
-    protected $_extensions;
+	/**
+	 * Extensions.
+	 *
+	 * @var Extensions $_extensions
+	 */
+	protected $_extensions;
     
-    /**
-     * Constructor.
-     *
-     * @param Extensions $extensions
-     */
-    public function __construct(Extensions $extensions)
-    {
-        $this->_extensions = $extensions;
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Extensions $extensions
+	 */
+	public function __construct(Extensions $extensions)
+	{
+		$this->_extensions = $extensions;
+		$this->_oid = self::OID;
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::fromASN1()
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el): self
-    {
-        return new self(Extensions::fromASN1($el->asSequence()));
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::fromASN1()
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el): self
+	{
+		return new self(Extensions::fromASN1($el->asSequence()));
+	}
     
-    /**
-     * Get requested extensions.
-     *
-     * @return Extensions
-     */
-    public function extensions(): Extensions
-    {
-        return $this->_extensions;
-    }
+	/**
+	 * Get requested extensions.
+	 *
+	 * @return Extensions
+	 */
+	public function extensions(): Extensions
+	{
+		return $this->_extensions;
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return $this->_extensions->toASN1();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return $this->_extensions->toASN1();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
-     * @return string
-     */
-    public function stringValue(): string
-    {
-        return "#" . bin2hex($this->toASN1()->toDER());
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::stringValue()
+	 * @return string
+	 */
+	public function stringValue(): string
+	{
+		return "#" . bin2hex($this->toASN1()->toDER());
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
-     * @return BinaryMatch
-     */
-    public function equalityMatchingRule(): BinaryMatch
-    {
-        return new BinaryMatch();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::equalityMatchingRule()
+	 * @return BinaryMatch
+	 */
+	public function equalityMatchingRule(): BinaryMatch
+	{
+		return new BinaryMatch();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
-     * @return string
-     */
-    public function rfc2253String(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::rfc2253String()
+	 * @return string
+	 */
+	public function rfc2253String(): string
+	{
+		return $this->stringValue();
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
-     * @return string
-     */
-    protected function _transcodedString(): string
-    {
-        return $this->stringValue();
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::_transcodedString()
+	 * @return string
+	 */
+	protected function _transcodedString(): string
+	{
+		return $this->stringValue();
+	}
 }

lib/X509/CertificationRequest/Attributes.php

Indentation +96 added lines, -96 removed lines

@@ -20,107 +20,107 @@
  */
 class Attributes implements \Countable, \IteratorAggregate
 {
-    use AttributeContainer;
+	use AttributeContainer;
     
-    /**
-     * Mapping from OID to attribute value class name.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_CLASS = array(
-        /* @formatter:off */
-        ExtensionRequestValue::OID => ExtensionRequestValue::class
-        /* @formatter:on */
-    );
+	/**
+	 * Mapping from OID to attribute value class name.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_CLASS = array(
+		/* @formatter:off */
+		ExtensionRequestValue::OID => ExtensionRequestValue::class
+		/* @formatter:on */
+	);
     
-    /**
-     * Constructor.
-     *
-     * @param Attribute ...$attribs Attribute objects
-     */
-    public function __construct(Attribute ...$attribs)
-    {
-        $this->_attributes = $attribs;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Attribute ...$attribs Attribute objects
+	 */
+	public function __construct(Attribute ...$attribs)
+	{
+		$this->_attributes = $attribs;
+	}
     
-    /**
-     * Initialize from attribute values.
-     *
-     * @param AttributeValue ...$values
-     * @return self
-     */
-    public static function fromAttributeValues(AttributeValue ...$values): self
-    {
-        $attribs = array_map(
-            function (AttributeValue $value) {
-                return $value->toAttribute();
-            }, $values);
-        return new self(...$attribs);
-    }
+	/**
+	 * Initialize from attribute values.
+	 *
+	 * @param AttributeValue ...$values
+	 * @return self
+	 */
+	public static function fromAttributeValues(AttributeValue ...$values): self
+	{
+		$attribs = array_map(
+			function (AttributeValue $value) {
+				return $value->toAttribute();
+			}, $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 Attribute::fromASN1($el->asSequence());
-            }, $set->elements());
-        // cast attributes
-        $attribs = array_map(
-            function (Attribute $attr) {
-                $oid = $attr->oid();
-                if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) {
-                    $cls = self::MAP_OID_TO_CLASS[$oid];
-                    return $attr->castValues($cls);
-                }
-                return $attr;
-            }, $attribs);
-        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 Attribute::fromASN1($el->asSequence());
+			}, $set->elements());
+		// cast attributes
+		$attribs = array_map(
+			function (Attribute $attr) {
+				$oid = $attr->oid();
+				if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) {
+					$cls = self::MAP_OID_TO_CLASS[$oid];
+					return $attr->castValues($cls);
+				}
+				return $attr;
+			}, $attribs);
+		return new self(...$attribs);
+	}
     
-    /**
-     * Check whether extension request attribute is present.
-     *
-     * @return bool
-     */
-    public function hasExtensionRequest(): bool
-    {
-        return $this->has(ExtensionRequestValue::OID);
-    }
+	/**
+	 * Check whether extension request attribute is present.
+	 *
+	 * @return bool
+	 */
+	public function hasExtensionRequest(): bool
+	{
+		return $this->has(ExtensionRequestValue::OID);
+	}
     
-    /**
-     * Get extension request attribute value.
-     *
-     * @throws \LogicException
-     * @return ExtensionRequestValue
-     */
-    public function extensionRequest(): ExtensionRequestValue
-    {
-        if (!$this->hasExtensionRequest()) {
-            throw new \LogicException("No extension request attribute.");
-        }
-        return $this->firstOf(ExtensionRequestValue::OID)->first();
-    }
+	/**
+	 * Get extension request attribute value.
+	 *
+	 * @throws \LogicException
+	 * @return ExtensionRequestValue
+	 */
+	public function extensionRequest(): ExtensionRequestValue
+	{
+		if (!$this->hasExtensionRequest()) {
+			throw new \LogicException("No extension request attribute.");
+		}
+		return $this->firstOf(ExtensionRequestValue::OID)->first();
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Set
-     */
-    public function toASN1(): Set
-    {
-        $elements = array_map(
-            function (Attribute $attr) {
-                return $attr->toASN1();
-            }, array_values($this->_attributes));
-        $set = new Set(...$elements);
-        return $set->sortedSetOf();
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Set
+	 */
+	public function toASN1(): Set
+	{
+		$elements = array_map(
+			function (Attribute $attr) {
+				return $attr->toASN1();
+			}, array_values($this->_attributes));
+		$set = new Set(...$elements);
+		return $set->sortedSetOf();
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -54,7 +54,7 @@ 
     public static function fromAttributeValues(AttributeValue ...$values): self
     {
         $attribs = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return $value->toAttribute();
             }, $values);
         return new self(...$attribs);
@@ -69,12 +69,12 @@ 
     public static function fromASN1(Set $set): self
     {
         $attribs = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return Attribute::fromASN1($el->asSequence());
             }, $set->elements());
         // cast attributes
         $attribs = array_map(
-            function (Attribute $attr) {
+            function(Attribute $attr) {
                 $oid = $attr->oid();
                 if (array_key_exists($oid, self::MAP_OID_TO_CLASS)) {
                     $cls = self::MAP_OID_TO_CLASS[$oid];
@@ -117,7 +117,7 @@ 
     public function toASN1(): Set
     {
         $elements = array_map(
-            function (Attribute $attr) {
+            function(Attribute $attr) {
                 return $attr->toASN1();
             }, array_values($this->_attributes));
         $set = new Set(...$elements);

lib/X509/Feature/AttributeContainer.php

Indentation +123 added lines, -123 removed lines

@@ -14,136 +14,136 @@
  */
 trait AttributeContainer
 {
-    /**
-     * Array of attributes.
-     *
-     * @var Attribute[] $_attributes
-     */
-    protected $_attributes;
+	/**
+	 * Array of attributes.
+	 *
+	 * @var Attribute[] $_attributes
+	 */
+	protected $_attributes;
     
-    /**
-     * Find first attribute of given name or OID.
-     *
-     * @param string $name
-     * @return Attribute|null
-     */
-    protected function _findFirst(string $name)
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        foreach ($this->_attributes as $attr) {
-            if ($attr->oid() == $oid) {
-                return $attr;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Find first attribute of given name or OID.
+	 *
+	 * @param string $name
+	 * @return Attribute|null
+	 */
+	protected function _findFirst(string $name)
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		foreach ($this->_attributes as $attr) {
+			if ($attr->oid() == $oid) {
+				return $attr;
+			}
+		}
+		return null;
+	}
     
-    /**
-     * Check whether attribute is present.
-     *
-     * @param string $name OID or attribute name
-     * @return boolean
-     */
-    public function has(string $name): bool
-    {
-        return null !== $this->_findFirst($name);
-    }
+	/**
+	 * Check whether attribute is present.
+	 *
+	 * @param string $name OID or attribute name
+	 * @return boolean
+	 */
+	public function has(string $name): bool
+	{
+		return null !== $this->_findFirst($name);
+	}
     
-    /**
-     * Get first attribute by OID or attribute name.
-     *
-     * @param string $name OID or attribute name
-     * @throws \OutOfBoundsException
-     * @return Attribute
-     */
-    public function firstOf(string $name): Attribute
-    {
-        $attr = $this->_findFirst($name);
-        if (!$attr) {
-            throw new \UnexpectedValueException("No $name attribute.");
-        }
-        return $attr;
-    }
+	/**
+	 * Get first attribute by OID or attribute name.
+	 *
+	 * @param string $name OID or attribute name
+	 * @throws \OutOfBoundsException
+	 * @return Attribute
+	 */
+	public function firstOf(string $name): Attribute
+	{
+		$attr = $this->_findFirst($name);
+		if (!$attr) {
+			throw new \UnexpectedValueException("No $name attribute.");
+		}
+		return $attr;
+	}
     
-    /**
-     * Get all attributes of given name.
-     *
-     * @param string $name OID or attribute name
-     * @return Attribute[]
-     */
-    public function allOf(string $name): array
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        $attrs = array_filter($this->_attributes,
-            function (Attribute $attr) use ($oid) {
-                return $attr->oid() == $oid;
-            });
-        return array_values($attrs);
-    }
+	/**
+	 * Get all attributes of given name.
+	 *
+	 * @param string $name OID or attribute name
+	 * @return Attribute[]
+	 */
+	public function allOf(string $name): array
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		$attrs = array_filter($this->_attributes,
+			function (Attribute $attr) use ($oid) {
+				return $attr->oid() == $oid;
+			});
+		return array_values($attrs);
+	}
     
-    /**
-     * Get all attributes.
-     *
-     * @return Attribute[]
-     */
-    public function all(): array
-    {
-        return $this->_attributes;
-    }
+	/**
+	 * Get all attributes.
+	 *
+	 * @return Attribute[]
+	 */
+	public function all(): array
+	{
+		return $this->_attributes;
+	}
     
-    /**
-     * Get self with additional attributes added.
-     *
-     * @param Attribute ...$attribs
-     * @return self
-     */
-    public function withAdditional(Attribute ...$attribs): self
-    {
-        $obj = clone $this;
-        foreach ($attribs as $attr) {
-            $obj->_attributes[] = $attr;
-        }
-        return $obj;
-    }
+	/**
+	 * Get self with additional attributes added.
+	 *
+	 * @param Attribute ...$attribs
+	 * @return self
+	 */
+	public function withAdditional(Attribute ...$attribs): self
+	{
+		$obj = clone $this;
+		foreach ($attribs as $attr) {
+			$obj->_attributes[] = $attr;
+		}
+		return $obj;
+	}
     
-    /**
-     * Get self with single unique attribute added.
-     *
-     * All previous attributes of the same type are removed.
-     *
-     * @param Attribute $attr
-     * @return self
-     */
-    public function withUnique(Attribute $attr): self
-    {
-        $obj = clone $this;
-        $obj->_attributes = array_filter($obj->_attributes,
-            function (Attribute $a) use ($attr) {
-                return $a->oid() != $attr->oid();
-            });
-        $obj->_attributes[] = $attr;
-        return $obj;
-    }
+	/**
+	 * Get self with single unique attribute added.
+	 *
+	 * All previous attributes of the same type are removed.
+	 *
+	 * @param Attribute $attr
+	 * @return self
+	 */
+	public function withUnique(Attribute $attr): self
+	{
+		$obj = clone $this;
+		$obj->_attributes = array_filter($obj->_attributes,
+			function (Attribute $a) use ($attr) {
+				return $a->oid() != $attr->oid();
+			});
+		$obj->_attributes[] = $attr;
+		return $obj;
+	}
     
-    /**
-     * Get number of attributes.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_attributes);
-    }
+	/**
+	 * Get number of attributes.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_attributes);
+	}
     
-    /**
-     * Get iterator for attributes.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_attributes);
-    }
+	/**
+	 * Get iterator for attributes.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_attributes);
+	}
 }

lib/X509/Feature/DateTimeHelper.php

Indentation +62 added lines, -62 removed lines

@@ -9,69 +9,69 @@
  */
 trait DateTimeHelper
 {
-    /**
-     * Create DateTime object from time string and timezone.
-     *
-     * @param string|null $time Time string, default to 'now'
-     * @param string|null $tz Timezone, default if omitted
-     * @throws \RuntimeException
-     * @return \DateTimeImmutable
-     */
-    private static function _createDateTime($time = null, $tz = null): \DateTimeImmutable
-    {
-        if (!isset($time)) {
-            $time = 'now';
-        }
-        if (!isset($tz)) {
-            $tz = date_default_timezone_get();
-        }
-        try {
-            $dt = new \DateTimeImmutable($time, self::_createTimeZone($tz));
-            return self::_roundDownFractionalSeconds($dt);
-        } catch (\Exception $e) {
-            throw new \RuntimeException(
-                "Failed to create DateTime: " .
-                     self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
-        }
-    }
+	/**
+	 * Create DateTime object from time string and timezone.
+	 *
+	 * @param string|null $time Time string, default to 'now'
+	 * @param string|null $tz Timezone, default if omitted
+	 * @throws \RuntimeException
+	 * @return \DateTimeImmutable
+	 */
+	private static function _createDateTime($time = null, $tz = null): \DateTimeImmutable
+	{
+		if (!isset($time)) {
+			$time = 'now';
+		}
+		if (!isset($tz)) {
+			$tz = date_default_timezone_get();
+		}
+		try {
+			$dt = new \DateTimeImmutable($time, self::_createTimeZone($tz));
+			return self::_roundDownFractionalSeconds($dt);
+		} catch (\Exception $e) {
+			throw new \RuntimeException(
+				"Failed to create DateTime: " .
+					 self::_getLastDateTimeImmutableErrorsStr(), 0, $e);
+		}
+	}
     
-    /**
-     * Rounds a \DateTimeImmutable value such that fractional
-     * seconds are removed.
-     *
-     * @param \DateTimeImmutable $dt
-     * @return \DateTimeImmutable
-     */
-    private static function _roundDownFractionalSeconds(\DateTimeImmutable $dt): \DateTimeImmutable
-    {
-        return \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
-            $dt->format("Y-m-d H:i:s"), $dt->getTimezone());
-    }
+	/**
+	 * Rounds a \DateTimeImmutable value such that fractional
+	 * seconds are removed.
+	 *
+	 * @param \DateTimeImmutable $dt
+	 * @return \DateTimeImmutable
+	 */
+	private static function _roundDownFractionalSeconds(\DateTimeImmutable $dt): \DateTimeImmutable
+	{
+		return \DateTimeImmutable::createFromFormat("Y-m-d H:i:s",
+			$dt->format("Y-m-d H:i:s"), $dt->getTimezone());
+	}
     
-    /**
-     * Create DateTimeZone object from string.
-     *
-     * @param string $tz
-     * @throws \UnexpectedValueException
-     * @return \DateTimeZone
-     */
-    private static function _createTimeZone(string $tz): \DateTimeZone
-    {
-        try {
-            return new \DateTimeZone($tz);
-        } catch (\Exception $e) {
-            throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
-        }
-    }
+	/**
+	 * Create DateTimeZone object from string.
+	 *
+	 * @param string $tz
+	 * @throws \UnexpectedValueException
+	 * @return \DateTimeZone
+	 */
+	private static function _createTimeZone(string $tz): \DateTimeZone
+	{
+		try {
+			return new \DateTimeZone($tz);
+		} catch (\Exception $e) {
+			throw new \UnexpectedValueException("Invalid timezone.", 0, $e);
+		}
+	}
     
-    /**
-     * Get last error caused by DateTimeImmutable.
-     *
-     * @return string
-     */
-    private static function _getLastDateTimeImmutableErrorsStr(): string
-    {
-        $errors = \DateTimeImmutable::getLastErrors()["errors"];
-        return implode(", ", $errors);
-    }
+	/**
+	 * Get last error caused by DateTimeImmutable.
+	 *
+	 * @return string
+	 */
+	private static function _getLastDateTimeImmutableErrorsStr(): string
+	{
+		$errors = \DateTimeImmutable::getLastErrors()["errors"];
+		return implode(", ", $errors);
+	}
 }

lib/X509/GeneralName/GeneralName.php

Indentation +134 added lines, -134 removed lines

@@ -15,147 +15,147 @@
  */
 abstract class GeneralName
 {
-    // GeneralName CHOICE tags
-    const TAG_OTHER_NAME = 0;
-    const TAG_RFC822_NAME = 1;
-    const TAG_DNS_NAME = 2;
-    const TAG_X400_ADDRESS = 3;
-    const TAG_DIRECTORY_NAME = 4;
-    const TAG_EDI_PARTY_NAME = 5;
-    const TAG_URI = 6;
-    const TAG_IP_ADDRESS = 7;
-    const TAG_REGISTERED_ID = 8;
+	// GeneralName CHOICE tags
+	const TAG_OTHER_NAME = 0;
+	const TAG_RFC822_NAME = 1;
+	const TAG_DNS_NAME = 2;
+	const TAG_X400_ADDRESS = 3;
+	const TAG_DIRECTORY_NAME = 4;
+	const TAG_EDI_PARTY_NAME = 5;
+	const TAG_URI = 6;
+	const TAG_IP_ADDRESS = 7;
+	const TAG_REGISTERED_ID = 8;
     
-    /**
-     * Chosen tag.
-     *
-     * @var int $_tag
-     */
-    protected $_tag;
+	/**
+	 * Chosen tag.
+	 *
+	 * @var int $_tag
+	 */
+	protected $_tag;
     
-    /**
-     * Get string value of the type.
-     *
-     * @return string
-     */
-    abstract public function string(): string;
+	/**
+	 * Get string value of the type.
+	 *
+	 * @return string
+	 */
+	abstract public function string(): string;
     
-    /**
-     * Get ASN.1 value in GeneralName CHOICE context.
-     *
-     * @return TaggedType
-     */
-    abstract protected function _choiceASN1(): TaggedType;
+	/**
+	 * Get ASN.1 value in GeneralName CHOICE context.
+	 *
+	 * @return TaggedType
+	 */
+	abstract protected function _choiceASN1(): TaggedType;
     
-    /**
-     * Initialize concrete object from the chosen ASN.1 element.
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el)
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . " must be implemented in the derived class.");
-    }
+	/**
+	 * Initialize concrete object from the chosen ASN.1 element.
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in the derived class.");
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param TaggedType $el
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(TaggedType $el): self
-    {
-        switch ($el->tag()) {
-            // otherName
-            case self::TAG_OTHER_NAME:
-                return OtherName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // rfc822Name
-            case self::TAG_RFC822_NAME:
-                return RFC822Name::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // dNSName
-            case self::TAG_DNS_NAME:
-                return DNSName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // x400Address
-            case self::TAG_X400_ADDRESS:
-                return X400Address::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // directoryName
-            case self::TAG_DIRECTORY_NAME:
-                // because Name is a CHOICE, albeit having only one option,
-                // explicit tagging must be used
-                // (see X.680 07/2002 30.6.c)
-                return DirectoryName::fromChosenASN1($el->asExplicit());
-            // ediPartyName
-            case self::TAG_EDI_PARTY_NAME:
-                return EDIPartyName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // uniformResourceIdentifier
-            case self::TAG_URI:
-                return UniformResourceIdentifier::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // iPAddress
-            case self::TAG_IP_ADDRESS:
-                return IPAddress::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_OCTET_STRING));
-            // registeredID
-            case self::TAG_REGISTERED_ID:
-                return RegisteredID::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER));
-        }
-        throw new \UnexpectedValueException(
-            "GeneralName type " . $el->tag() . " not supported.");
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param TaggedType $el
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(TaggedType $el): self
+	{
+		switch ($el->tag()) {
+			// otherName
+			case self::TAG_OTHER_NAME:
+				return OtherName::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_SEQUENCE));
+			// rfc822Name
+			case self::TAG_RFC822_NAME:
+				return RFC822Name::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_IA5_STRING));
+			// dNSName
+			case self::TAG_DNS_NAME:
+				return DNSName::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_IA5_STRING));
+			// x400Address
+			case self::TAG_X400_ADDRESS:
+				return X400Address::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_SEQUENCE));
+			// directoryName
+			case self::TAG_DIRECTORY_NAME:
+				// because Name is a CHOICE, albeit having only one option,
+				// explicit tagging must be used
+				// (see X.680 07/2002 30.6.c)
+				return DirectoryName::fromChosenASN1($el->asExplicit());
+			// ediPartyName
+			case self::TAG_EDI_PARTY_NAME:
+				return EDIPartyName::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_SEQUENCE));
+			// uniformResourceIdentifier
+			case self::TAG_URI:
+				return UniformResourceIdentifier::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_IA5_STRING));
+			// iPAddress
+			case self::TAG_IP_ADDRESS:
+				return IPAddress::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_OCTET_STRING));
+			// registeredID
+			case self::TAG_REGISTERED_ID:
+				return RegisteredID::fromChosenASN1(
+					$el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER));
+		}
+		throw new \UnexpectedValueException(
+			"GeneralName type " . $el->tag() . " not supported.");
+	}
     
-    /**
-     * Get type tag.
-     *
-     * @return int
-     */
-    public function tag(): int
-    {
-        return $this->_tag;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function tag(): int
+	{
+		return $this->_tag;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return Element
-     */
-    public function toASN1(): Element
-    {
-        return $this->_choiceASN1();
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	public function toASN1(): Element
+	{
+		return $this->_choiceASN1();
+	}
     
-    /**
-     * Check whether GeneralName is equal to other.
-     *
-     * @param GeneralName $other GeneralName to compare to
-     * @return boolean True if names are equal
-     */
-    public function equals(GeneralName $other): bool
-    {
-        if ($this->_tag != $other->_tag) {
-            return false;
-        }
-        if ($this->_choiceASN1()->toDER() != $other->_choiceASN1()->toDER()) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check whether GeneralName is equal to other.
+	 *
+	 * @param GeneralName $other GeneralName to compare to
+	 * @return boolean True if names are equal
+	 */
+	public function equals(GeneralName $other): bool
+	{
+		if ($this->_tag != $other->_tag) {
+			return false;
+		}
+		if ($this->_choiceASN1()->toDER() != $other->_choiceASN1()->toDER()) {
+			return false;
+		}
+		return true;
+	}
     
-    /**
-     * Get general name as a string.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->string();
-    }
+	/**
+	 * Get general name as a string.
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->string();
+	}
 }

lib/X509/GeneralName/RFC822Name.php

Indentation +50 added lines, -50 removed lines

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

lib/X509/GeneralName/EDIPartyName.php

Indentation +39 added lines, -39 removed lines

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

lib/X509/GeneralName/GeneralNames.php

Indentation +167 added lines, -167 removed lines

@@ -18,183 +18,183 @@
  */
 class GeneralNames implements \Countable, \IteratorAggregate
 {
-    /**
-     * GeneralName objects.
-     *
-     * @var GeneralName[] $_names
-     */
-    protected $_names;
+	/**
+	 * GeneralName objects.
+	 *
+	 * @var GeneralName[] $_names
+	 */
+	protected $_names;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName ...$names One or more GeneralName objects
-     */
-    public function __construct(GeneralName ...$names)
-    {
-        $this->_names = $names;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName ...$names One or more GeneralName objects
+	 */
+	public function __construct(GeneralName ...$names)
+	{
+		$this->_names = $names;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        if (!count($seq)) {
-            throw new \UnexpectedValueException(
-                "GeneralNames must have at least one GeneralName.");
-        }
-        $names = array_map(
-            function (UnspecifiedType $el) {
-                return GeneralName::fromASN1($el->asTagged());
-            }, $seq->elements());
-        return new self(...$names);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		if (!count($seq)) {
+			throw new \UnexpectedValueException(
+				"GeneralNames must have at least one GeneralName.");
+		}
+		$names = array_map(
+			function (UnspecifiedType $el) {
+				return GeneralName::fromASN1($el->asTagged());
+			}, $seq->elements());
+		return new self(...$names);
+	}
     
-    /**
-     * Find first GeneralName by given tag.
-     *
-     * @param int $tag
-     * @return GeneralName|null
-     */
-    protected function _findFirst(int $tag)
-    {
-        foreach ($this->_names as $name) {
-            if ($name->tag() == $tag) {
-                return $name;
-            }
-        }
-        return null;
-    }
+	/**
+	 * Find first GeneralName by given tag.
+	 *
+	 * @param int $tag
+	 * @return GeneralName|null
+	 */
+	protected function _findFirst(int $tag)
+	{
+		foreach ($this->_names as $name) {
+			if ($name->tag() == $tag) {
+				return $name;
+			}
+		}
+		return null;
+	}
     
-    /**
-     * Check whether GeneralNames contains a GeneralName of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     * @return bool
-     */
-    public function has(int $tag): bool
-    {
-        return null !== $this->_findFirst($tag);
-    }
+	/**
+	 * Check whether GeneralNames contains a GeneralName of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 * @return bool
+	 */
+	public function has(int $tag): bool
+	{
+		return null !== $this->_findFirst($tag);
+	}
     
-    /**
-     * Get first GeneralName of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     * @throws \OutOfBoundsException
-     * @return GeneralName
-     */
-    public function firstOf(int $tag): GeneralName
-    {
-        $name = $this->_findFirst($tag);
-        if (!$name) {
-            throw new \UnexpectedValueException("No GeneralName by tag $tag.");
-        }
-        return $name;
-    }
+	/**
+	 * Get first GeneralName of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 * @throws \OutOfBoundsException
+	 * @return GeneralName
+	 */
+	public function firstOf(int $tag): GeneralName
+	{
+		$name = $this->_findFirst($tag);
+		if (!$name) {
+			throw new \UnexpectedValueException("No GeneralName by tag $tag.");
+		}
+		return $name;
+	}
     
-    /**
-     * Get all GeneralName objects of given type.
-     *
-     * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
-     * @return GeneralName[]
-     */
-    public function allOf(int $tag): array
-    {
-        $names = array_filter($this->_names,
-            function (GeneralName $name) use ($tag) {
-                return $name->tag() == $tag;
-            });
-        return array_values($names);
-    }
+	/**
+	 * Get all GeneralName objects of given type.
+	 *
+	 * @param int $tag One of <code>GeneralName::TAG_*</code> enumerations
+	 * @return GeneralName[]
+	 */
+	public function allOf(int $tag): array
+	{
+		$names = array_filter($this->_names,
+			function (GeneralName $name) use ($tag) {
+				return $name->tag() == $tag;
+			});
+		return array_values($names);
+	}
     
-    /**
-     * Get value of the first 'dNSName' type.
-     *
-     * @return string
-     */
-    public function firstDNS(): string
-    {
-        $gn = $this->firstOf(GeneralName::TAG_DNS_NAME);
-        if (!$gn instanceof DNSName) {
-            throw new \RuntimeException(
-                DNSName::class . " expected, got " . get_class($gn));
-        }
-        return $gn->name();
-    }
+	/**
+	 * Get value of the first 'dNSName' type.
+	 *
+	 * @return string
+	 */
+	public function firstDNS(): string
+	{
+		$gn = $this->firstOf(GeneralName::TAG_DNS_NAME);
+		if (!$gn instanceof DNSName) {
+			throw new \RuntimeException(
+				DNSName::class . " expected, got " . get_class($gn));
+		}
+		return $gn->name();
+	}
     
-    /**
-     * Get value of the first 'directoryName' type.
-     *
-     * @return Name
-     */
-    public function firstDN(): Name
-    {
-        $gn = $this->firstOf(GeneralName::TAG_DIRECTORY_NAME);
-        if (!$gn instanceof DirectoryName) {
-            throw new \RuntimeException(
-                DirectoryName::class . " expected, got " . get_class($gn));
-        }
-        return $gn->dn();
-    }
+	/**
+	 * Get value of the first 'directoryName' type.
+	 *
+	 * @return Name
+	 */
+	public function firstDN(): Name
+	{
+		$gn = $this->firstOf(GeneralName::TAG_DIRECTORY_NAME);
+		if (!$gn instanceof DirectoryName) {
+			throw new \RuntimeException(
+				DirectoryName::class . " expected, got " . get_class($gn));
+		}
+		return $gn->dn();
+	}
     
-    /**
-     * Get value of the first 'uniformResourceIdentifier' type.
-     *
-     * @return string
-     */
-    public function firstURI(): string
-    {
-        $gn = $this->firstOf(GeneralName::TAG_URI);
-        if (!$gn instanceof UniformResourceIdentifier) {
-            throw new \RuntimeException(
-                UniformResourceIdentifier::class . " expected, got " .
-                     get_class($gn));
-        }
-        return $gn->uri();
-    }
+	/**
+	 * Get value of the first 'uniformResourceIdentifier' type.
+	 *
+	 * @return string
+	 */
+	public function firstURI(): string
+	{
+		$gn = $this->firstOf(GeneralName::TAG_URI);
+		if (!$gn instanceof UniformResourceIdentifier) {
+			throw new \RuntimeException(
+				UniformResourceIdentifier::class . " expected, got " .
+					 get_class($gn));
+		}
+		return $gn->uri();
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        if (!count($this->_names)) {
-            throw new \LogicException(
-                "GeneralNames must have at least one GeneralName.");
-        }
-        $elements = array_map(
-            function (GeneralName $name) {
-                return $name->toASN1();
-            }, $this->_names);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		if (!count($this->_names)) {
+			throw new \LogicException(
+				"GeneralNames must have at least one GeneralName.");
+		}
+		$elements = array_map(
+			function (GeneralName $name) {
+				return $name->toASN1();
+			}, $this->_names);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_names);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_names);
+	}
     
-    /**
-     * Get iterator for GeneralName objects.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_names);
-    }
+	/**
+	 * Get iterator for GeneralName objects.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_names);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
                 "GeneralNames must have at least one GeneralName.");
         }
         $names = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return GeneralName::fromASN1($el->asTagged());
             }, $seq->elements());
         return new self(...$names);
@@ -107,7 +107,7 @@ 
     public function allOf(int $tag): array
     {
         $names = array_filter($this->_names,
-            function (GeneralName $name) use ($tag) {
+            function(GeneralName $name) use ($tag) {
                 return $name->tag() == $tag;
             });
         return array_values($names);
@@ -171,7 +171,7 @@ 
                 "GeneralNames must have at least one GeneralName.");
         }
         $elements = array_map(
-            function (GeneralName $name) {
+            function(GeneralName $name) {
                 return $name->toASN1();
             }, $this->_names);
         return new Sequence(...$elements);