sop / x509

lib/X509/Certificate/Extension/AAControlsExtension.php

Spacing +4 added lines, -4 removed lines

@@ -91,7 +91,7 @@ 
                 ->asImplicit(Element::TYPE_SEQUENCE)
                 ->asSequence();
             $permitted = array_map(
-                function (UnspecifiedType $el) {
+                function(UnspecifiedType $el) {
                     return $el->asObjectIdentifier()->oid();
                 }, $attr_seq->elements());
             $idx++;
@@ -101,7 +101,7 @@ 
                 ->asImplicit(Element::TYPE_SEQUENCE)
                 ->asSequence();
             $excluded = array_map(
-                function (UnspecifiedType $el) {
+                function(UnspecifiedType $el) {
                     return $el->asObjectIdentifier()->oid();
                 }, $attr_seq->elements());
             $idx++;
@@ -211,14 +211,14 @@ 
         }
         if (isset($this->_permittedAttrs)) {
             $oids = array_map(
-                function ($oid) {
+                function($oid) {
                     return new ObjectIdentifier($oid);
                 }, $this->_permittedAttrs);
             $elements[] = new ImplicitlyTaggedType(0, new Sequence(...$oids));
         }
         if (isset($this->_excludedAttrs)) {
             $oids = array_map(
-                function ($oid) {
+                function($oid) {
                     return new ObjectIdentifier($oid);
                 }, $this->_excludedAttrs);
             $elements[] = new ImplicitlyTaggedType(1, new Sequence(...$oids));

Indentation +198 added lines, -198 removed lines

@@ -19,215 +19,215 @@
  */
 class AAControlsExtension extends Extension
 {
-    /**
-     * Path length contraint.
-     *
-     * @var int|null $_pathLenConstraint
-     */
-    protected $_pathLenConstraint;
+	/**
+	 * Path length contraint.
+	 *
+	 * @var int|null $_pathLenConstraint
+	 */
+	protected $_pathLenConstraint;
     
-    /**
-     * Permitted attributes.
-     *
-     * Array of OID's.
-     *
-     * @var string[]|null $_permittedAttrs
-     */
-    protected $_permittedAttrs;
+	/**
+	 * Permitted attributes.
+	 *
+	 * Array of OID's.
+	 *
+	 * @var string[]|null $_permittedAttrs
+	 */
+	protected $_permittedAttrs;
     
-    /**
-     * Excluded attributes.
-     *
-     * Array of OID's.
-     *
-     * @var string[]|null $_excludedAttrs
-     */
-    protected $_excludedAttrs;
+	/**
+	 * Excluded attributes.
+	 *
+	 * Array of OID's.
+	 *
+	 * @var string[]|null $_excludedAttrs
+	 */
+	protected $_excludedAttrs;
     
-    /**
-     * Whether to permit unspecified attributes.
-     *
-     * @var bool $_permitUnSpecified
-     */
-    protected $_permitUnSpecified;
+	/**
+	 * Whether to permit unspecified attributes.
+	 *
+	 * @var bool $_permitUnSpecified
+	 */
+	protected $_permitUnSpecified;
     
-    /**
-     * Constructor.
-     *
-     * @param bool $critical
-     * @param int|null $path_len
-     * @param string[]|null $permitted
-     * @param string[]|null $excluded
-     * @param bool $permit_unspecified
-     */
-    public function __construct(bool $critical, $path_len = null,
-        array $permitted = null, array $excluded = null, bool $permit_unspecified = true)
-    {
-        parent::__construct(self::OID_AA_CONTROLS, $critical);
-        $this->_pathLenConstraint = isset($path_len) ? intval($path_len) : null;
-        $this->_permittedAttrs = $permitted;
-        $this->_excludedAttrs = $excluded;
-        $this->_permitUnSpecified = $permit_unspecified;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $critical
+	 * @param int|null $path_len
+	 * @param string[]|null $permitted
+	 * @param string[]|null $excluded
+	 * @param bool $permit_unspecified
+	 */
+	public function __construct(bool $critical, $path_len = null,
+		array $permitted = null, array $excluded = null, bool $permit_unspecified = true)
+	{
+		parent::__construct(self::OID_AA_CONTROLS, $critical);
+		$this->_pathLenConstraint = isset($path_len) ? intval($path_len) : null;
+		$this->_permittedAttrs = $permitted;
+		$this->_excludedAttrs = $excluded;
+		$this->_permitUnSpecified = $permit_unspecified;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return self
-     */
-    protected static function _fromDER(string $data, bool $critical): self
-    {
-        $seq = UnspecifiedType::fromDER($data)->asSequence();
-        $path_len = null;
-        $permitted = null;
-        $excluded = null;
-        $permit_unspecified = true;
-        $idx = 0;
-        if ($seq->has($idx, Element::TYPE_INTEGER)) {
-            $path_len = $seq->at($idx++)
-                ->asInteger()
-                ->intNumber();
-        }
-        if ($seq->hasTagged(0)) {
-            $attr_seq = $seq->getTagged(0)
-                ->asImplicit(Element::TYPE_SEQUENCE)
-                ->asSequence();
-            $permitted = array_map(
-                function (UnspecifiedType $el) {
-                    return $el->asObjectIdentifier()->oid();
-                }, $attr_seq->elements());
-            $idx++;
-        }
-        if ($seq->hasTagged(1)) {
-            $attr_seq = $seq->getTagged(1)
-                ->asImplicit(Element::TYPE_SEQUENCE)
-                ->asSequence();
-            $excluded = array_map(
-                function (UnspecifiedType $el) {
-                    return $el->asObjectIdentifier()->oid();
-                }, $attr_seq->elements());
-            $idx++;
-        }
-        if ($seq->has($idx, Element::TYPE_BOOLEAN)) {
-            $permit_unspecified = $seq->at($idx++)
-                ->asBoolean()
-                ->value();
-        }
-        return new self($critical, $path_len, $permitted, $excluded,
-            $permit_unspecified);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return self
+	 */
+	protected static function _fromDER(string $data, bool $critical): self
+	{
+		$seq = UnspecifiedType::fromDER($data)->asSequence();
+		$path_len = null;
+		$permitted = null;
+		$excluded = null;
+		$permit_unspecified = true;
+		$idx = 0;
+		if ($seq->has($idx, Element::TYPE_INTEGER)) {
+			$path_len = $seq->at($idx++)
+				->asInteger()
+				->intNumber();
+		}
+		if ($seq->hasTagged(0)) {
+			$attr_seq = $seq->getTagged(0)
+				->asImplicit(Element::TYPE_SEQUENCE)
+				->asSequence();
+			$permitted = array_map(
+				function (UnspecifiedType $el) {
+					return $el->asObjectIdentifier()->oid();
+				}, $attr_seq->elements());
+			$idx++;
+		}
+		if ($seq->hasTagged(1)) {
+			$attr_seq = $seq->getTagged(1)
+				->asImplicit(Element::TYPE_SEQUENCE)
+				->asSequence();
+			$excluded = array_map(
+				function (UnspecifiedType $el) {
+					return $el->asObjectIdentifier()->oid();
+				}, $attr_seq->elements());
+			$idx++;
+		}
+		if ($seq->has($idx, Element::TYPE_BOOLEAN)) {
+			$permit_unspecified = $seq->at($idx++)
+				->asBoolean()
+				->value();
+		}
+		return new self($critical, $path_len, $permitted, $excluded,
+			$permit_unspecified);
+	}
     
-    /**
-     * Check whether path length constraint is present.
-     *
-     * @return bool
-     */
-    public function hasPathLen(): bool
-    {
-        return isset($this->_pathLenConstraint);
-    }
+	/**
+	 * Check whether path length constraint is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPathLen(): bool
+	{
+		return isset($this->_pathLenConstraint);
+	}
     
-    /**
-     * Get path length constraint.
-     *
-     * @throws \LogicException
-     * @return int
-     */
-    public function pathLen(): int
-    {
-        if (!$this->hasPathLen()) {
-            throw new \LogicException("pathLen not set.");
-        }
-        return $this->_pathLenConstraint;
-    }
+	/**
+	 * Get path length constraint.
+	 *
+	 * @throws \LogicException
+	 * @return int
+	 */
+	public function pathLen(): int
+	{
+		if (!$this->hasPathLen()) {
+			throw new \LogicException("pathLen not set.");
+		}
+		return $this->_pathLenConstraint;
+	}
     
-    /**
-     * Check whether permitted attributes are present.
-     *
-     * @return bool
-     */
-    public function hasPermittedAttrs(): bool
-    {
-        return isset($this->_permittedAttrs);
-    }
+	/**
+	 * Check whether permitted attributes are present.
+	 *
+	 * @return bool
+	 */
+	public function hasPermittedAttrs(): bool
+	{
+		return isset($this->_permittedAttrs);
+	}
     
-    /**
-     * Get OID's of permitted attributes.
-     *
-     * @throws \LogicException
-     * @return string[]
-     */
-    public function permittedAttrs(): array
-    {
-        if (!$this->hasPermittedAttrs()) {
-            throw new \LogicException("permittedAttrs not set.");
-        }
-        return $this->_permittedAttrs;
-    }
+	/**
+	 * Get OID's of permitted attributes.
+	 *
+	 * @throws \LogicException
+	 * @return string[]
+	 */
+	public function permittedAttrs(): array
+	{
+		if (!$this->hasPermittedAttrs()) {
+			throw new \LogicException("permittedAttrs not set.");
+		}
+		return $this->_permittedAttrs;
+	}
     
-    /**
-     * Check whether excluded attributes are present.
-     *
-     * @return bool
-     */
-    public function hasExcludedAttrs(): bool
-    {
-        return isset($this->_excludedAttrs);
-    }
+	/**
+	 * Check whether excluded attributes are present.
+	 *
+	 * @return bool
+	 */
+	public function hasExcludedAttrs(): bool
+	{
+		return isset($this->_excludedAttrs);
+	}
     
-    /**
-     * Get OID's of excluded attributes.
-     *
-     * @throws \LogicException
-     * @return string[]
-     */
-    public function excludedAttrs(): array
-    {
-        if (!$this->hasExcludedAttrs()) {
-            throw new \LogicException("excludedAttrs not set.");
-        }
-        return $this->_excludedAttrs;
-    }
+	/**
+	 * Get OID's of excluded attributes.
+	 *
+	 * @throws \LogicException
+	 * @return string[]
+	 */
+	public function excludedAttrs(): array
+	{
+		if (!$this->hasExcludedAttrs()) {
+			throw new \LogicException("excludedAttrs not set.");
+		}
+		return $this->_excludedAttrs;
+	}
     
-    /**
-     * Whether to permit attributes that are not explicitly specified in
-     * neither permitted nor excluded list.
-     *
-     * @return bool
-     */
-    public function permitUnspecified(): bool
-    {
-        return $this->_permitUnSpecified;
-    }
+	/**
+	 * Whether to permit attributes that are not explicitly specified in
+	 * neither permitted nor excluded list.
+	 *
+	 * @return bool
+	 */
+	public function permitUnspecified(): bool
+	{
+		return $this->_permitUnSpecified;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     * @return Sequence
-     */
-    protected function _valueASN1(): Sequence
-    {
-        $elements = array();
-        if (isset($this->_pathLenConstraint)) {
-            $elements[] = new Integer($this->_pathLenConstraint);
-        }
-        if (isset($this->_permittedAttrs)) {
-            $oids = array_map(
-                function ($oid) {
-                    return new ObjectIdentifier($oid);
-                }, $this->_permittedAttrs);
-            $elements[] = new ImplicitlyTaggedType(0, new Sequence(...$oids));
-        }
-        if (isset($this->_excludedAttrs)) {
-            $oids = array_map(
-                function ($oid) {
-                    return new ObjectIdentifier($oid);
-                }, $this->_excludedAttrs);
-            $elements[] = new ImplicitlyTaggedType(1, new Sequence(...$oids));
-        }
-        if ($this->_permitUnSpecified !== true) {
-            $elements[] = new Boolean(false);
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 * @return Sequence
+	 */
+	protected function _valueASN1(): Sequence
+	{
+		$elements = array();
+		if (isset($this->_pathLenConstraint)) {
+			$elements[] = new Integer($this->_pathLenConstraint);
+		}
+		if (isset($this->_permittedAttrs)) {
+			$oids = array_map(
+				function ($oid) {
+					return new ObjectIdentifier($oid);
+				}, $this->_permittedAttrs);
+			$elements[] = new ImplicitlyTaggedType(0, new Sequence(...$oids));
+		}
+		if (isset($this->_excludedAttrs)) {
+			$oids = array_map(
+				function ($oid) {
+					return new ObjectIdentifier($oid);
+				}, $this->_excludedAttrs);
+			$elements[] = new ImplicitlyTaggedType(1, new Sequence(...$oids));
+		}
+		if ($this->_permitUnSpecified !== true) {
+			$elements[] = new Boolean(false);
+		}
+		return new Sequence(...$elements);
+	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
         $qualifiers = array();
         if (count($seq) > 1) {
             $qualifiers = array_map(
-                function (UnspecifiedType $el) {
+                function(UnspecifiedType $el) {
                     return PolicyQualifierInfo::fromASN1($el->asSequence());
                 },
                 $seq->at(1)
@@ -188,7 +188,7 @@ 
         $elements = array(new ObjectIdentifier($this->_oid));
         if (count($this->_qualifiers)) {
             $qualifiers = array_map(
-                function (PolicyQualifierInfo $pqi) {
+                function(PolicyQualifierInfo $pqi) {
                     return $pqi->toASN1();
                 }, array_values($this->_qualifiers));
             $elements[] = new Sequence(...$qualifiers);

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/Feature/AttributeContainer.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
     {
         $oid = AttributeType::attrNameToOID($name);
         $attrs = array_filter($this->_attributes,
-            function (Attribute $attr) use ($oid) {
+            function(Attribute $attr) use ($oid) {
                 return $attr->oid() == $oid;
             });
         return array_values($attrs);
@@ -116,7 +116,7 @@ 
     {
         $obj = clone $this;
         $obj->_attributes = array_filter($obj->_attributes,
-            function (Attribute $a) use ($attr) {
+            function(Attribute $a) use ($attr) {
                 return $a->oid() != $attr->oid();
             });
         $obj->_attributes[] = $attr;

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/AttributeCertificate/Attribute/AuthenticationInfoAttributeValue.php

Indentation +14 added lines, -14 removed lines

@@ -11,19 +11,19 @@
  */
 class AuthenticationInfoAttributeValue extends SvceAuthInfo
 {
-    const OID = "1.3.6.1.5.5.7.10.1";
+	const OID = "1.3.6.1.5.5.7.10.1";
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $service
-     * @param GeneralName $ident
-     * @param string|null $auth_info
-     */
-    public function __construct(GeneralName $service, GeneralName $ident,
-        $auth_info = null)
-    {
-        parent::__construct($service, $ident, $auth_info);
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $service
+	 * @param GeneralName $ident
+	 * @param string|null $auth_info
+	 */
+	public function __construct(GeneralName $service, GeneralName $ident,
+		$auth_info = null)
+	{
+		parent::__construct($service, $ident, $auth_info);
+		$this->_oid = self::OID;
+	}
 }

lib/X509/AttributeCertificate/Attribute/ChargingIdentityAttributeValue.php

Indentation +11 added lines, -11 removed lines

@@ -9,16 +9,16 @@
  */
 class ChargingIdentityAttributeValue extends IetfAttrSyntax
 {
-    const OID = "1.3.6.1.5.5.7.10.3";
+	const OID = "1.3.6.1.5.5.7.10.3";
     
-    /**
-     * Constructor.
-     *
-     * @param IetfAttrValue ...$values
-     */
-    public function __construct(IetfAttrValue ...$values)
-    {
-        parent::__construct(...$values);
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param IetfAttrValue ...$values
+	 */
+	public function __construct(IetfAttrValue ...$values)
+	{
+		parent::__construct(...$values);
+		$this->_oid = self::OID;
+	}
 }

lib/X509/AttributeCertificate/Attribute/IetfAttrSyntax.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
             ++$idx;
         }
         $values = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return IetfAttrValue::fromASN1($el);
             },
             $seq->at($idx)
@@ -148,7 +148,7 @@ 
                 $this->_policyAuthority->toASN1());
         }
         $values = array_map(
-            function (IetfAttrValue $val) {
+            function(IetfAttrValue $val) {
                 return $val->toASN1();
             }, $this->_values);
         $elements[] = new Sequence(...$values);

Indentation +183 added lines, -183 removed lines

@@ -19,203 +19,203 @@
  * @link https://tools.ietf.org/html/rfc5755#section-4.4
  */
 abstract class IetfAttrSyntax extends AttributeValue implements 
-    \Countable,
-    \IteratorAggregate
+	\Countable,
+	\IteratorAggregate
 {
-    /**
-     * Policy authority.
-     *
-     * @var GeneralNames|null $_policyAuthority
-     */
-    protected $_policyAuthority;
+	/**
+	 * Policy authority.
+	 *
+	 * @var GeneralNames|null $_policyAuthority
+	 */
+	protected $_policyAuthority;
     
-    /**
-     * Values.
-     *
-     * @var IetfAttrValue[] $_values
-     */
-    protected $_values;
+	/**
+	 * Values.
+	 *
+	 * @var IetfAttrValue[] $_values
+	 */
+	protected $_values;
     
-    /**
-     * Constructor.
-     * 
-     * @param IetfAttrValue ...$values
-     */
-    public function __construct(IetfAttrValue ...$values)
-    {
-        $this->_policyAuthority = null;
-        $this->_values = $values;
-    }
+	/**
+	 * Constructor.
+	 * 
+	 * @param IetfAttrValue ...$values
+	 */
+	public function __construct(IetfAttrValue ...$values)
+	{
+		$this->_policyAuthority = null;
+		$this->_values = $values;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el): self
-    {
-        $seq = $el->asSequence();
-        $authority = null;
-        $idx = 0;
-        if ($seq->hasTagged(0)) {
-            $authority = GeneralNames::fromASN1(
-                $seq->getTagged(0)
-                    ->asImplicit(Element::TYPE_SEQUENCE)
-                    ->asSequence());
-            ++$idx;
-        }
-        $values = array_map(
-            function (UnspecifiedType $el) {
-                return IetfAttrValue::fromASN1($el);
-            },
-            $seq->at($idx)
-                ->asSequence()
-                ->elements());
-        $obj = new static(...$values);
-        $obj->_policyAuthority = $authority;
-        return $obj;
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el): self
+	{
+		$seq = $el->asSequence();
+		$authority = null;
+		$idx = 0;
+		if ($seq->hasTagged(0)) {
+			$authority = GeneralNames::fromASN1(
+				$seq->getTagged(0)
+					->asImplicit(Element::TYPE_SEQUENCE)
+					->asSequence());
+			++$idx;
+		}
+		$values = array_map(
+			function (UnspecifiedType $el) {
+				return IetfAttrValue::fromASN1($el);
+			},
+			$seq->at($idx)
+				->asSequence()
+				->elements());
+		$obj = new static(...$values);
+		$obj->_policyAuthority = $authority;
+		return $obj;
+	}
     
-    /**
-     * Get self with policy authority.
-     *
-     * @param GeneralNames $names
-     * @return self
-     */
-    public function withPolicyAuthority(GeneralNames $names): self
-    {
-        $obj = clone $this;
-        $obj->_policyAuthority = $names;
-        return $obj;
-    }
+	/**
+	 * Get self with policy authority.
+	 *
+	 * @param GeneralNames $names
+	 * @return self
+	 */
+	public function withPolicyAuthority(GeneralNames $names): self
+	{
+		$obj = clone $this;
+		$obj->_policyAuthority = $names;
+		return $obj;
+	}
     
-    /**
-     * Check whether policy authority is present.
-     *
-     * @return bool
-     */
-    public function hasPolicyAuthority(): bool
-    {
-        return isset($this->_policyAuthority);
-    }
+	/**
+	 * Check whether policy authority is present.
+	 *
+	 * @return bool
+	 */
+	public function hasPolicyAuthority(): bool
+	{
+		return isset($this->_policyAuthority);
+	}
     
-    /**
-     * Get policy authority.
-     *
-     * @throws \LogicException
-     * @return GeneralNames
-     */
-    public function policyAuthority(): GeneralNames
-    {
-        if (!$this->hasPolicyAuthority()) {
-            throw new \LogicException("policyAuthority not set.");
-        }
-        return $this->_policyAuthority;
-    }
+	/**
+	 * Get policy authority.
+	 *
+	 * @throws \LogicException
+	 * @return GeneralNames
+	 */
+	public function policyAuthority(): GeneralNames
+	{
+		if (!$this->hasPolicyAuthority()) {
+			throw new \LogicException("policyAuthority not set.");
+		}
+		return $this->_policyAuthority;
+	}
     
-    /**
-     * Get values.
-     *
-     * @return IetfAttrValue[]
-     */
-    public function values(): array
-    {
-        return $this->_values;
-    }
+	/**
+	 * Get values.
+	 *
+	 * @return IetfAttrValue[]
+	 */
+	public function values(): array
+	{
+		return $this->_values;
+	}
     
-    /**
-     * Get first value.
-     *
-     * @throws \LogicException
-     * @return IetfAttrValue
-     */
-    public function first(): IetfAttrValue
-    {
-        if (!count($this->_values)) {
-            throw new \LogicException("No values.");
-        }
-        return $this->_values[0];
-    }
+	/**
+	 * Get first value.
+	 *
+	 * @throws \LogicException
+	 * @return IetfAttrValue
+	 */
+	public function first(): IetfAttrValue
+	{
+		if (!count($this->_values)) {
+			throw new \LogicException("No values.");
+		}
+		return $this->_values[0];
+	}
     
-    /**
-     *
-     * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array();
-        if (isset($this->_policyAuthority)) {
-            $elements[] = new ImplicitlyTaggedType(0,
-                $this->_policyAuthority->toASN1());
-        }
-        $values = array_map(
-            function (IetfAttrValue $val) {
-                return $val->toASN1();
-            }, $this->_values);
-        $elements[] = new Sequence(...$values);
-        return new Sequence(...$elements);
-    }
+	/**
+	 *
+	 * @see \X501\ASN1\AttributeValue\AttributeValue::toASN1()
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array();
+		if (isset($this->_policyAuthority)) {
+			$elements[] = new ImplicitlyTaggedType(0,
+				$this->_policyAuthority->toASN1());
+		}
+		$values = array_map(
+			function (IetfAttrValue $val) {
+				return $val->toASN1();
+			}, $this->_values);
+		$elements[] = new Sequence(...$values);
+		return new Sequence(...$elements);
+	}
     
-    /**
-     *
-     * @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();
+	}
     
-    /**
-     * Get number of values.
-     *
-     * @see \Countable::count()
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_values);
-    }
+	/**
+	 * Get number of values.
+	 *
+	 * @see \Countable::count()
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_values);
+	}
     
-    /**
-     * Get iterator for values.
-     *
-     * @see \IteratorAggregate::getIterator()
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_values);
-    }
+	/**
+	 * Get iterator for values.
+	 *
+	 * @see \IteratorAggregate::getIterator()
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_values);
+	}
 }

lib/X509/AttributeCertificate/Attribute/AccessIdentityAttributeValue.php

Indentation +12 added lines, -12 removed lines

@@ -11,17 +11,17 @@
  */
 class AccessIdentityAttributeValue extends SvceAuthInfo
 {
-    const OID = "1.3.6.1.5.5.7.10.2";
+	const OID = "1.3.6.1.5.5.7.10.2";
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $service
-     * @param GeneralName $ident
-     */
-    public function __construct(GeneralName $service, GeneralName $ident)
-    {
-        parent::__construct($service, $ident, null);
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $service
+	 * @param GeneralName $ident
+	 */
+	public function __construct(GeneralName $service, GeneralName $ident)
+	{
+		parent::__construct($service, $ident, null);
+		$this->_oid = self::OID;
+	}
 }

lib/X509/AttributeCertificate/Attribute/GroupAttributeValue.php

Indentation +11 added lines, -11 removed lines

@@ -9,16 +9,16 @@
  */
 class GroupAttributeValue extends IetfAttrSyntax
 {
-    const OID = "1.3.6.1.5.5.7.10.4";
+	const OID = "1.3.6.1.5.5.7.10.4";
     
-    /**
-     * Constructor.
-     *
-     * @param IetfAttrValue ...$values
-     */
-    public function __construct(IetfAttrValue ...$values)
-    {
-        parent::__construct(...$values);
-        $this->_oid = self::OID;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param IetfAttrValue ...$values
+	 */
+	public function __construct(IetfAttrValue ...$values)
+	{
+		parent::__construct(...$values);
+		$this->_oid = self::OID;
+	}
 }

lib/X509/CertificationPath/Policy/PolicyTree.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
         // is not in the user-initial-policy-set and is not anyPolicy,
         // delete this node and all its children.
         $valid_policy_node_set = array_filter($valid_policy_node_set,
-            function (PolicyNode $node) use ($policies) {
+            function(PolicyNode $node) use ($policies) {
                 if ($node->isAnyPolicy()) {
                     return true;
                 }
@@ -104,7 +104,7 @@ 
             });
         // array of valid policy OIDs
         $valid_policy_set = array_map(
-            function (PolicyNode $node) {
+            function(PolicyNode $node) {
                 return $node->validPolicy();
             }, $valid_policy_node_set);
         // 3. If the valid_policy_tree includes a node of depth n with
@@ -384,7 +384,7 @@ 
         }
         // for each node in a tree
         $this->_root->walkNodes(
-            function (PolicyNode $node) use (&$set) {
+            function(PolicyNode $node) use (&$set) {
                 $parents = $node->parents();
                 // node has parents
                 if (count($parents)) {

Indentation +393 added lines, -393 removed lines

@@ -10,411 +10,411 @@
 
 class PolicyTree
 {
-    /**
-     * Root node at depth zero.
-     *
-     * @var PolicyNode|null
-     */
-    protected $_root;
+	/**
+	 * Root node at depth zero.
+	 *
+	 * @var PolicyNode|null
+	 */
+	protected $_root;
     
-    /**
-     * Constructor.
-     *
-     * @param PolicyNode $root Initial root node
-     */
-    public function __construct(PolicyNode $root)
-    {
-        $this->_root = $root;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param PolicyNode $root Initial root node
+	 */
+	public function __construct(PolicyNode $root)
+	{
+		$this->_root = $root;
+	}
     
-    /**
-     * Process policy information from the certificate.
-     *
-     * Certificate policies extension must be present.
-     *
-     * @param ValidatorState $state
-     * @param Certificate $cert
-     * @return ValidatorState
-     */
-    public function processPolicies(ValidatorState $state, Certificate $cert): ValidatorState
-    {
-        $policies = $cert->tbsCertificate()
-            ->extensions()
-            ->certificatePolicies();
-        $tree = clone $this;
-        // (d.1) for each policy P not equal to anyPolicy
-        foreach ($policies as $policy) {
-            if ($policy->isAnyPolicy()) {
-                $tree->_processAnyPolicy($policy, $cert, $state);
-            } else {
-                $tree->_processPolicy($policy, $state);
-            }
-        }
-        // if whole tree is pruned
-        if (!$tree->_pruneTree($state->index() - 1)) {
-            return $state->withoutValidPolicyTree();
-        }
-        return $state->withValidPolicyTree($tree);
-    }
+	/**
+	 * Process policy information from the certificate.
+	 *
+	 * Certificate policies extension must be present.
+	 *
+	 * @param ValidatorState $state
+	 * @param Certificate $cert
+	 * @return ValidatorState
+	 */
+	public function processPolicies(ValidatorState $state, Certificate $cert): ValidatorState
+	{
+		$policies = $cert->tbsCertificate()
+			->extensions()
+			->certificatePolicies();
+		$tree = clone $this;
+		// (d.1) for each policy P not equal to anyPolicy
+		foreach ($policies as $policy) {
+			if ($policy->isAnyPolicy()) {
+				$tree->_processAnyPolicy($policy, $cert, $state);
+			} else {
+				$tree->_processPolicy($policy, $state);
+			}
+		}
+		// if whole tree is pruned
+		if (!$tree->_pruneTree($state->index() - 1)) {
+			return $state->withoutValidPolicyTree();
+		}
+		return $state->withValidPolicyTree($tree);
+	}
     
-    /**
-     * Process policy mappings from the certificate.
-     *
-     * @param ValidatorState $state
-     * @param Certificate $cert
-     * @return ValidatorState
-     */
-    public function processMappings(ValidatorState $state, Certificate $cert): ValidatorState
-    {
-        $tree = clone $this;
-        if ($state->policyMapping() > 0) {
-            $tree->_applyMappings($cert, $state);
-        } else if ($state->policyMapping() == 0) {
-            $tree->_deleteMappings($cert, $state);
-        }
-        // if whole tree is pruned
-        if (!$tree->_root) {
-            return $state->withoutValidPolicyTree();
-        }
-        return $state->withValidPolicyTree($tree);
-    }
+	/**
+	 * Process policy mappings from the certificate.
+	 *
+	 * @param ValidatorState $state
+	 * @param Certificate $cert
+	 * @return ValidatorState
+	 */
+	public function processMappings(ValidatorState $state, Certificate $cert): ValidatorState
+	{
+		$tree = clone $this;
+		if ($state->policyMapping() > 0) {
+			$tree->_applyMappings($cert, $state);
+		} else if ($state->policyMapping() == 0) {
+			$tree->_deleteMappings($cert, $state);
+		}
+		// if whole tree is pruned
+		if (!$tree->_root) {
+			return $state->withoutValidPolicyTree();
+		}
+		return $state->withValidPolicyTree($tree);
+	}
     
-    /**
-     * Calculate policy intersection as specified in Wrap-Up Procedure 6.1.5.g.
-     *
-     * @param ValidatorState $state
-     * @param array $policies
-     * @return ValidatorState
-     */
-    public function calculateIntersection(ValidatorState $state, array $policies): ValidatorState
-    {
-        $tree = clone $this;
-        $valid_policy_node_set = $tree->_validPolicyNodeSet();
-        // 2. If the valid_policy of any node in the valid_policy_node_set
-        // is not in the user-initial-policy-set and is not anyPolicy,
-        // delete this node and all its children.
-        $valid_policy_node_set = array_filter($valid_policy_node_set,
-            function (PolicyNode $node) use ($policies) {
-                if ($node->isAnyPolicy()) {
-                    return true;
-                }
-                if (in_array($node->validPolicy(), $policies)) {
-                    return true;
-                }
-                $node->remove();
-                return false;
-            });
-        // array of valid policy OIDs
-        $valid_policy_set = array_map(
-            function (PolicyNode $node) {
-                return $node->validPolicy();
-            }, $valid_policy_node_set);
-        // 3. If the valid_policy_tree includes a node of depth n with
-        // the valid_policy anyPolicy and the user-initial-policy-set 
-        // is not any-policy
-        foreach ($tree->_nodesAtDepth($state->index()) as $node) {
-            if ($node->hasParent() && $node->isAnyPolicy()) {
-                // a. Set P-Q to the qualifier_set in the node of depth n
-                // with valid_policy anyPolicy.
-                $pq = $node->qualifiers();
-                // b. For each P-OID in the user-initial-policy-set that is not
-                // the valid_policy of a node in the valid_policy_node_set,
-                // create a child node whose parent is the node of depth n-1
-                // with the valid_policy anyPolicy.
-                $poids = array_diff($policies, $valid_policy_set);
-                foreach ($tree->_nodesAtDepth($state->index() - 1) as $parent) {
-                    if ($parent->isAnyPolicy()) {
-                        // Set the values in the child node as follows: 
-                        // set the valid_policy to P-OID, set the qualifier_set
-                        // to P-Q, and set the expected_policy_set to {P-OID}.
-                        foreach ($poids as $poid) {
-                            $parent->addChild(
-                                new PolicyNode($poid, $pq, array($poid)));
-                        }
-                        break;
-                    }
-                }
-                // c. Delete the node of depth n with the
-                // valid_policy anyPolicy.
-                $node->remove();
-            }
-        }
-        // 4. If there is a node in the valid_policy_tree of depth n-1 or less
-        // without any child nodes, delete that node. Repeat this step until
-        // there are no nodes of depth n-1 or less without children.
-        if (!$tree->_pruneTree($state->index() - 1)) {
-            return $state->withoutValidPolicyTree();
-        }
-        return $state->withValidPolicyTree($tree);
-    }
+	/**
+	 * Calculate policy intersection as specified in Wrap-Up Procedure 6.1.5.g.
+	 *
+	 * @param ValidatorState $state
+	 * @param array $policies
+	 * @return ValidatorState
+	 */
+	public function calculateIntersection(ValidatorState $state, array $policies): ValidatorState
+	{
+		$tree = clone $this;
+		$valid_policy_node_set = $tree->_validPolicyNodeSet();
+		// 2. If the valid_policy of any node in the valid_policy_node_set
+		// is not in the user-initial-policy-set and is not anyPolicy,
+		// delete this node and all its children.
+		$valid_policy_node_set = array_filter($valid_policy_node_set,
+			function (PolicyNode $node) use ($policies) {
+				if ($node->isAnyPolicy()) {
+					return true;
+				}
+				if (in_array($node->validPolicy(), $policies)) {
+					return true;
+				}
+				$node->remove();
+				return false;
+			});
+		// array of valid policy OIDs
+		$valid_policy_set = array_map(
+			function (PolicyNode $node) {
+				return $node->validPolicy();
+			}, $valid_policy_node_set);
+		// 3. If the valid_policy_tree includes a node of depth n with
+		// the valid_policy anyPolicy and the user-initial-policy-set 
+		// is not any-policy
+		foreach ($tree->_nodesAtDepth($state->index()) as $node) {
+			if ($node->hasParent() && $node->isAnyPolicy()) {
+				// a. Set P-Q to the qualifier_set in the node of depth n
+				// with valid_policy anyPolicy.
+				$pq = $node->qualifiers();
+				// b. For each P-OID in the user-initial-policy-set that is not
+				// the valid_policy of a node in the valid_policy_node_set,
+				// create a child node whose parent is the node of depth n-1
+				// with the valid_policy anyPolicy.
+				$poids = array_diff($policies, $valid_policy_set);
+				foreach ($tree->_nodesAtDepth($state->index() - 1) as $parent) {
+					if ($parent->isAnyPolicy()) {
+						// Set the values in the child node as follows: 
+						// set the valid_policy to P-OID, set the qualifier_set
+						// to P-Q, and set the expected_policy_set to {P-OID}.
+						foreach ($poids as $poid) {
+							$parent->addChild(
+								new PolicyNode($poid, $pq, array($poid)));
+						}
+						break;
+					}
+				}
+				// c. Delete the node of depth n with the
+				// valid_policy anyPolicy.
+				$node->remove();
+			}
+		}
+		// 4. If there is a node in the valid_policy_tree of depth n-1 or less
+		// without any child nodes, delete that node. Repeat this step until
+		// there are no nodes of depth n-1 or less without children.
+		if (!$tree->_pruneTree($state->index() - 1)) {
+			return $state->withoutValidPolicyTree();
+		}
+		return $state->withValidPolicyTree($tree);
+	}
     
-    /**
-     * Get policies at given policy tree depth.
-     *
-     * @param int $i Depth in range 1..n
-     * @return PolicyInformation[]
-     */
-    public function policiesAtDepth(int $i): array
-    {
-        $policies = array();
-        foreach ($this->_nodesAtDepth($i) as $node) {
-            $policies[] = new PolicyInformation($node->validPolicy(),
-                ...$node->qualifiers());
-        }
-        return $policies;
-    }
+	/**
+	 * Get policies at given policy tree depth.
+	 *
+	 * @param int $i Depth in range 1..n
+	 * @return PolicyInformation[]
+	 */
+	public function policiesAtDepth(int $i): array
+	{
+		$policies = array();
+		foreach ($this->_nodesAtDepth($i) as $node) {
+			$policies[] = new PolicyInformation($node->validPolicy(),
+				...$node->qualifiers());
+		}
+		return $policies;
+	}
     
-    /**
-     * Process single policy information.
-     *
-     * @param PolicyInformation $policy
-     * @param ValidatorState $state
-     */
-    protected function _processPolicy(PolicyInformation $policy,
-        ValidatorState $state)
-    {
-        $p_oid = $policy->oid();
-        $i = $state->index();
-        $match_count = 0;
-        // (d.1.i) for each node of depth i-1 in the valid_policy_tree...
-        foreach ($this->_nodesAtDepth($i - 1) as $node) {
-            // ...where P-OID is in the expected_policy_set
-            if ($node->hasExpectedPolicy($p_oid)) {
-                $node->addChild(
-                    new PolicyNode($p_oid, $policy->qualifiers(), array($p_oid)));
-                ++$match_count;
-            }
-        }
-        // (d.1.ii) if there was no match in step (i)...
-        if (!$match_count) {
-            // ...and the valid_policy_tree includes a node of depth i-1 with
-            // the valid_policy anyPolicy
-            foreach ($this->_nodesAtDepth($i - 1) as $node) {
-                if ($node->isAnyPolicy()) {
-                    $node->addChild(
-                        new PolicyNode($p_oid, $policy->qualifiers(),
-                            array($p_oid)));
-                }
-            }
-        }
-    }
+	/**
+	 * Process single policy information.
+	 *
+	 * @param PolicyInformation $policy
+	 * @param ValidatorState $state
+	 */
+	protected function _processPolicy(PolicyInformation $policy,
+		ValidatorState $state)
+	{
+		$p_oid = $policy->oid();
+		$i = $state->index();
+		$match_count = 0;
+		// (d.1.i) for each node of depth i-1 in the valid_policy_tree...
+		foreach ($this->_nodesAtDepth($i - 1) as $node) {
+			// ...where P-OID is in the expected_policy_set
+			if ($node->hasExpectedPolicy($p_oid)) {
+				$node->addChild(
+					new PolicyNode($p_oid, $policy->qualifiers(), array($p_oid)));
+				++$match_count;
+			}
+		}
+		// (d.1.ii) if there was no match in step (i)...
+		if (!$match_count) {
+			// ...and the valid_policy_tree includes a node of depth i-1 with
+			// the valid_policy anyPolicy
+			foreach ($this->_nodesAtDepth($i - 1) as $node) {
+				if ($node->isAnyPolicy()) {
+					$node->addChild(
+						new PolicyNode($p_oid, $policy->qualifiers(),
+							array($p_oid)));
+				}
+			}
+		}
+	}
     
-    /**
-     * Process anyPolicy policy information.
-     *
-     * @param PolicyInformation $policy
-     * @param Certificate $cert
-     * @param ValidatorState $state
-     */
-    protected function _processAnyPolicy(PolicyInformation $policy,
-        Certificate $cert, ValidatorState $state)
-    {
-        $i = $state->index();
-        // if (a) inhibit_anyPolicy is greater than 0 or
-        // (b) i<n and the certificate is self-issued
-        if (!($state->inhibitAnyPolicy() > 0 ||
-             ($i < $state->pathLength() && $cert->isSelfIssued()))) {
-            return;
-        }
-        // for each node in the valid_policy_tree of depth i-1
-        foreach ($this->_nodesAtDepth($i - 1) as $node) {
-            // for each value in the expected_policy_set
-            foreach ($node->expectedPolicies() as $p_oid) {
-                // that does not appear in a child node
-                if (!$node->hasChildWithValidPolicy($p_oid)) {
-                    $node->addChild(
-                        new PolicyNode($p_oid, $policy->qualifiers(),
-                            array($p_oid)));
-                }
-            }
-        }
-    }
+	/**
+	 * Process anyPolicy policy information.
+	 *
+	 * @param PolicyInformation $policy
+	 * @param Certificate $cert
+	 * @param ValidatorState $state
+	 */
+	protected function _processAnyPolicy(PolicyInformation $policy,
+		Certificate $cert, ValidatorState $state)
+	{
+		$i = $state->index();
+		// if (a) inhibit_anyPolicy is greater than 0 or
+		// (b) i<n and the certificate is self-issued
+		if (!($state->inhibitAnyPolicy() > 0 ||
+			 ($i < $state->pathLength() && $cert->isSelfIssued()))) {
+			return;
+		}
+		// for each node in the valid_policy_tree of depth i-1
+		foreach ($this->_nodesAtDepth($i - 1) as $node) {
+			// for each value in the expected_policy_set
+			foreach ($node->expectedPolicies() as $p_oid) {
+				// that does not appear in a child node
+				if (!$node->hasChildWithValidPolicy($p_oid)) {
+					$node->addChild(
+						new PolicyNode($p_oid, $policy->qualifiers(),
+							array($p_oid)));
+				}
+			}
+		}
+	}
     
-    /**
-     * Apply policy mappings to the policy tree.
-     *
-     * @param Certificate $cert
-     * @param ValidatorState $state
-     */
-    protected function _applyMappings(Certificate $cert, ValidatorState $state)
-    {
-        $policy_mappings = $cert->tbsCertificate()
-            ->extensions()
-            ->policyMappings();
-        // (6.1.4. b.1.) for each node in the valid_policy_tree of depth i...
-        foreach ($policy_mappings->flattenedMappings() as $idp => $sdps) {
-            $match_count = 0;
-            foreach ($this->_nodesAtDepth($state->index()) as $node) {
-                // ...where ID-P is the valid_policy
-                if ($node->validPolicy() == $idp) {
-                    // set expected_policy_set to the set of subjectDomainPolicy
-                    // values that are specified as equivalent to ID-P by
-                    // the policy mappings extension
-                    $node->setExpectedPolicies(...$sdps);
-                    ++$match_count;
-                }
-            }
-            // if no node of depth i in the valid_policy_tree has
-            // a valid_policy of ID-P...
-            if (!$match_count) {
-                $this->_applyAnyPolicyMapping($cert, $state, $idp, $sdps);
-            }
-        }
-    }
+	/**
+	 * Apply policy mappings to the policy tree.
+	 *
+	 * @param Certificate $cert
+	 * @param ValidatorState $state
+	 */
+	protected function _applyMappings(Certificate $cert, ValidatorState $state)
+	{
+		$policy_mappings = $cert->tbsCertificate()
+			->extensions()
+			->policyMappings();
+		// (6.1.4. b.1.) for each node in the valid_policy_tree of depth i...
+		foreach ($policy_mappings->flattenedMappings() as $idp => $sdps) {
+			$match_count = 0;
+			foreach ($this->_nodesAtDepth($state->index()) as $node) {
+				// ...where ID-P is the valid_policy
+				if ($node->validPolicy() == $idp) {
+					// set expected_policy_set to the set of subjectDomainPolicy
+					// values that are specified as equivalent to ID-P by
+					// the policy mappings extension
+					$node->setExpectedPolicies(...$sdps);
+					++$match_count;
+				}
+			}
+			// if no node of depth i in the valid_policy_tree has
+			// a valid_policy of ID-P...
+			if (!$match_count) {
+				$this->_applyAnyPolicyMapping($cert, $state, $idp, $sdps);
+			}
+		}
+	}
     
-    /**
-     * Apply anyPolicy mapping to the policy tree as specified in 6.1.4 (b)(1).
-     *
-     * @param Certificate $cert
-     * @param ValidatorState $state
-     * @param string $idp OID of the issuer domain policy
-     * @param array $sdps Array of subject domain policy OIDs
-     */
-    protected function _applyAnyPolicyMapping(Certificate $cert,
-        ValidatorState $state, $idp, array $sdps)
-    {
-        // (6.1.4. b.1.) ...but there is a node of depth i with
-        // a valid_policy of anyPolicy
-        foreach ($this->_nodesAtDepth($state->index()) as $node) {
-            if ($node->isAnyPolicy()) {
-                // then generate a child node of the node of depth i-1
-                // that has a valid_policy of anyPolicy as follows...
-                foreach ($this->_nodesAtDepth($state->index() - 1) as $node) {
-                    if ($node->isAnyPolicy()) {
-                        // try to fetch qualifiers of anyPolicy certificate policy
-                        $qualifiers = array();
-                        try {
-                            $qualifiers = $cert->tbsCertificate()
-                                ->extensions()
-                                ->certificatePolicies()
-                                ->anyPolicy()
-                                ->qualifiers();
-                        } catch (\LogicException $e) {
-                            // if there's no policies or no qualifiers
-                        }
-                        $node->addChild(
-                            new PolicyNode($idp, $qualifiers, $sdps));
-                        // bail after first anyPolicy has been processed
-                        break;
-                    }
-                }
-                // bail after first anyPolicy has been processed
-                break;
-            }
-        }
-    }
+	/**
+	 * Apply anyPolicy mapping to the policy tree as specified in 6.1.4 (b)(1).
+	 *
+	 * @param Certificate $cert
+	 * @param ValidatorState $state
+	 * @param string $idp OID of the issuer domain policy
+	 * @param array $sdps Array of subject domain policy OIDs
+	 */
+	protected function _applyAnyPolicyMapping(Certificate $cert,
+		ValidatorState $state, $idp, array $sdps)
+	{
+		// (6.1.4. b.1.) ...but there is a node of depth i with
+		// a valid_policy of anyPolicy
+		foreach ($this->_nodesAtDepth($state->index()) as $node) {
+			if ($node->isAnyPolicy()) {
+				// then generate a child node of the node of depth i-1
+				// that has a valid_policy of anyPolicy as follows...
+				foreach ($this->_nodesAtDepth($state->index() - 1) as $node) {
+					if ($node->isAnyPolicy()) {
+						// try to fetch qualifiers of anyPolicy certificate policy
+						$qualifiers = array();
+						try {
+							$qualifiers = $cert->tbsCertificate()
+								->extensions()
+								->certificatePolicies()
+								->anyPolicy()
+								->qualifiers();
+						} catch (\LogicException $e) {
+							// if there's no policies or no qualifiers
+						}
+						$node->addChild(
+							new PolicyNode($idp, $qualifiers, $sdps));
+						// bail after first anyPolicy has been processed
+						break;
+					}
+				}
+				// bail after first anyPolicy has been processed
+				break;
+			}
+		}
+	}
     
-    /**
-     * Delete nodes as specified in 6.1.4 (b)(2).
-     *
-     * @param Certificate $cert
-     * @param ValidatorState $state
-     */
-    protected function _deleteMappings(Certificate $cert, ValidatorState $state)
-    {
-        $idps = $cert->tbsCertificate()
-            ->extensions()
-            ->policyMappings()
-            ->issuerDomainPolicies();
-        // delete each node of depth i in the valid_policy_tree
-        // where ID-P is the valid_policy
-        foreach ($this->_nodesAtDepth($state->index()) as $node) {
-            if (in_array($node->validPolicy(), $idps)) {
-                $node->remove();
-            }
-        }
-        $this->_pruneTree($state->index() - 1);
-    }
+	/**
+	 * Delete nodes as specified in 6.1.4 (b)(2).
+	 *
+	 * @param Certificate $cert
+	 * @param ValidatorState $state
+	 */
+	protected function _deleteMappings(Certificate $cert, ValidatorState $state)
+	{
+		$idps = $cert->tbsCertificate()
+			->extensions()
+			->policyMappings()
+			->issuerDomainPolicies();
+		// delete each node of depth i in the valid_policy_tree
+		// where ID-P is the valid_policy
+		foreach ($this->_nodesAtDepth($state->index()) as $node) {
+			if (in_array($node->validPolicy(), $idps)) {
+				$node->remove();
+			}
+		}
+		$this->_pruneTree($state->index() - 1);
+	}
     
-    /**
-     * Prune tree starting from given depth.
-     *
-     * @param int $depth
-     * @return int The number of nodes left in a tree
-     */
-    protected function _pruneTree(int $depth): int
-    {
-        for ($i = $depth; $i > 0; --$i) {
-            foreach ($this->_nodesAtDepth($i) as $node) {
-                if (!count($node)) {
-                    $node->remove();
-                }
-            }
-        }
-        // if root has no children left
-        if (!count($this->_root)) {
-            $this->_root = null;
-            return 0;
-        }
-        return $this->_root->nodeCount();
-    }
+	/**
+	 * Prune tree starting from given depth.
+	 *
+	 * @param int $depth
+	 * @return int The number of nodes left in a tree
+	 */
+	protected function _pruneTree(int $depth): int
+	{
+		for ($i = $depth; $i > 0; --$i) {
+			foreach ($this->_nodesAtDepth($i) as $node) {
+				if (!count($node)) {
+					$node->remove();
+				}
+			}
+		}
+		// if root has no children left
+		if (!count($this->_root)) {
+			$this->_root = null;
+			return 0;
+		}
+		return $this->_root->nodeCount();
+	}
     
-    /**
-     * Get all nodes at given depth.
-     *
-     * @param int $i
-     * @return PolicyNode[]
-     */
-    protected function _nodesAtDepth(int $i): array
-    {
-        if (!$this->_root) {
-            return array();
-        }
-        $depth = 0;
-        $nodes = array($this->_root);
-        while ($depth < $i) {
-            $nodes = self::_gatherChildren(...$nodes);
-            if (!count($nodes)) {
-                break;
-            }
-            ++$depth;
-        }
-        return $nodes;
-    }
+	/**
+	 * Get all nodes at given depth.
+	 *
+	 * @param int $i
+	 * @return PolicyNode[]
+	 */
+	protected function _nodesAtDepth(int $i): array
+	{
+		if (!$this->_root) {
+			return array();
+		}
+		$depth = 0;
+		$nodes = array($this->_root);
+		while ($depth < $i) {
+			$nodes = self::_gatherChildren(...$nodes);
+			if (!count($nodes)) {
+				break;
+			}
+			++$depth;
+		}
+		return $nodes;
+	}
     
-    /**
-     * Get the valid policy node set as specified in spec 6.1.5.(g)(iii)1.
-     *
-     * @return PolicyNode[]
-     */
-    protected function _validPolicyNodeSet(): array
-    {
-        // 1. Determine the set of policy nodes whose parent nodes have
-        // a valid_policy of anyPolicy. This is the valid_policy_node_set.
-        $set = array();
-        if (!$this->_root) {
-            return $set;
-        }
-        // for each node in a tree
-        $this->_root->walkNodes(
-            function (PolicyNode $node) use (&$set) {
-                $parents = $node->parents();
-                // node has parents
-                if (count($parents)) {
-                    // check that each ancestor is an anyPolicy node
-                    foreach ($parents as $ancestor) {
-                        if (!$ancestor->isAnyPolicy()) {
-                            return;
-                        }
-                    }
-                    $set[] = $node;
-                }
-            });
-        return $set;
-    }
+	/**
+	 * Get the valid policy node set as specified in spec 6.1.5.(g)(iii)1.
+	 *
+	 * @return PolicyNode[]
+	 */
+	protected function _validPolicyNodeSet(): array
+	{
+		// 1. Determine the set of policy nodes whose parent nodes have
+		// a valid_policy of anyPolicy. This is the valid_policy_node_set.
+		$set = array();
+		if (!$this->_root) {
+			return $set;
+		}
+		// for each node in a tree
+		$this->_root->walkNodes(
+			function (PolicyNode $node) use (&$set) {
+				$parents = $node->parents();
+				// node has parents
+				if (count($parents)) {
+					// check that each ancestor is an anyPolicy node
+					foreach ($parents as $ancestor) {
+						if (!$ancestor->isAnyPolicy()) {
+							return;
+						}
+					}
+					$set[] = $node;
+				}
+			});
+		return $set;
+	}
     
-    /**
-     * Gather all children of given nodes to a flattened array.
-     *
-     * @param PolicyNode ...$nodes
-     * @return PolicyNode[]
-     */
-    private static function _gatherChildren(PolicyNode ...$nodes): array
-    {
-        $children = array();
-        foreach ($nodes as $node) {
-            $children = array_merge($children, $node->children());
-        }
-        return $children;
-    }
+	/**
+	 * Gather all children of given nodes to a flattened array.
+	 *
+	 * @param PolicyNode ...$nodes
+	 * @return PolicyNode[]
+	 */
+	private static function _gatherChildren(PolicyNode ...$nodes): array
+	{
+		$children = array();
+		foreach ($nodes as $node) {
+			$children = array_merge($children, $node->children());
+		}
+		return $children;
+	}
 }