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)
-    {
-        $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)
+	{
+		$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

@@ -18,97 +18,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)
-    {
-        $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)
+	{
+		$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()
-    {
-        return new ImplicitlyTaggedType($this->_tag,
-            new OctetString($this->_octets()));
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	protected function _choiceASN1()
+	{
+		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)
-    {
-        $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)
+	{
+		$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);
+	}
 }

lib/X509/GeneralName/GeneralName.php

Indentation +134 added lines, -134 removed lines

@@ -13,147 +13,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();
+	/**
+	 * Get string value of the type.
+	 *
+	 * @return string
+	 */
+	abstract public function string();
     
-    /**
-     * Get ASN.1 value in GeneralName CHOICE context.
-     *
-     * @return TaggedType
-     */
-    abstract protected function _choiceASN1();
+	/**
+	 * Get ASN.1 value in GeneralName CHOICE context.
+	 *
+	 * @return TaggedType
+	 */
+	abstract protected function _choiceASN1();
     
-    /**
-     * 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)
-    {
-        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)
+	{
+		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()
-    {
-        return $this->_tag;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function tag()
+	{
+		return $this->_tag;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return Element
-     */
-    public function toASN1()
-    {
-        return $this->_choiceASN1();
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	public function toASN1()
+	{
+		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)
-    {
-        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)
+	{
+		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();
+	}
 }

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.");

lib/X509/Certificate/Extension/NameConstraints/GeneralSubtree.php

Indentation +81 added lines, -81 removed lines

@@ -16,91 +16,91 @@
  */
 class GeneralSubtree
 {
-    /**
-     * Constraint.
-     *
-     * @var GeneralName
-     */
-    protected $_base;
+	/**
+	 * Constraint.
+	 *
+	 * @var GeneralName
+	 */
+	protected $_base;
     
-    /**
-     * Not used, must be zero.
-     *
-     * @var int $_min
-     */
-    protected $_min;
+	/**
+	 * Not used, must be zero.
+	 *
+	 * @var int $_min
+	 */
+	protected $_min;
     
-    /**
-     * Not used, must be null.
-     *
-     * @var int|null $_max
-     */
-    protected $_max;
+	/**
+	 * Not used, must be null.
+	 *
+	 * @var int|null $_max
+	 */
+	protected $_max;
     
-    /**
-     * Constructor.
-     *
-     * @param GeneralName $base
-     * @param int $min
-     * @param int|null $max
-     */
-    public function __construct(GeneralName $base, $min = 0, $max = null)
-    {
-        $this->_base = $base;
-        $this->_min = $min;
-        $this->_max = $max;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param GeneralName $base
+	 * @param int $min
+	 * @param int|null $max
+	 */
+	public function __construct(GeneralName $base, $min = 0, $max = null)
+	{
+		$this->_base = $base;
+		$this->_min = $min;
+		$this->_max = $max;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq)
-    {
-        $base = GeneralName::fromASN1($seq->at(0)->asTagged());
-        $min = 0;
-        $max = null;
-        if ($seq->hasTagged(0)) {
-            $min = $seq->getTagged(0)
-                ->asImplicit(Element::TYPE_INTEGER)
-                ->asInteger()
-                ->number();
-        }
-        if ($seq->hasTagged(1)) {
-            $max = $seq->getTagged(1)
-                ->asImplicit(Element::TYPE_INTEGER)
-                ->asInteger()
-                ->number();
-        }
-        return new self($base, $min, $max);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq)
+	{
+		$base = GeneralName::fromASN1($seq->at(0)->asTagged());
+		$min = 0;
+		$max = null;
+		if ($seq->hasTagged(0)) {
+			$min = $seq->getTagged(0)
+				->asImplicit(Element::TYPE_INTEGER)
+				->asInteger()
+				->number();
+		}
+		if ($seq->hasTagged(1)) {
+			$max = $seq->getTagged(1)
+				->asImplicit(Element::TYPE_INTEGER)
+				->asInteger()
+				->number();
+		}
+		return new self($base, $min, $max);
+	}
     
-    /**
-     * Get constraint.
-     *
-     * @return GeneralName
-     */
-    public function base()
-    {
-        return $this->_base;
-    }
+	/**
+	 * Get constraint.
+	 *
+	 * @return GeneralName
+	 */
+	public function base()
+	{
+		return $this->_base;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1()
-    {
-        $elements = array($this->_base->toASN1());
-        if (isset($this->_min) && $this->_min != 0) {
-            $elements[] = new ImplicitlyTaggedType(0, new Integer($this->_min));
-        }
-        if (isset($this->_max)) {
-            $elements[] = new ImplicitlyTaggedType(1, new Integer($this->_max));
-        }
-        return new Sequence(...$elements);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1()
+	{
+		$elements = array($this->_base->toASN1());
+		if (isset($this->_min) && $this->_min != 0) {
+			$elements[] = new ImplicitlyTaggedType(0, new Integer($this->_min));
+		}
+		if (isset($this->_max)) {
+			$elements[] = new ImplicitlyTaggedType(1, new Integer($this->_max));
+		}
+		return new Sequence(...$elements);
+	}
 }

lib/X509/Certificate/Extension/DistributionPoint/DistributionPointName.php

Switch Indentation +10 added lines, -10 removed lines

@@ -43,16 +43,16 @@
     public static function fromTaggedType(TaggedType $el)
     {
         switch ($el->tag()) {
-            case self::TAG_FULL_NAME:
-                return new FullName(
-                    GeneralNames::fromASN1(
-                        $el->asImplicit(Element::TYPE_SEQUENCE)->asSequence()));
-            case self::TAG_RDN:
-                return new RelativeName(
-                    RDN::fromASN1($el->asImplicit(Element::TYPE_SET)->asSet()));
-            default:
-                throw new \UnexpectedValueException(
-                    "DistributionPointName tag " . $el->tag() . " not supported.");
+        case self::TAG_FULL_NAME:
+            return new FullName(
+                GeneralNames::fromASN1(
+                    $el->asImplicit(Element::TYPE_SEQUENCE)->asSequence()));
+        case self::TAG_RDN:
+            return new RelativeName(
+                RDN::fromASN1($el->asImplicit(Element::TYPE_SET)->asSet()));
+        default:
+            throw new \UnexpectedValueException(
+                "DistributionPointName tag " . $el->tag() . " not supported.");
         }
     }
     

Indentation +55 added lines, -55 removed lines

@@ -18,64 +18,64 @@
  */
 abstract class DistributionPointName
 {
-    const TAG_FULL_NAME = 0;
-    const TAG_RDN = 1;
+	const TAG_FULL_NAME = 0;
+	const TAG_RDN = 1;
     
-    /**
-     * Type.
-     *
-     * @var int $_tag
-     */
-    protected $_tag;
+	/**
+	 * Type.
+	 *
+	 * @var int $_tag
+	 */
+	protected $_tag;
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return Element
-     */
-    abstract protected function _valueASN1();
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return Element
+	 */
+	abstract protected function _valueASN1();
     
-    /**
-     * Initialize from TaggedType.
-     *
-     * @param TaggedType $el
-     * @throws \UnexpectedValueException
-     * @return self
-     */
-    public static function fromTaggedType(TaggedType $el)
-    {
-        switch ($el->tag()) {
-            case self::TAG_FULL_NAME:
-                return new FullName(
-                    GeneralNames::fromASN1(
-                        $el->asImplicit(Element::TYPE_SEQUENCE)->asSequence()));
-            case self::TAG_RDN:
-                return new RelativeName(
-                    RDN::fromASN1($el->asImplicit(Element::TYPE_SET)->asSet()));
-            default:
-                throw new \UnexpectedValueException(
-                    "DistributionPointName tag " . $el->tag() . " not supported.");
-        }
-    }
+	/**
+	 * Initialize from TaggedType.
+	 *
+	 * @param TaggedType $el
+	 * @throws \UnexpectedValueException
+	 * @return self
+	 */
+	public static function fromTaggedType(TaggedType $el)
+	{
+		switch ($el->tag()) {
+			case self::TAG_FULL_NAME:
+				return new FullName(
+					GeneralNames::fromASN1(
+						$el->asImplicit(Element::TYPE_SEQUENCE)->asSequence()));
+			case self::TAG_RDN:
+				return new RelativeName(
+					RDN::fromASN1($el->asImplicit(Element::TYPE_SET)->asSet()));
+			default:
+				throw new \UnexpectedValueException(
+					"DistributionPointName tag " . $el->tag() . " not supported.");
+		}
+	}
     
-    /**
-     * Get type tag.
-     *
-     * @return int
-     */
-    public function tag()
-    {
-        return $this->_tag;
-    }
+	/**
+	 * Get type tag.
+	 *
+	 * @return int
+	 */
+	public function tag()
+	{
+		return $this->_tag;
+	}
     
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return ImplicitlyTaggedType
-     */
-    public function toASN1(): ImplicitlyTaggedType
-    {
-        $element = $this->_valueASN1();
-        return new ImplicitlyTaggedType($this->_tag, $element);
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return ImplicitlyTaggedType
+	 */
+	public function toASN1(): ImplicitlyTaggedType
+	{
+		$element = $this->_valueASN1();
+		return new ImplicitlyTaggedType($this->_tag, $element);
+	}
 }

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

Indentation +102 added lines, -102 removed lines

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

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

Indentation +82 added lines, -82 removed lines

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

Switch Indentation +11 added lines, -11 removed lines

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

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

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)
-    {
-        $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)
+	{
+		$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());
+	}
 }