sop / x509

lib/X509/Certificate/Extension/Target/Targets.php

Indentation +117 added lines, -117 removed lines

@@ -14,131 +14,131 @@
  */
 class Targets implements \Countable, \IteratorAggregate
 {
-    /**
-     * Target elements.
-     *
-     * @var Target[] $_targets
-     */
-    protected $_targets;
+	/**
+	 * Target elements.
+	 *
+	 * @var Target[] $_targets
+	 */
+	protected $_targets;
     
-    /**
-     * Constructor.
-     *
-     * @param Target ...$targets
-     */
-    public function __construct(Target ...$targets)
-    {
-        $this->_targets = $targets;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param Target ...$targets
+	 */
+	public function __construct(Target ...$targets)
+	{
+		$this->_targets = $targets;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $targets = array_map(
-            function (UnspecifiedType $el) {
-                return Target::fromASN1($el->asTagged());
-            }, $seq->elements());
-        return new self(...$targets);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$targets = array_map(
+			function (UnspecifiedType $el) {
+				return Target::fromASN1($el->asTagged());
+			}, $seq->elements());
+		return new self(...$targets);
+	}
     
-    /**
-     * Get all targets.
-     *
-     * @return Target[]
-     */
-    public function all(): array
-    {
-        return $this->_targets;
-    }
+	/**
+	 * Get all targets.
+	 *
+	 * @return Target[]
+	 */
+	public function all(): array
+	{
+		return $this->_targets;
+	}
     
-    /**
-     * Get all targets of given type.
-     *
-     * @param int $type
-     * @return Target[]
-     */
-    protected function _allOfType(int $type): array
-    {
-        return array_values(
-            array_filter($this->_targets,
-                function (Target $target) use ($type) {
-                    return $target->type() == $type;
-                }));
-    }
+	/**
+	 * Get all targets of given type.
+	 *
+	 * @param int $type
+	 * @return Target[]
+	 */
+	protected function _allOfType(int $type): array
+	{
+		return array_values(
+			array_filter($this->_targets,
+				function (Target $target) use ($type) {
+					return $target->type() == $type;
+				}));
+	}
     
-    /**
-     * Get all name targets.
-     *
-     * @return Target[]
-     */
-    public function nameTargets(): array
-    {
-        return $this->_allOfType(Target::TYPE_NAME);
-    }
+	/**
+	 * Get all name targets.
+	 *
+	 * @return Target[]
+	 */
+	public function nameTargets(): array
+	{
+		return $this->_allOfType(Target::TYPE_NAME);
+	}
     
-    /**
-     * Get all group targets.
-     *
-     * @return Target[]
-     */
-    public function groupTargets(): array
-    {
-        return $this->_allOfType(Target::TYPE_GROUP);
-    }
+	/**
+	 * Get all group targets.
+	 *
+	 * @return Target[]
+	 */
+	public function groupTargets(): array
+	{
+		return $this->_allOfType(Target::TYPE_GROUP);
+	}
     
-    /**
-     * Check whether given target is present.
-     *
-     * @param Target $target
-     * @return boolean
-     */
-    public function hasTarget(Target $target): bool
-    {
-        foreach ($this->_allOfType($target->type()) as $t) {
-            if ($target->equals($t)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	/**
+	 * Check whether given target is present.
+	 *
+	 * @param Target $target
+	 * @return boolean
+	 */
+	public function hasTarget(Target $target): bool
+	{
+		foreach ($this->_allOfType($target->type()) as $t) {
+			if ($target->equals($t)) {
+				return true;
+			}
+		}
+		return false;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array_map(
-            function (Target $target) {
-                return $target->toASN1();
-            }, $this->_targets);
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array_map(
+			function (Target $target) {
+				return $target->toASN1();
+			}, $this->_targets);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_targets);
-    }
+	/**
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_targets);
+	}
     
-    /**
-     * Get iterator for targets.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_targets);
-    }
+	/**
+	 * Get iterator for targets.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_targets);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
     public static function fromASN1(Sequence $seq): self
     {
         $targets = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return Target::fromASN1($el->asTagged());
             }, $seq->elements());
         return new self(...$targets);
@@ -66,7 +66,7 @@ 
     {
         return array_values(
             array_filter($this->_targets,
-                function (Target $target) use ($type) {
+                function(Target $target) use ($type) {
                     return $target->type() == $type;
                 }));
     }
@@ -115,7 +115,7 @@ 
     public function toASN1(): Sequence
     {
         $elements = array_map(
-            function (Target $target) {
+            function(Target $target) {
                 return $target->toASN1();
             }, $this->_targets);
         return new Sequence(...$elements);

lib/X509/Certificate/Extension/Target/Target.php

Indentation +78 added lines, -78 removed lines

@@ -13,89 +13,89 @@
  */
 abstract class Target
 {
-    const TYPE_NAME = 0;
-    const TYPE_GROUP = 1;
-    const TYPE_CERT = 2;
+	const TYPE_NAME = 0;
+	const TYPE_GROUP = 1;
+	const TYPE_CERT = 2;
     
-    /**
-     * Type tag.
-     *
-     * @var int $_type
-     */
-    protected $_type;
+	/**
+	 * Type tag.
+	 *
+	 * @var int $_type
+	 */
+	protected $_type;
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return \ASN1\Element
-     */
-    abstract public function toASN1();
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return \ASN1\Element
+	 */
+	abstract public function toASN1();
     
-    /**
-     * Get string value of the target.
-     *
-     * @return string
-     */
-    abstract public function string(): string;
+	/**
+	 * Get string value of the target.
+	 *
+	 * @return string
+	 */
+	abstract public function string(): string;
     
-    /**
-     * Initialize concrete object from the chosen ASN.1 element.
-     *
-     * @param TaggedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(TaggedType $el)
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . " must be implemented in the derived class.");
-    }
+	/**
+	 * Initialize concrete object from the chosen ASN.1 element.
+	 *
+	 * @param TaggedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(TaggedType $el)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in the derived class.");
+	}
     
-    /**
-     * Parse from ASN.1.
-     *
-     * @param TaggedType $el
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(TaggedType $el): self
-    {
-        switch ($el->tag()) {
-            case self::TYPE_NAME:
-                return TargetName::fromChosenASN1($el->asExplicit()->asTagged());
-            case self::TYPE_GROUP:
-                return TargetGroup::fromChosenASN1(
-                    $el->asExplicit()->asTagged());
-            case self::TYPE_CERT:
-                throw new \RuntimeException("targetCert not supported.");
-        }
-        throw new \UnexpectedValueException(
-            "Target type " . $el->tag() . " not supported.");
-    }
+	/**
+	 * Parse from ASN.1.
+	 *
+	 * @param TaggedType $el
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(TaggedType $el): self
+	{
+		switch ($el->tag()) {
+			case self::TYPE_NAME:
+				return TargetName::fromChosenASN1($el->asExplicit()->asTagged());
+			case self::TYPE_GROUP:
+				return TargetGroup::fromChosenASN1(
+					$el->asExplicit()->asTagged());
+			case self::TYPE_CERT:
+				throw new \RuntimeException("targetCert not supported.");
+		}
+		throw new \UnexpectedValueException(
+			"Target type " . $el->tag() . " not supported.");
+	}
     
-    /**
-     * Get type tag.
-     *
-     * @return int
-     */
-    public function type(): int
-    {
-        return $this->_type;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function type(): int
+	{
+		return $this->_type;
+	}
     
-    /**
-     * Check whether target is equal to another.
-     *
-     * @param Target $other
-     * @return bool
-     */
-    public function equals(Target $other): bool
-    {
-        if ($this->_type != $other->_type) {
-            return false;
-        }
-        if ($this->toASN1()->toDER() != $other->toASN1()->toDER()) {
-            return false;
-        }
-        return true;
-    }
+	/**
+	 * Check whether target is equal to another.
+	 *
+	 * @param Target $other
+	 * @return bool
+	 */
+	public function equals(Target $other): bool
+	{
+		if ($this->_type != $other->_type) {
+			return false;
+		}
+		if ($this->toASN1()->toDER() != $other->toASN1()->toDER()) {
+			return false;
+		}
+		return true;
+	}
 }

Switch Indentation +7 added lines, -7 removed lines

@@ -60,13 +60,13 @@
     public static function fromASN1(TaggedType $el): self
     {
         switch ($el->tag()) {
-            case self::TYPE_NAME:
-                return TargetName::fromChosenASN1($el->asExplicit()->asTagged());
-            case self::TYPE_GROUP:
-                return TargetGroup::fromChosenASN1(
-                    $el->asExplicit()->asTagged());
-            case self::TYPE_CERT:
-                throw new \RuntimeException("targetCert not supported.");
+        case self::TYPE_NAME:
+            return TargetName::fromChosenASN1($el->asExplicit()->asTagged());
+        case self::TYPE_GROUP:
+            return TargetGroup::fromChosenASN1(
+                $el->asExplicit()->asTagged());
+        case self::TYPE_CERT:
+            throw new \RuntimeException("targetCert not supported.");
         }
         throw new \UnexpectedValueException(
             "Target type " . $el->tag() . " not supported.");

lib/X509/Certificate/Extension/Target/TargetName.php

Indentation +51 added lines, -51 removed lines

@@ -15,60 +15,60 @@
  */
 class TargetName extends Target
 {
-    /**
-     * Name.
-     *
-     * @var GeneralName $_name
-     */
-    protected $_name;
+	/**
+	 * Name.
+	 *
+	 * @var GeneralName $_name
+	 */
+	protected $_name;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $name
-     */
-    public function __construct(GeneralName $name)
-    {
-        $this->_name = $name;
-        $this->_type = self::TYPE_NAME;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $name
+	 */
+	public function __construct(GeneralName $name)
+	{
+		$this->_name = $name;
+		$this->_type = self::TYPE_NAME;
+	}
     
-    /**
-     *
-     * @param TaggedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(TaggedType $el): self
-    {
-        return new self(GeneralName::fromASN1($el));
-    }
+	/**
+	 *
+	 * @param TaggedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(TaggedType $el): self
+	{
+		return new self(GeneralName::fromASN1($el));
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_name->string();
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_name->string();
+	}
     
-    /**
-     * Get name.
-     *
-     * @return GeneralName
-     */
-    public function name(): GeneralName
-    {
-        return $this->_name;
-    }
+	/**
+	 * Get name.
+	 *
+	 * @return GeneralName
+	 */
+	public function name(): GeneralName
+	{
+		return $this->_name;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return ExplicitlyTaggedType
-     */
-    public function toASN1(): TaggedType
-    {
-        return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return ExplicitlyTaggedType
+	 */
+	public function toASN1(): TaggedType
+	{
+		return new ExplicitlyTaggedType($this->_type, $this->_name->toASN1());
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/PolicyInformation.php

Indentation +203 added lines, -203 removed lines

@@ -16,207 +16,207 @@
  */
 class PolicyInformation implements \Countable, \IteratorAggregate
 {
-    /**
-     * Wildcard policy.
-     *
-     * @var string
-     */
-    const OID_ANY_POLICY = "2.5.29.32.0";
-    
-    /**
-     * Policy identifier.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
-    
-    /**
-     * Policy qualifiers.
-     *
-     * @var PolicyQualifierInfo[] $_qualifiers
-     */
-    protected $_qualifiers;
-    
-    /**
-     * Constructor.
-     *
-     * @param string $oid
-     * @param PolicyQualifierInfo[] $qualifiers
-     */
-    public function __construct(string $oid, PolicyQualifierInfo ...$qualifiers)
-    {
-        $this->_oid = $oid;
-        $this->_qualifiers = array();
-        foreach ($qualifiers as $qual) {
-            $this->_qualifiers[$qual->oid()] = $qual;
-        }
-    }
-    
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $oid = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        $qualifiers = array();
-        if (count($seq) > 1) {
-            $qualifiers = array_map(
-                function (UnspecifiedType $el) {
-                    return PolicyQualifierInfo::fromASN1($el->asSequence());
-                },
-                $seq->at(1)
-                    ->asSequence()
-                    ->elements());
-        }
-        return new self($oid, ...$qualifiers);
-    }
-    
-    /**
-     * Get policy identifier.
-     *
-     * @return string
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
-    
-    /**
-     * Check whether this policy is anyPolicy.
-     *
-     * @return bool
-     */
-    public function isAnyPolicy(): bool
-    {
-        return self::OID_ANY_POLICY === $this->_oid;
-    }
-    
-    /**
-     * Get policy qualifiers.
-     *
-     * @return PolicyQualifierInfo[]
-     */
-    public function qualifiers(): array
-    {
-        return array_values($this->_qualifiers);
-    }
-    
-    /**
-     * Check whether qualifier is present.
-     *
-     * @param string $oid
-     * @return boolean
-     */
-    public function has(string $oid): bool
-    {
-        return isset($this->_qualifiers[$oid]);
-    }
-    
-    /**
-     * Get qualifier by OID.
-     *
-     * @param string $oid
-     * @throws \OutOfBoundsException
-     * @return PolicyQualifierInfo
-     */
-    public function get(string $oid): PolicyQualifierInfo
-    {
-        if (!$this->has($oid)) {
-            throw new \LogicException("No $oid qualifier.");
-        }
-        return $this->_qualifiers[$oid];
-    }
-    
-    /**
-     * Check whether CPS qualifier is present.
-     *
-     * @return bool
-     */
-    public function hasCPSQualifier(): bool
-    {
-        return $this->has(PolicyQualifierInfo::OID_CPS);
-    }
-    
-    /**
-     * Get CPS qualifier.
-     *
-     * @throws \LogicException
-     * @return CPSQualifier
-     */
-    public function CPSQualifier(): CPSQualifier
-    {
-        if (!$this->hasCPSQualifier()) {
-            throw new \LogicException("CPS qualifier not set.");
-        }
-        return $this->get(PolicyQualifierInfo::OID_CPS);
-    }
-    
-    /**
-     * Check whether user notice qualifier is present.
-     *
-     * @return bool
-     */
-    public function hasUserNoticeQualifier(): bool
-    {
-        return $this->has(PolicyQualifierInfo::OID_UNOTICE);
-    }
-    
-    /**
-     * Get user notice qualifier.
-     *
-     * @throws \LogicException
-     * @return UserNoticeQualifier
-     */
-    public function userNoticeQualifier(): UserNoticeQualifier
-    {
-        if (!$this->hasUserNoticeQualifier()) {
-            throw new \LogicException("User notice qualifier not set.");
-        }
-        return $this->get(PolicyQualifierInfo::OID_UNOTICE);
-    }
-    
-    /**
-     * Get ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array(new ObjectIdentifier($this->_oid));
-        if (count($this->_qualifiers)) {
-            $qualifiers = array_map(
-                function (PolicyQualifierInfo $pqi) {
-                    return $pqi->toASN1();
-                }, array_values($this->_qualifiers));
-            $elements[] = new Sequence(...$qualifiers);
-        }
-        return new Sequence(...$elements);
-    }
-    
-    /**
-     * Get number of qualifiers.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_qualifiers);
-    }
-    
-    /**
-     * Get iterator for qualifiers.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_qualifiers);
-    }
+	/**
+	 * Wildcard policy.
+	 *
+	 * @var string
+	 */
+	const OID_ANY_POLICY = "2.5.29.32.0";
+    
+	/**
+	 * Policy identifier.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
+    
+	/**
+	 * Policy qualifiers.
+	 *
+	 * @var PolicyQualifierInfo[] $_qualifiers
+	 */
+	protected $_qualifiers;
+    
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid
+	 * @param PolicyQualifierInfo[] $qualifiers
+	 */
+	public function __construct(string $oid, PolicyQualifierInfo ...$qualifiers)
+	{
+		$this->_oid = $oid;
+		$this->_qualifiers = array();
+		foreach ($qualifiers as $qual) {
+			$this->_qualifiers[$qual->oid()] = $qual;
+		}
+	}
+    
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$oid = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		$qualifiers = array();
+		if (count($seq) > 1) {
+			$qualifiers = array_map(
+				function (UnspecifiedType $el) {
+					return PolicyQualifierInfo::fromASN1($el->asSequence());
+				},
+				$seq->at(1)
+					->asSequence()
+					->elements());
+		}
+		return new self($oid, ...$qualifiers);
+	}
+    
+	/**
+	 * Get policy identifier.
+	 *
+	 * @return string
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
+    
+	/**
+	 * Check whether this policy is anyPolicy.
+	 *
+	 * @return bool
+	 */
+	public function isAnyPolicy(): bool
+	{
+		return self::OID_ANY_POLICY === $this->_oid;
+	}
+    
+	/**
+	 * Get policy qualifiers.
+	 *
+	 * @return PolicyQualifierInfo[]
+	 */
+	public function qualifiers(): array
+	{
+		return array_values($this->_qualifiers);
+	}
+    
+	/**
+	 * Check whether qualifier is present.
+	 *
+	 * @param string $oid
+	 * @return boolean
+	 */
+	public function has(string $oid): bool
+	{
+		return isset($this->_qualifiers[$oid]);
+	}
+    
+	/**
+	 * Get qualifier by OID.
+	 *
+	 * @param string $oid
+	 * @throws \OutOfBoundsException
+	 * @return PolicyQualifierInfo
+	 */
+	public function get(string $oid): PolicyQualifierInfo
+	{
+		if (!$this->has($oid)) {
+			throw new \LogicException("No $oid qualifier.");
+		}
+		return $this->_qualifiers[$oid];
+	}
+    
+	/**
+	 * Check whether CPS qualifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasCPSQualifier(): bool
+	{
+		return $this->has(PolicyQualifierInfo::OID_CPS);
+	}
+    
+	/**
+	 * Get CPS qualifier.
+	 *
+	 * @throws \LogicException
+	 * @return CPSQualifier
+	 */
+	public function CPSQualifier(): CPSQualifier
+	{
+		if (!$this->hasCPSQualifier()) {
+			throw new \LogicException("CPS qualifier not set.");
+		}
+		return $this->get(PolicyQualifierInfo::OID_CPS);
+	}
+    
+	/**
+	 * Check whether user notice qualifier is present.
+	 *
+	 * @return bool
+	 */
+	public function hasUserNoticeQualifier(): bool
+	{
+		return $this->has(PolicyQualifierInfo::OID_UNOTICE);
+	}
+    
+	/**
+	 * Get user notice qualifier.
+	 *
+	 * @throws \LogicException
+	 * @return UserNoticeQualifier
+	 */
+	public function userNoticeQualifier(): UserNoticeQualifier
+	{
+		if (!$this->hasUserNoticeQualifier()) {
+			throw new \LogicException("User notice qualifier not set.");
+		}
+		return $this->get(PolicyQualifierInfo::OID_UNOTICE);
+	}
+    
+	/**
+	 * Get ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array(new ObjectIdentifier($this->_oid));
+		if (count($this->_qualifiers)) {
+			$qualifiers = array_map(
+				function (PolicyQualifierInfo $pqi) {
+					return $pqi->toASN1();
+				}, array_values($this->_qualifiers));
+			$elements[] = new Sequence(...$qualifiers);
+		}
+		return new Sequence(...$elements);
+	}
+    
+	/**
+	 * Get number of qualifiers.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_qualifiers);
+	}
+    
+	/**
+	 * Get iterator for qualifiers.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_qualifiers);
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/DisplayText.php

Indentation +82 added lines, -82 removed lines

@@ -19,93 +19,93 @@
  */
 class DisplayText
 {
-    /**
-     * Text.
-     *
-     * @var string $_text
-     */
-    protected $_text;
+	/**
+	 * Text.
+	 *
+	 * @var string $_text
+	 */
+	protected $_text;
     
-    /**
-     * Element tag.
-     *
-     * @var int $_tag
-     */
-    protected $_tag;
+	/**
+	 * Element tag.
+	 *
+	 * @var int $_tag
+	 */
+	protected $_tag;
     
-    /**
-     * Constructor.
-     *
-     * @param string $text
-     * @param int $tag
-     */
-    public function __construct(string $text, int $tag)
-    {
-        $this->_text = $text;
-        $this->_tag = $tag;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $text
+	 * @param int $tag
+	 */
+	public function __construct(string $text, int $tag)
+	{
+		$this->_text = $text;
+		$this->_tag = $tag;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param StringType $el
-     * @return self
-     */
-    public static function fromASN1(StringType $el): self
-    {
-        return new self($el->string(), $el->tag());
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param StringType $el
+	 * @return self
+	 */
+	public static function fromASN1(StringType $el): self
+	{
+		return new self($el->string(), $el->tag());
+	}
     
-    /**
-     * Initialize from a UTF-8 string.
-     *
-     * @param string $str
-     * @return self
-     */
-    public static function fromString(string $str): self
-    {
-        return new self($str, Element::TYPE_UTF8_STRING);
-    }
+	/**
+	 * Initialize from a UTF-8 string.
+	 *
+	 * @param string $str
+	 * @return self
+	 */
+	public static function fromString(string $str): self
+	{
+		return new self($str, Element::TYPE_UTF8_STRING);
+	}
     
-    /**
-     * Get the text.
-     *
-     * @return string
-     */
-    public function string(): string
-    {
-        return $this->_text;
-    }
+	/**
+	 * Get the text.
+	 *
+	 * @return string
+	 */
+	public function string(): string
+	{
+		return $this->_text;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @throws \UnexpectedValueException
-     * @return StringType
-     */
-    public function toASN1(): StringType
-    {
-        switch ($this->_tag) {
-            case Element::TYPE_IA5_STRING:
-                return new IA5String($this->_text);
-            case Element::TYPE_VISIBLE_STRING:
-                return new VisibleString($this->_text);
-            case Element::TYPE_BMP_STRING:
-                return new BMPString($this->_text);
-            case Element::TYPE_UTF8_STRING:
-                return new UTF8String($this->_text);
-            default:
-                throw new \UnexpectedValueException(
-                    "Type " . Element::tagToName($this->_tag) . " not supported.");
-        }
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @throws \UnexpectedValueException
+	 * @return StringType
+	 */
+	public function toASN1(): StringType
+	{
+		switch ($this->_tag) {
+			case Element::TYPE_IA5_STRING:
+				return new IA5String($this->_text);
+			case Element::TYPE_VISIBLE_STRING:
+				return new VisibleString($this->_text);
+			case Element::TYPE_BMP_STRING:
+				return new BMPString($this->_text);
+			case Element::TYPE_UTF8_STRING:
+				return new UTF8String($this->_text);
+			default:
+				throw new \UnexpectedValueException(
+					"Type " . Element::tagToName($this->_tag) . " not supported.");
+		}
+	}
     
-    /**
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->string();
-    }
+	/**
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->string();
+	}
 }

Switch Indentation +11 added lines, -11 removed lines

@@ -86,17 +86,17 @@
     public function toASN1(): StringType
     {
         switch ($this->_tag) {
-            case Element::TYPE_IA5_STRING:
-                return new IA5String($this->_text);
-            case Element::TYPE_VISIBLE_STRING:
-                return new VisibleString($this->_text);
-            case Element::TYPE_BMP_STRING:
-                return new BMPString($this->_text);
-            case Element::TYPE_UTF8_STRING:
-                return new UTF8String($this->_text);
-            default:
-                throw new \UnexpectedValueException(
-                    "Type " . Element::tagToName($this->_tag) . " not supported.");
+        case Element::TYPE_IA5_STRING:
+            return new IA5String($this->_text);
+        case Element::TYPE_VISIBLE_STRING:
+            return new VisibleString($this->_text);
+        case Element::TYPE_BMP_STRING:
+            return new BMPString($this->_text);
+        case Element::TYPE_UTF8_STRING:
+            return new UTF8String($this->_text);
+        default:
+            throw new \UnexpectedValueException(
+                "Type " . Element::tagToName($this->_tag) . " not supported.");
         }
     }
     

lib/X509/Certificate/Extension/CertificatePolicy/PolicyQualifierInfo.php

Indentation +74 added lines, -74 removed lines

@@ -16,85 +16,85 @@
  */
 abstract class PolicyQualifierInfo
 {
-    /**
-     * OID for the CPS Pointer qualifier.
-     *
-     * @var string
-     */
-    const OID_CPS = "1.3.6.1.5.5.7.2.1";
+	/**
+	 * OID for the CPS Pointer qualifier.
+	 *
+	 * @var string
+	 */
+	const OID_CPS = "1.3.6.1.5.5.7.2.1";
     
-    /**
-     * OID for the user notice qualifier.
-     *
-     * @var string
-     */
-    const OID_UNOTICE = "1.3.6.1.5.5.7.2.2";
+	/**
+	 * OID for the user notice qualifier.
+	 *
+	 * @var string
+	 */
+	const OID_UNOTICE = "1.3.6.1.5.5.7.2.2";
     
-    /**
-     * Qualifier identifier.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
+	/**
+	 * Qualifier identifier.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
     
-    /**
-     * Generate ASN.1 for the 'qualifier' field.
-     *
-     * @return \ASN1\Element
-     */
-    abstract protected function _qualifierASN1();
+	/**
+	 * Generate ASN.1 for the 'qualifier' field.
+	 *
+	 * @return \ASN1\Element
+	 */
+	abstract protected function _qualifierASN1();
     
-    /**
-     * Initialize from qualifier ASN.1 element.
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromQualifierASN1(UnspecifiedType $el)
-    {
-        throw new \BadMethodCallException(
-            __FUNCTION__ . " must be implemented in the derived class.");
-    }
+	/**
+	 * Initialize from qualifier ASN.1 element.
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromQualifierASN1(UnspecifiedType $el)
+	{
+		throw new \BadMethodCallException(
+			__FUNCTION__ . " must be implemented in the derived class.");
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $oid = $seq->at(0)
-            ->asObjectIdentifier()
-            ->oid();
-        switch ($oid) {
-            case self::OID_CPS:
-                return CPSQualifier::fromQualifierASN1($seq->at(1));
-            case self::OID_UNOTICE:
-                return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
-        }
-        throw new \UnexpectedValueException("Qualifier $oid not supported.");
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$oid = $seq->at(0)
+			->asObjectIdentifier()
+			->oid();
+		switch ($oid) {
+			case self::OID_CPS:
+				return CPSQualifier::fromQualifierASN1($seq->at(1));
+			case self::OID_UNOTICE:
+				return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
+		}
+		throw new \UnexpectedValueException("Qualifier $oid not supported.");
+	}
     
-    /**
-     * Get qualifier identifier.
-     *
-     * @return string
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get qualifier identifier.
+	 *
+	 * @return string
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence(new ObjectIdentifier($this->_oid),
-            $this->_qualifierASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence(new ObjectIdentifier($this->_oid),
+			$this->_qualifierASN1());
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/CPSQualifier.php

Indentation +43 added lines, -43 removed lines

@@ -15,51 +15,51 @@
  */
 class CPSQualifier extends PolicyQualifierInfo
 {
-    /**
-     * URI.
-     *
-     * @var string $_uri
-     */
-    protected $_uri;
+	/**
+	 * URI.
+	 *
+	 * @var string $_uri
+	 */
+	protected $_uri;
     
-    /**
-     * Constructor.
-     *
-     * @param string $uri
-     */
-    public function __construct(string $uri)
-    {
-        $this->_oid = self::OID_CPS;
-        $this->_uri = $uri;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $uri
+	 */
+	public function __construct(string $uri)
+	{
+		$this->_oid = self::OID_CPS;
+		$this->_uri = $uri;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromQualifierASN1(UnspecifiedType $el): self
-    {
-        return new self($el->asString()->string());
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromQualifierASN1(UnspecifiedType $el): self
+	{
+		return new self($el->asString()->string());
+	}
     
-    /**
-     * Get URI.
-     *
-     * @return string
-     */
-    public function uri(): string
-    {
-        return $this->_uri;
-    }
+	/**
+	 * Get URI.
+	 *
+	 * @return string
+	 */
+	public function uri(): string
+	{
+		return $this->_uri;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return IA5String
-     */
-    protected function _qualifierASN1(): IA5String
-    {
-        return new IA5String($this->_uri);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return IA5String
+	 */
+	protected function _qualifierASN1(): IA5String
+	{
+		return new IA5String($this->_uri);
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/UserNoticeQualifier.php

Indentation +102 added lines, -102 removed lines

@@ -16,114 +16,114 @@
  */
 class UserNoticeQualifier extends PolicyQualifierInfo
 {
-    /**
-     * Explicit notice text.
-     *
-     * @var DisplayText $_text
-     */
-    protected $_text;
+	/**
+	 * Explicit notice text.
+	 *
+	 * @var DisplayText $_text
+	 */
+	protected $_text;
     
-    /**
-     * Notice reference.
-     *
-     * @var NoticeReference $_ref
-     */
-    protected $_ref;
+	/**
+	 * Notice reference.
+	 *
+	 * @var NoticeReference $_ref
+	 */
+	protected $_ref;
     
-    /**
-     * Constructor.
-     *
-     * @param DisplayText|null $text
-     * @param NoticeReference|null $ref
-     */
-    public function __construct(DisplayText $text = null, NoticeReference $ref = null)
-    {
-        $this->_oid = self::OID_UNOTICE;
-        $this->_text = $text;
-        $this->_ref = $ref;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param DisplayText|null $text
+	 * @param NoticeReference|null $ref
+	 */
+	public function __construct(DisplayText $text = null, NoticeReference $ref = null)
+	{
+		$this->_oid = self::OID_UNOTICE;
+		$this->_text = $text;
+		$this->_ref = $ref;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromQualifierASN1(UnspecifiedType $el): self
-    {
-        $seq = $el->asSequence();
-        $ref = null;
-        $text = null;
-        $idx = 0;
-        if ($seq->has($idx, Element::TYPE_SEQUENCE)) {
-            $ref = NoticeReference::fromASN1($seq->at($idx++)->asSequence());
-        }
-        if ($seq->has($idx, Element::TYPE_STRING)) {
-            $text = DisplayText::fromASN1($seq->at($idx)->asString());
-        }
-        return new self($text, $ref);
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromQualifierASN1(UnspecifiedType $el): self
+	{
+		$seq = $el->asSequence();
+		$ref = null;
+		$text = null;
+		$idx = 0;
+		if ($seq->has($idx, Element::TYPE_SEQUENCE)) {
+			$ref = NoticeReference::fromASN1($seq->at($idx++)->asSequence());
+		}
+		if ($seq->has($idx, Element::TYPE_STRING)) {
+			$text = DisplayText::fromASN1($seq->at($idx)->asString());
+		}
+		return new self($text, $ref);
+	}
     
-    /**
-     * Whether explicit text is present.
-     *
-     * @return bool
-     */
-    public function hasExplicitText(): bool
-    {
-        return isset($this->_text);
-    }
+	/**
+	 * Whether explicit text is present.
+	 *
+	 * @return bool
+	 */
+	public function hasExplicitText(): bool
+	{
+		return isset($this->_text);
+	}
     
-    /**
-     * Get explicit text.
-     *
-     * @return DisplayText
-     */
-    public function explicitText(): DisplayText
-    {
-        if (!$this->hasExplicitText()) {
-            throw new \LogicException("explicitText not set.");
-        }
-        return $this->_text;
-    }
+	/**
+	 * Get explicit text.
+	 *
+	 * @return DisplayText
+	 */
+	public function explicitText(): DisplayText
+	{
+		if (!$this->hasExplicitText()) {
+			throw new \LogicException("explicitText not set.");
+		}
+		return $this->_text;
+	}
     
-    /**
-     * Whether notice reference is present.
-     *
-     * @return bool
-     */
-    public function hasNoticeRef(): bool
-    {
-        return isset($this->_ref);
-    }
+	/**
+	 * Whether notice reference is present.
+	 *
+	 * @return bool
+	 */
+	public function hasNoticeRef(): bool
+	{
+		return isset($this->_ref);
+	}
     
-    /**
-     * Get notice reference.
-     *
-     * @throws \RuntimeException
-     * @return NoticeReference
-     */
-    public function noticeRef(): NoticeReference
-    {
-        if (!$this->hasNoticeRef()) {
-            throw new \LogicException("noticeRef not set.");
-        }
-        return $this->_ref;
-    }
+	/**
+	 * Get notice reference.
+	 *
+	 * @throws \RuntimeException
+	 * @return NoticeReference
+	 */
+	public function noticeRef(): NoticeReference
+	{
+		if (!$this->hasNoticeRef()) {
+			throw new \LogicException("noticeRef not set.");
+		}
+		return $this->_ref;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _qualifierASN1(): Sequence
-    {
-        $elements = array();
-        if (isset($this->_ref)) {
-            $elements[] = $this->_ref->toASN1();
-        }
-        if (isset($this->_text)) {
-            $elements[] = $this->_text->toASN1();
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _qualifierASN1(): Sequence
+	{
+		$elements = array();
+		if (isset($this->_ref)) {
+			$elements[] = $this->_ref->toASN1();
+		}
+		if (isset($this->_text)) {
+			$elements[] = $this->_text->toASN1();
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/CertificatePolicy/NoticeReference.php

Indentation +73 added lines, -73 removed lines

@@ -16,83 +16,83 @@
  */
 class NoticeReference
 {
-    /**
-     * Organization.
-     *
-     * @var DisplayText $_organization
-     */
-    protected $_organization;
+	/**
+	 * Organization.
+	 *
+	 * @var DisplayText $_organization
+	 */
+	protected $_organization;
     
-    /**
-     * Notification reference numbers.
-     *
-     * @var int[] $_numbers
-     */
-    protected $_numbers;
+	/**
+	 * Notification reference numbers.
+	 *
+	 * @var int[] $_numbers
+	 */
+	protected $_numbers;
     
-    /**
-     * Constructor.
-     *
-     * @param DisplayText $organization
-     * @param int[] $numbers
-     */
-    public function __construct(DisplayText $organization, int ...$numbers)
-    {
-        $this->_organization = $organization;
-        $this->_numbers = $numbers;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param DisplayText $organization
+	 * @param int[] $numbers
+	 */
+	public function __construct(DisplayText $organization, int ...$numbers)
+	{
+		$this->_organization = $organization;
+		$this->_numbers = $numbers;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $org = DisplayText::fromASN1($seq->at(0)->asString());
-        $numbers = array_map(
-            function (UnspecifiedType $el) {
-                return $el->asInteger()->intNumber();
-            },
-            $seq->at(1)
-                ->asSequence()
-                ->elements());
-        return new self($org, ...$numbers);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$org = DisplayText::fromASN1($seq->at(0)->asString());
+		$numbers = array_map(
+			function (UnspecifiedType $el) {
+				return $el->asInteger()->intNumber();
+			},
+			$seq->at(1)
+				->asSequence()
+				->elements());
+		return new self($org, ...$numbers);
+	}
     
-    /**
-     * Get reference organization.
-     *
-     * @return DisplayText
-     */
-    public function organization(): DisplayText
-    {
-        return $this->_organization;
-    }
+	/**
+	 * Get reference organization.
+	 *
+	 * @return DisplayText
+	 */
+	public function organization(): DisplayText
+	{
+		return $this->_organization;
+	}
     
-    /**
-     * Get reference numbers.
-     *
-     * @return int[]
-     */
-    public function numbers(): array
-    {
-        return $this->_numbers;
-    }
+	/**
+	 * Get reference numbers.
+	 *
+	 * @return int[]
+	 */
+	public function numbers(): array
+	{
+		return $this->_numbers;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $org = $this->_organization->toASN1();
-        $nums = array_map(
-            function ($number) {
-                return new Integer($number);
-            }, $this->_numbers);
-        return new Sequence($org, new Sequence(...$nums));
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$org = $this->_organization->toASN1();
+		$nums = array_map(
+			function ($number) {
+				return new Integer($number);
+			}, $this->_numbers);
+		return new Sequence($org, new Sequence(...$nums));
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
     {
         $org = DisplayText::fromASN1($seq->at(0)->asString());
         $numbers = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return $el->asInteger()->intNumber();
             },
             $seq->at(1)
@@ -90,7 +90,7 @@ 
     {
         $org = $this->_organization->toASN1();
         $nums = array_map(
-            function ($number) {
+            function($number) {
                 return new Integer($number);
             }, $this->_numbers);
         return new Sequence($org, new Sequence(...$nums));