sop / x509

lib/X509/GeneralName/IPv4Address.php

Switch Indentation +9 added lines, -9 removed lines

@@ -16,15 +16,15 @@
         $mask = null;
         $bytes = unpack("C*", $octets);
         switch (count($bytes)) {
-            case 4:
-                $ip = implode(".", $bytes);
-                break;
-            case 8:
-                $ip = implode(".", array_slice($bytes, 0, 4));
-                $mask = implode(".", array_slice($bytes, 4, 4));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv4 octet length.");
+        case 4:
+            $ip = implode(".", $bytes);
+            break;
+        case 8:
+            $ip = implode(".", array_slice($bytes, 0, 4));
+            $mask = implode(".", array_slice($bytes, 4, 4));
+            break;
+        default:
+            throw new \UnexpectedValueException("Invalid IPv4 octet length.");
         }
         return new self($ip, $mask);
     }

Indentation +37 added lines, -37 removed lines

@@ -6,42 +6,42 @@
 
 class IPv4Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     * @throws \InvalidArgumentException
-     * @return self
-     */
-    public static function fromOctets(string $octets): self
-    {
-        $mask = null;
-        $bytes = unpack("C*", $octets);
-        switch (count($bytes)) {
-            case 4:
-                $ip = implode(".", $bytes);
-                break;
-            case 8:
-                $ip = implode(".", array_slice($bytes, 0, 4));
-                $mask = implode(".", array_slice($bytes, 4, 4));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv4 octet length.");
-        }
-        return new self($ip, $mask);
-    }
+	/**
+	 * Initialize from octets.
+	 *
+	 * @param string $octets
+	 * @throws \InvalidArgumentException
+	 * @return self
+	 */
+	public static function fromOctets(string $octets): self
+	{
+		$mask = null;
+		$bytes = unpack("C*", $octets);
+		switch (count($bytes)) {
+			case 4:
+				$ip = implode(".", $bytes);
+				break;
+			case 8:
+				$ip = implode(".", array_slice($bytes, 0, 4));
+				$mask = implode(".", array_slice($bytes, 4, 4));
+				break;
+			default:
+				throw new \UnexpectedValueException("Invalid IPv4 octet length.");
+		}
+		return new self($ip, $mask);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _octets(): string
-    {
-        $bytes = array_map("intval", explode(".", $this->_ip));
-        if (isset($this->_mask)) {
-            $bytes = array_merge($bytes,
-                array_map("intval", explode(".", $this->_mask)));
-        }
-        return pack("C*", ...$bytes);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _octets(): string
+	{
+		$bytes = array_map("intval", explode(".", $this->_ip));
+		if (isset($this->_mask)) {
+			$bytes = array_merge($bytes,
+				array_map("intval", explode(".", $this->_mask)));
+		}
+		return pack("C*", ...$bytes);
+	}
 }

lib/X509/GeneralName/IPAddress.php

Switch Indentation +9 added lines, -9 removed lines

@@ -59,15 +59,15 @@
     {
         $octets = $el->asOctetString()->string();
         switch (strlen($octets)) {
-            case 4:
-            case 8:
-                return IPv4Address::fromOctets($octets);
-            case 16:
-            case 32:
-                return IPv6Address::fromOctets($octets);
-            default:
-                throw new \UnexpectedValueException(
-                    "Invalid octet length for IP address.");
+        case 4:
+        case 8:
+            return IPv4Address::fromOctets($octets);
+        case 16:
+        case 32:
+            return IPv6Address::fromOctets($octets);
+        default:
+            throw new \UnexpectedValueException(
+                "Invalid octet length for IP address.");
         }
     }
     

Indentation +85 added lines, -85 removed lines

@@ -19,97 +19,97 @@
  */
 abstract class IPAddress extends GeneralName
 {
-    /**
-     * IP address.
-     *
-     * @var string $_ip
-     */
-    protected $_ip;
+	/**
+	 * IP address.
+	 *
+	 * @var string $_ip
+	 */
+	protected $_ip;
     
-    /**
-     * Subnet mask.
-     *
-     * @var string|null $_mask
-     */
-    protected $_mask;
+	/**
+	 * Subnet mask.
+	 *
+	 * @var string|null $_mask
+	 */
+	protected $_mask;
     
-    /**
-     * Get octet representation of the IP address.
-     *
-     * @return string
-     */
-    abstract protected function _octets();
+	/**
+	 * Get octet representation of the IP address.
+	 *
+	 * @return string
+	 */
+	abstract protected function _octets();
     
-    /**
-     * Constructor.
-     *
-     * @param string $ip
-     * @param string|null $mask
-     */
-    public function __construct(string $ip, $mask = null)
-    {
-        $this->_tag = self::TAG_IP_ADDRESS;
-        $this->_ip = $ip;
-        $this->_mask = $mask;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $ip
+	 * @param string|null $mask
+	 */
+	public function __construct(string $ip, $mask = null)
+	{
+		$this->_tag = self::TAG_IP_ADDRESS;
+		$this->_ip = $ip;
+		$this->_mask = $mask;
+	}
     
-    /**
-     *
-     * @param UnspecifiedType $el
-     * @return self
-     */
-    public static function fromChosenASN1(UnspecifiedType $el): self
-    {
-        $octets = $el->asOctetString()->string();
-        switch (strlen($octets)) {
-            case 4:
-            case 8:
-                return IPv4Address::fromOctets($octets);
-            case 16:
-            case 32:
-                return IPv6Address::fromOctets($octets);
-            default:
-                throw new \UnexpectedValueException(
-                    "Invalid octet length for IP address.");
-        }
-    }
+	/**
+	 *
+	 * @param UnspecifiedType $el
+	 * @return self
+	 */
+	public static function fromChosenASN1(UnspecifiedType $el): self
+	{
+		$octets = $el->asOctetString()->string();
+		switch (strlen($octets)) {
+			case 4:
+			case 8:
+				return IPv4Address::fromOctets($octets);
+			case 16:
+			case 32:
+				return IPv6Address::fromOctets($octets);
+			default:
+				throw new \UnexpectedValueException(
+					"Invalid octet length for IP address.");
+		}
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function string(): string
-    {
-        return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : "");
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function string(): string
+	{
+		return $this->_ip . (isset($this->_mask) ? "/" . $this->_mask : "");
+	}
     
-    /**
-     * Get IP address as a string.
-     *
-     * @return string
-     */
-    public function address(): string
-    {
-        return $this->_ip;
-    }
+	/**
+	 * Get IP address as a string.
+	 *
+	 * @return string
+	 */
+	public function address(): string
+	{
+		return $this->_ip;
+	}
     
-    /**
-     * Get subnet mask as a string.
-     *
-     * @return string
-     */
-    public function mask(): string
-    {
-        return $this->_mask;
-    }
+	/**
+	 * Get subnet mask as a string.
+	 *
+	 * @return string
+	 */
+	public function mask(): string
+	{
+		return $this->_mask;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _choiceASN1(): TaggedType
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new OctetString($this->_octets()));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1(): TaggedType
+	{
+		return new ImplicitlyTaggedType($this->_tag,
+			new OctetString($this->_octets()));
+	}
 }

lib/X509/GeneralName/IPv6Address.php

Switch Indentation +9 added lines, -9 removed lines

@@ -16,15 +16,15 @@
         $mask = null;
         $words = unpack("n*", $octets);
         switch (count($words)) {
-            case 8:
-                $ip = self::_wordsToIPv6String($words);
-                break;
-            case 16:
-                $ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
-                $mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv6 octet length.");
+        case 8:
+            $ip = self::_wordsToIPv6String($words);
+            break;
+        case 16:
+            $ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
+            $mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
+            break;
+        default:
+            throw new \UnexpectedValueException("Invalid IPv6 octet length.");
         }
         return new self($ip, $mask);
     }

Indentation +51 added lines, -51 removed lines

@@ -6,57 +6,57 @@
 
 class IPv6Address extends IPAddress
 {
-    /**
-     * Initialize from octets.
-     *
-     * @param string $octets
-     * @throws \InvalidArgumentException
-     * @return self
-     */
-    public static function fromOctets(string $octets): self
-    {
-        $mask = null;
-        $words = unpack("n*", $octets);
-        switch (count($words)) {
-            case 8:
-                $ip = self::_wordsToIPv6String($words);
-                break;
-            case 16:
-                $ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
-                $mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
-                break;
-            default:
-                throw new \UnexpectedValueException("Invalid IPv6 octet length.");
-        }
-        return new self($ip, $mask);
-    }
+	/**
+	 * Initialize from octets.
+	 *
+	 * @param string $octets
+	 * @throws \InvalidArgumentException
+	 * @return self
+	 */
+	public static function fromOctets(string $octets): self
+	{
+		$mask = null;
+		$words = unpack("n*", $octets);
+		switch (count($words)) {
+			case 8:
+				$ip = self::_wordsToIPv6String($words);
+				break;
+			case 16:
+				$ip = self::_wordsToIPv6String(array_slice($words, 0, 8));
+				$mask = self::_wordsToIPv6String(array_slice($words, 8, 8));
+				break;
+			default:
+				throw new \UnexpectedValueException("Invalid IPv6 octet length.");
+		}
+		return new self($ip, $mask);
+	}
     
-    /**
-     * Convert an array of 16 bit words to an IPv6 string representation.
-     *
-     * @param int[] $words
-     * @return string
-     */
-    protected static function _wordsToIPv6String(array $words): string
-    {
-        $groups = array_map(
-            function ($word) {
-                return sprintf("%04x", $word);
-            }, $words);
-        return implode(":", $groups);
-    }
+	/**
+	 * Convert an array of 16 bit words to an IPv6 string representation.
+	 *
+	 * @param int[] $words
+	 * @return string
+	 */
+	protected static function _wordsToIPv6String(array $words): string
+	{
+		$groups = array_map(
+			function ($word) {
+				return sprintf("%04x", $word);
+			}, $words);
+		return implode(":", $groups);
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    protected function _octets(): string
-    {
-        $words = array_map("hexdec", explode(":", $this->_ip));
-        if (isset($this->_mask)) {
-            $words = array_merge($words,
-                array_map("hexdec", explode(":", $this->_mask)));
-        }
-        return pack("n*", ...$words);
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _octets(): string
+	{
+		$words = array_map("hexdec", explode(":", $this->_ip));
+		if (isset($this->_mask)) {
+			$words = array_merge($words,
+				array_map("hexdec", explode(":", $this->_mask)));
+		}
+		return pack("n*", ...$words);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     protected static function _wordsToIPv6String(array $words): string
     {
         $groups = array_map(
-            function ($word) {
+            function($word) {
                 return sprintf("%04x", $word);
             }, $words);
         return implode(":", $groups);

lib/X509/GeneralName/GeneralName.php

Switch Indentation +37 added lines, -37 removed lines

@@ -68,43 +68,43 @@
     {
         switch ($el->tag()) {
             // otherName
-            case self::TAG_OTHER_NAME:
-                return OtherName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // rfc822Name
-            case self::TAG_RFC822_NAME:
-                return RFC822Name::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // dNSName
-            case self::TAG_DNS_NAME:
-                return DNSName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // x400Address
-            case self::TAG_X400_ADDRESS:
-                return X400Address::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // directoryName
-            case self::TAG_DIRECTORY_NAME:
-                // because Name is a CHOICE, albeit having only one option,
-                // explicit tagging must be used
-                // (see X.680 07/2002 30.6.c)
-                return DirectoryName::fromChosenASN1($el->asExplicit());
-            // ediPartyName
-            case self::TAG_EDI_PARTY_NAME:
-                return EDIPartyName::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_SEQUENCE));
-            // uniformResourceIdentifier
-            case self::TAG_URI:
-                return UniformResourceIdentifier::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_IA5_STRING));
-            // iPAddress
-            case self::TAG_IP_ADDRESS:
-                return IPAddress::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_OCTET_STRING));
-            // registeredID
-            case self::TAG_REGISTERED_ID:
-                return RegisteredID::fromChosenASN1(
-                    $el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER));
+        case self::TAG_OTHER_NAME:
+            return OtherName::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_SEQUENCE));
+        // rfc822Name
+        case self::TAG_RFC822_NAME:
+            return RFC822Name::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_IA5_STRING));
+        // dNSName
+        case self::TAG_DNS_NAME:
+            return DNSName::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_IA5_STRING));
+        // x400Address
+        case self::TAG_X400_ADDRESS:
+            return X400Address::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_SEQUENCE));
+        // directoryName
+        case self::TAG_DIRECTORY_NAME:
+            // because Name is a CHOICE, albeit having only one option,
+            // explicit tagging must be used
+            // (see X.680 07/2002 30.6.c)
+            return DirectoryName::fromChosenASN1($el->asExplicit());
+        // ediPartyName
+        case self::TAG_EDI_PARTY_NAME:
+            return EDIPartyName::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_SEQUENCE));
+        // uniformResourceIdentifier
+        case self::TAG_URI:
+            return UniformResourceIdentifier::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_IA5_STRING));
+        // iPAddress
+        case self::TAG_IP_ADDRESS:
+            return IPAddress::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_OCTET_STRING));
+        // registeredID
+        case self::TAG_REGISTERED_ID:
+            return RegisteredID::fromChosenASN1(
+                $el->asImplicit(Element::TYPE_OBJECT_IDENTIFIER));
         }
         throw new \UnexpectedValueException(
             "GeneralName type " . $el->tag() . " not supported.");

Indentation +134 added lines, -134 removed lines

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

lib/X509/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/PolicyQualifierInfo.php

Switch Indentation +4 added lines, -4 removed lines

@@ -67,10 +67,10 @@
             ->asObjectIdentifier()
             ->oid();
         switch ($oid) {
-            case self::OID_CPS:
-                return CPSQualifier::fromQualifierASN1($seq->at(1));
-            case self::OID_UNOTICE:
-                return UserNoticeQualifier::fromQualifierASN1($seq->at(1));
+        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.");
     }

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/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/AttCertIssuer.php

Switch Indentation +3 added lines, -3 removed lines

@@ -72,9 +72,9 @@
         }
         $tagged = $el->asTagged();
         switch ($tagged->tag()) {
-            case 0:
-                return V2Form::fromV2ASN1(
-                    $tagged->asImplicit(Element::TYPE_SEQUENCE)->asSequence());
+        case 0:
+            return V2Form::fromV2ASN1(
+                $tagged->asImplicit(Element::TYPE_SEQUENCE)->asSequence());
         }
         throw new \UnexpectedValueException("Unsupported issuer type.");
     }

Indentation +58 added lines, -58 removed lines

@@ -18,66 +18,66 @@
  */
 abstract class AttCertIssuer
 {
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return Element
-     */
-    abstract public function toASN1();
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	abstract public function toASN1();
     
-    /**
-     * Check whether AttCertIssuer identifies given certificate.
-     *
-     * @param Certificate $cert
-     * @return bool
-     */
-    abstract public function identifiesPKC(Certificate $cert): bool;
+	/**
+	 * Check whether AttCertIssuer identifies given certificate.
+	 *
+	 * @param Certificate $cert
+	 * @return bool
+	 */
+	abstract public function identifiesPKC(Certificate $cert): bool;
     
-    /**
-     * Initialize from distinguished name.
-     *
-     * This conforms to RFC 5755 which states that only v2Form must be used,
-     * and issuerName must contain exactly one GeneralName of DirectoryName
-     * type.
-     *
-     * @link https://tools.ietf.org/html/rfc5755#section-4.2.3
-     * @param Name $name
-     * @return self
-     */
-    public static function fromName(Name $name): self
-    {
-        return new V2Form(new GeneralNames(new DirectoryName($name)));
-    }
+	/**
+	 * Initialize from distinguished name.
+	 *
+	 * This conforms to RFC 5755 which states that only v2Form must be used,
+	 * and issuerName must contain exactly one GeneralName of DirectoryName
+	 * type.
+	 *
+	 * @link https://tools.ietf.org/html/rfc5755#section-4.2.3
+	 * @param Name $name
+	 * @return self
+	 */
+	public static function fromName(Name $name): self
+	{
+		return new V2Form(new GeneralNames(new DirectoryName($name)));
+	}
     
-    /**
-     * Initialize from an issuer's public key certificate.
-     *
-     * @param Certificate $cert
-     * @return self
-     */
-    public static function fromPKC(Certificate $cert): self
-    {
-        return self::fromName($cert->tbsCertificate()->subject());
-    }
+	/**
+	 * Initialize from an issuer's public key certificate.
+	 *
+	 * @param Certificate $cert
+	 * @return self
+	 */
+	public static function fromPKC(Certificate $cert): self
+	{
+		return self::fromName($cert->tbsCertificate()->subject());
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param UnspecifiedType $el CHOICE
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromASN1(UnspecifiedType $el): self
-    {
-        if (!$el->isTagged()) {
-            throw new \UnexpectedValueException("v1Form issuer not supported.");
-        }
-        $tagged = $el->asTagged();
-        switch ($tagged->tag()) {
-            case 0:
-                return V2Form::fromV2ASN1(
-                    $tagged->asImplicit(Element::TYPE_SEQUENCE)->asSequence());
-        }
-        throw new \UnexpectedValueException("Unsupported issuer type.");
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param UnspecifiedType $el CHOICE
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromASN1(UnspecifiedType $el): self
+	{
+		if (!$el->isTagged()) {
+			throw new \UnexpectedValueException("v1Form issuer not supported.");
+		}
+		$tagged = $el->asTagged();
+		switch ($tagged->tag()) {
+			case 0:
+				return V2Form::fromV2ASN1(
+					$tagged->asImplicit(Element::TYPE_SEQUENCE)->asSequence());
+		}
+		throw new \UnexpectedValueException("Unsupported issuer type.");
+	}
 }