sop / x501

lib/X501/MatchingRule/BinaryMatch.php

Indentation +8 added lines, -8 removed lines

@@ -9,12 +9,12 @@
  */
 class BinaryMatch extends MatchingRule
 {
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function compare($assertion, $value)
-    {
-        return strcmp($assertion, $value) == 0;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value)
+	{
+		return strcmp($assertion, $value) == 0;
+	}
 }

lib/X501/MatchingRule/MatchingRule.php

Indentation +9 added lines, -9 removed lines

@@ -9,13 +9,13 @@
  */
 abstract class MatchingRule
 {
-    /**
-     * Compare attribute value to assertion.
-     *
-     * @param mixed $assertion Value to assert
-     * @param mixed $value Attribute value
-     * @return bool|null True if value matches. Null shall be returned if match
-     *         evaluates to Undefined.
-     */
-    abstract public function compare($assertion, $value);
+	/**
+	 * Compare attribute value to assertion.
+	 *
+	 * @param mixed $assertion Value to assert
+	 * @param mixed $value Attribute value
+	 * @return bool|null True if value matches. Null shall be returned if match
+	 *         evaluates to Undefined.
+	 */
+	abstract public function compare($assertion, $value);
 }

lib/X501/MatchingRule/StringPrepMatchingRule.php

Indentation +25 added lines, -25 removed lines

@@ -9,31 +9,31 @@
  */
 abstract class StringPrepMatchingRule extends MatchingRule
 {
-    /**
-     * String preparer.
-     *
-     * @var StringPreparer $_prep
-     */
-    protected $_prep;
+	/**
+	 * String preparer.
+	 *
+	 * @var StringPreparer $_prep
+	 */
+	protected $_prep;
     
-    /**
-     * Constructor.
-     *
-     * @param StringPreparer $preparer
-     */
-    public function __construct(StringPreparer $preparer)
-    {
-        $this->_prep = $preparer;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param StringPreparer $preparer
+	 */
+	public function __construct(StringPreparer $preparer)
+	{
+		$this->_prep = $preparer;
+	}
     
-    /**
-     *
-     * {@inheritdoc}
-     */
-    public function compare($assertion, $value)
-    {
-        $assertion = $this->_prep->prepare($assertion);
-        $value = $this->_prep->prepare($value);
-        return strcmp($assertion, $value) == 0;
-    }
+	/**
+	 *
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value)
+	{
+		$assertion = $this->_prep->prepare($assertion);
+		$value = $this->_prep->prepare($value);
+		return strcmp($assertion, $value) == 0;
+	}
 }

lib/X501/StringPrep/TranscodeStep.php

Switch Indentation +16 added lines, -16 removed lines

@@ -40,22 +40,22 @@
     {
         switch ($this->_type) {
             // UTF-8 string as is
-            case Element::TYPE_UTF8_STRING:
-                return $string;
-            // PrintableString maps directly to UTF-8
-            case Element::TYPE_PRINTABLE_STRING:
-                return $string;
-            // UCS-2 to UTF-8
-            case Element::TYPE_BMP_STRING:
-                return mb_convert_encoding($string, "UTF-8", "UCS-2BE");
-            // UCS-4 to UTF-8
-            case Element::TYPE_UNIVERSAL_STRING:
-                return mb_convert_encoding($string, "UTF-8", "UCS-4BE");
-            // TeletexString mapping is a local matter.
-            // We take a shortcut here and encode it as a hexstring.
-            case Element::TYPE_T61_STRING:
-                $el = new T61String($string);
-                return "#" . bin2hex($el->toDER());
+        case Element::TYPE_UTF8_STRING:
+            return $string;
+        // PrintableString maps directly to UTF-8
+        case Element::TYPE_PRINTABLE_STRING:
+            return $string;
+        // UCS-2 to UTF-8
+        case Element::TYPE_BMP_STRING:
+            return mb_convert_encoding($string, "UTF-8", "UCS-2BE");
+        // UCS-4 to UTF-8
+        case Element::TYPE_UNIVERSAL_STRING:
+            return mb_convert_encoding($string, "UTF-8", "UCS-4BE");
+        // TeletexString mapping is a local matter.
+        // We take a shortcut here and encode it as a hexstring.
+        case Element::TYPE_T61_STRING:
+            $el = new T61String($string);
+            return "#" . bin2hex($el->toDER());
         }
         throw new \LogicException(
             "Unsupported string type " . Element::tagToName($this->_type) . ".");

Indentation +45 added lines, -45 removed lines

@@ -15,51 +15,51 @@
  */
 class TranscodeStep implements PrepareStep
 {
-    /**
-     * ASN.1 type of the string.
-     *
-     * @var int $_type
-     */
-    protected $_type;
+	/**
+	 * ASN.1 type of the string.
+	 *
+	 * @var int $_type
+	 */
+	protected $_type;
     
-    /**
-     * Constructor.
-     *
-     * @param int $type ASN.1 type tag of the string
-     */
-    public function __construct(int $type)
-    {
-        $this->_type = $type;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $type ASN.1 type tag of the string
+	 */
+	public function __construct(int $type)
+	{
+		$this->_type = $type;
+	}
     
-    /**
-     *
-     * @throws \LogicException If string type is not supported
-     * @param string $string String to prepare
-     * @return string UTF-8 encoded string
-     */
-    public function apply(string $string): string
-    {
-        switch ($this->_type) {
-            // UTF-8 string as is
-            case Element::TYPE_UTF8_STRING:
-                return $string;
-            // PrintableString maps directly to UTF-8
-            case Element::TYPE_PRINTABLE_STRING:
-                return $string;
-            // UCS-2 to UTF-8
-            case Element::TYPE_BMP_STRING:
-                return mb_convert_encoding($string, "UTF-8", "UCS-2BE");
-            // UCS-4 to UTF-8
-            case Element::TYPE_UNIVERSAL_STRING:
-                return mb_convert_encoding($string, "UTF-8", "UCS-4BE");
-            // TeletexString mapping is a local matter.
-            // We take a shortcut here and encode it as a hexstring.
-            case Element::TYPE_T61_STRING:
-                $el = new T61String($string);
-                return "#" . bin2hex($el->toDER());
-        }
-        throw new \LogicException(
-            "Unsupported string type " . Element::tagToName($this->_type) . ".");
-    }
+	/**
+	 *
+	 * @throws \LogicException If string type is not supported
+	 * @param string $string String to prepare
+	 * @return string UTF-8 encoded string
+	 */
+	public function apply(string $string): string
+	{
+		switch ($this->_type) {
+			// UTF-8 string as is
+			case Element::TYPE_UTF8_STRING:
+				return $string;
+			// PrintableString maps directly to UTF-8
+			case Element::TYPE_PRINTABLE_STRING:
+				return $string;
+			// UCS-2 to UTF-8
+			case Element::TYPE_BMP_STRING:
+				return mb_convert_encoding($string, "UTF-8", "UCS-2BE");
+			// UCS-4 to UTF-8
+			case Element::TYPE_UNIVERSAL_STRING:
+				return mb_convert_encoding($string, "UTF-8", "UCS-4BE");
+			// TeletexString mapping is a local matter.
+			// We take a shortcut here and encode it as a hexstring.
+			case Element::TYPE_T61_STRING:
+				$el = new T61String($string);
+				return "#" . bin2hex($el->toDER());
+		}
+		throw new \LogicException(
+			"Unsupported string type " . Element::tagToName($this->_type) . ".");
+	}
 }

lib/X501/ASN1/AttributeType.php

Switch Indentation +6 added lines, -6 removed lines

@@ -441,12 +441,12 @@
             return new UTF8String($str);
         }
         switch (self::MAP_ATTR_TO_STR_TYPE[$oid]) {
-            case Element::TYPE_PRINTABLE_STRING:
-                return new PrintableString($str);
-            // @codeCoverageIgnoreStart
-            default:
-                // only reachable during development
-                throw new \LogicException();
+        case Element::TYPE_PRINTABLE_STRING:
+            return new PrintableString($str);
+        // @codeCoverageIgnoreStart
+        default:
+            // only reachable during development
+            throw new \LogicException();
         }
         // @codeCoverageIgnoreEnd
     }

Indentation +422 added lines, -422 removed lines

@@ -18,439 +18,439 @@
  */
 class AttributeType
 {
-    // OID's from 2.5.4 arc
-    const OID_OBJECT_CLASS = "2.5.4.0";
-    const OID_ALIASED_ENTRY_NAME = "2.5.4.1";
-    const OID_KNOWLEDGE_INFORMATION = "2.5.4.2";
-    const OID_COMMON_NAME = "2.5.4.3";
-    const OID_SURNAME = "2.5.4.4";
-    const OID_SERIAL_NUMBER = "2.5.4.5";
-    const OID_COUNTRY_NAME = "2.5.4.6";
-    const OID_LOCALITY_NAME = "2.5.4.7";
-    const OID_STATE_OR_PROVINCE_NAME = "2.5.4.8";
-    const OID_STREET_ADDRESS = "2.5.4.9";
-    const OID_ORGANIZATION_NAME = "2.5.4.10";
-    const OID_ORGANIZATIONAL_UNIT_NAME = "2.5.4.11";
-    const OID_TITLE = "2.5.4.12";
-    const OID_DESCRIPTION = "2.5.4.13";
-    const OID_SEARCH_GUIDE = "2.5.4.14";
-    const OID_BUSINESS_CATEGORY = "2.5.4.15";
-    const OID_POSTAL_ADDRESS = "2.5.4.16";
-    const OID_POSTAL_CODE = "2.5.4.17";
-    const OID_POST_OFFICE_BOX = "2.5.4.18";
-    const OID_PHYSICAL_DELIVERY_OFFICE_NAME = "2.5.4.19";
-    const OID_TELEPHONE_NUMBER = "2.5.4.20";
-    const OID_TELEX_NUMBER = "2.5.4.21";
-    const OID_TELETEX_TERMINAL_IDENTIFIER = "2.5.4.22";
-    const OID_FACSIMILE_TELEPHONE_NUMBER = "2.5.4.23";
-    const OID_X121_ADDRESS = "2.5.4.24";
-    const OID_INTERNATIONAL_ISDN_NUMBER = "2.5.4.25";
-    const OID_REGISTERED_ADDRESS = "2.5.4.26";
-    const OID_DESTINATION_INDICATOR = "2.5.4.27";
-    const OID_PREFERRED_DELIVERY_METHOD = "2.5.4.28";
-    const OID_PRESENTATION_ADDRESS = "2.5.4.29";
-    const OID_SUPPORTED_APPLICATION_CONTEXT = "2.5.4.30";
-    const OID_MEMBER = "2.5.4.31";
-    const OID_OWNER = "2.5.4.32";
-    const OID_ROLE_OCCUPANT = "2.5.4.33";
-    const OID_SEE_ALSO = "2.5.4.34";
-    const OID_USER_PASSWORD = "2.5.4.35";
-    const OID_USER_CERTIFICATE = "2.5.4.36";
-    const OID_CA_CERTIFICATE = "2.5.4.37";
-    const OID_AUTHORITY_REVOCATION_LIST = "2.5.4.38";
-    const OID_CERTIFICATE_REVOCATION_LIST = "2.5.4.39";
-    const OID_CROSS_CERTIFICATE_PAIR = "2.5.4.40";
-    const OID_NAME = "2.5.4.41";
-    const OID_GIVEN_NAME = "2.5.4.42";
-    const OID_INITIALS = "2.5.4.43";
-    const OID_GENERATION_QUALIFIER = "2.5.4.44";
-    const OID_UNIQUE_IDENTIFIER = "2.5.4.45";
-    const OID_DN_QUALIFIER = "2.5.4.46";
-    const OID_ENHANCED_SEARCH_GUIDE = "2.5.4.47";
-    const OID_PROTOCOL_INFORMATION = "2.5.4.48";
-    const OID_DISTINGUISHED_NAME = "2.5.4.49";
-    const OID_UNIQUE_MEMBER = "2.5.4.50";
-    const OID_HOUSE_IDENTIFIER = "2.5.4.51";
-    const OID_SUPPORTED_ALGORITHMS = "2.5.4.52";
-    const OID_DELTA_REVOCATION_LIST = "2.5.4.53";
-    const OID_DMD_NAME = "2.5.4.54";
-    const OID_CLEARANCE = "2.5.4.55";
-    const OID_DEFAULT_DIR_QOP = "2.5.4.56";
-    const OID_ATTRIBUTE_INTEGRITY_INFO = "2.5.4.57";
-    const OID_ATTRIBUTE_CERTIFICATE = "2.5.4.58";
-    const OID_ATTRIBUTE_CERTIFICATE_REVOCATION_LIST = "2.5.4.59";
-    const OID_CONF_KEY_INFO = "2.5.4.60";
-    const OID_AA_CERTIFICATE = "2.5.4.61";
-    const OID_ATTRIBUTE_DESCRIPTOR_CERTIFICATE = "2.5.4.62";
-    const OID_ATTRIBUTE_AUTHORITY_REVOCATION_LIST = "2.5.4.63";
-    const OID_FAMILY_INFORMATION = "2.5.4.64";
-    const OID_PSEUDONYM = "2.5.4.65";
-    const OID_COMMUNICATIONS_SERVICE = "2.5.4.66";
-    const OID_COMMUNICATIONS_NETWORK = "2.5.4.67";
-    const OID_CERTIFICATION_PRACTICE_STMT = "2.5.4.68";
-    const OID_CERTIFICATE_POLICY = "2.5.4.69";
-    const OID_PKI_PATH = "2.5.4.70";
-    const OID_PRIV_POLICY = "2.5.4.71";
-    const OID_ROLE = "2.5.4.72";
-    const OID_DELEGATION_PATH = "2.5.4.73";
-    const OID_PROT_PRIV_POLICY = "2.5.4.74";
-    const OID_XML_PRIVILEGE_INFO = "2.5.4.75";
-    const OID_XML_PRIV_POLICY = "2.5.4.76";
-    const OID_UUID_PAIR = "2.5.4.77";
-    const OID_TAG_OID = "2.5.4.78";
-    const OID_UII_FORMAT = "2.5.4.79";
-    const OID_UII_IN_URH = "2.5.4.80";
-    const OID_CONTENT_URL = "2.5.4.81";
-    const OID_PERMISSION = "2.5.4.82";
-    const OID_URI = "2.5.4.83";
-    const OID_PWD_ATTRIBUTE = "2.5.4.84";
-    const OID_USER_PWD = "2.5.4.85";
-    const OID_URN = "2.5.4.86";
-    const OID_URL = "2.5.4.87";
-    const OID_UTM_COORDINATES = "2.5.4.88";
-    const OID_URNC = "2.5.4.89";
-    const OID_UII = "2.5.4.90";
-    const OID_EPC = "2.5.4.91";
-    const OID_TAG_AFI = "2.5.4.92";
-    const OID_EPC_FORMAT = "2.5.4.93";
-    const OID_EPC_IN_URN = "2.5.4.94";
-    const OID_LDAP_URL = "2.5.4.95";
-    const OID_TAG_LOCATION = "2.5.4.96";
-    const OID_ORGANIZATION_IDENTIFIER = "2.5.4.97";
+	// OID's from 2.5.4 arc
+	const OID_OBJECT_CLASS = "2.5.4.0";
+	const OID_ALIASED_ENTRY_NAME = "2.5.4.1";
+	const OID_KNOWLEDGE_INFORMATION = "2.5.4.2";
+	const OID_COMMON_NAME = "2.5.4.3";
+	const OID_SURNAME = "2.5.4.4";
+	const OID_SERIAL_NUMBER = "2.5.4.5";
+	const OID_COUNTRY_NAME = "2.5.4.6";
+	const OID_LOCALITY_NAME = "2.5.4.7";
+	const OID_STATE_OR_PROVINCE_NAME = "2.5.4.8";
+	const OID_STREET_ADDRESS = "2.5.4.9";
+	const OID_ORGANIZATION_NAME = "2.5.4.10";
+	const OID_ORGANIZATIONAL_UNIT_NAME = "2.5.4.11";
+	const OID_TITLE = "2.5.4.12";
+	const OID_DESCRIPTION = "2.5.4.13";
+	const OID_SEARCH_GUIDE = "2.5.4.14";
+	const OID_BUSINESS_CATEGORY = "2.5.4.15";
+	const OID_POSTAL_ADDRESS = "2.5.4.16";
+	const OID_POSTAL_CODE = "2.5.4.17";
+	const OID_POST_OFFICE_BOX = "2.5.4.18";
+	const OID_PHYSICAL_DELIVERY_OFFICE_NAME = "2.5.4.19";
+	const OID_TELEPHONE_NUMBER = "2.5.4.20";
+	const OID_TELEX_NUMBER = "2.5.4.21";
+	const OID_TELETEX_TERMINAL_IDENTIFIER = "2.5.4.22";
+	const OID_FACSIMILE_TELEPHONE_NUMBER = "2.5.4.23";
+	const OID_X121_ADDRESS = "2.5.4.24";
+	const OID_INTERNATIONAL_ISDN_NUMBER = "2.5.4.25";
+	const OID_REGISTERED_ADDRESS = "2.5.4.26";
+	const OID_DESTINATION_INDICATOR = "2.5.4.27";
+	const OID_PREFERRED_DELIVERY_METHOD = "2.5.4.28";
+	const OID_PRESENTATION_ADDRESS = "2.5.4.29";
+	const OID_SUPPORTED_APPLICATION_CONTEXT = "2.5.4.30";
+	const OID_MEMBER = "2.5.4.31";
+	const OID_OWNER = "2.5.4.32";
+	const OID_ROLE_OCCUPANT = "2.5.4.33";
+	const OID_SEE_ALSO = "2.5.4.34";
+	const OID_USER_PASSWORD = "2.5.4.35";
+	const OID_USER_CERTIFICATE = "2.5.4.36";
+	const OID_CA_CERTIFICATE = "2.5.4.37";
+	const OID_AUTHORITY_REVOCATION_LIST = "2.5.4.38";
+	const OID_CERTIFICATE_REVOCATION_LIST = "2.5.4.39";
+	const OID_CROSS_CERTIFICATE_PAIR = "2.5.4.40";
+	const OID_NAME = "2.5.4.41";
+	const OID_GIVEN_NAME = "2.5.4.42";
+	const OID_INITIALS = "2.5.4.43";
+	const OID_GENERATION_QUALIFIER = "2.5.4.44";
+	const OID_UNIQUE_IDENTIFIER = "2.5.4.45";
+	const OID_DN_QUALIFIER = "2.5.4.46";
+	const OID_ENHANCED_SEARCH_GUIDE = "2.5.4.47";
+	const OID_PROTOCOL_INFORMATION = "2.5.4.48";
+	const OID_DISTINGUISHED_NAME = "2.5.4.49";
+	const OID_UNIQUE_MEMBER = "2.5.4.50";
+	const OID_HOUSE_IDENTIFIER = "2.5.4.51";
+	const OID_SUPPORTED_ALGORITHMS = "2.5.4.52";
+	const OID_DELTA_REVOCATION_LIST = "2.5.4.53";
+	const OID_DMD_NAME = "2.5.4.54";
+	const OID_CLEARANCE = "2.5.4.55";
+	const OID_DEFAULT_DIR_QOP = "2.5.4.56";
+	const OID_ATTRIBUTE_INTEGRITY_INFO = "2.5.4.57";
+	const OID_ATTRIBUTE_CERTIFICATE = "2.5.4.58";
+	const OID_ATTRIBUTE_CERTIFICATE_REVOCATION_LIST = "2.5.4.59";
+	const OID_CONF_KEY_INFO = "2.5.4.60";
+	const OID_AA_CERTIFICATE = "2.5.4.61";
+	const OID_ATTRIBUTE_DESCRIPTOR_CERTIFICATE = "2.5.4.62";
+	const OID_ATTRIBUTE_AUTHORITY_REVOCATION_LIST = "2.5.4.63";
+	const OID_FAMILY_INFORMATION = "2.5.4.64";
+	const OID_PSEUDONYM = "2.5.4.65";
+	const OID_COMMUNICATIONS_SERVICE = "2.5.4.66";
+	const OID_COMMUNICATIONS_NETWORK = "2.5.4.67";
+	const OID_CERTIFICATION_PRACTICE_STMT = "2.5.4.68";
+	const OID_CERTIFICATE_POLICY = "2.5.4.69";
+	const OID_PKI_PATH = "2.5.4.70";
+	const OID_PRIV_POLICY = "2.5.4.71";
+	const OID_ROLE = "2.5.4.72";
+	const OID_DELEGATION_PATH = "2.5.4.73";
+	const OID_PROT_PRIV_POLICY = "2.5.4.74";
+	const OID_XML_PRIVILEGE_INFO = "2.5.4.75";
+	const OID_XML_PRIV_POLICY = "2.5.4.76";
+	const OID_UUID_PAIR = "2.5.4.77";
+	const OID_TAG_OID = "2.5.4.78";
+	const OID_UII_FORMAT = "2.5.4.79";
+	const OID_UII_IN_URH = "2.5.4.80";
+	const OID_CONTENT_URL = "2.5.4.81";
+	const OID_PERMISSION = "2.5.4.82";
+	const OID_URI = "2.5.4.83";
+	const OID_PWD_ATTRIBUTE = "2.5.4.84";
+	const OID_USER_PWD = "2.5.4.85";
+	const OID_URN = "2.5.4.86";
+	const OID_URL = "2.5.4.87";
+	const OID_UTM_COORDINATES = "2.5.4.88";
+	const OID_URNC = "2.5.4.89";
+	const OID_UII = "2.5.4.90";
+	const OID_EPC = "2.5.4.91";
+	const OID_TAG_AFI = "2.5.4.92";
+	const OID_EPC_FORMAT = "2.5.4.93";
+	const OID_EPC_IN_URN = "2.5.4.94";
+	const OID_LDAP_URL = "2.5.4.95";
+	const OID_TAG_LOCATION = "2.5.4.96";
+	const OID_ORGANIZATION_IDENTIFIER = "2.5.4.97";
     
-    // Miscellany attribute OID's
-    const OID_CLEARANCE_X501 = "2.5.1.5.55";
+	// Miscellany attribute OID's
+	const OID_CLEARANCE_X501 = "2.5.1.5.55";
     
-    /**
-     * Default ASN.1 string types for attributes.
-     *
-     * Attributes not mapped here shall use UTF8String as a default type.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_ATTR_TO_STR_TYPE = array(
-        /* @formatter:off */
-        self::OID_DN_QUALIFIER => Element::TYPE_PRINTABLE_STRING, 
-        self::OID_COUNTRY_NAME => Element::TYPE_PRINTABLE_STRING, 
-        self::OID_SERIAL_NUMBER => Element::TYPE_PRINTABLE_STRING
-        /* @formatter:on */
-    );
+	/**
+	 * Default ASN.1 string types for attributes.
+	 *
+	 * Attributes not mapped here shall use UTF8String as a default type.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_ATTR_TO_STR_TYPE = array(
+		/* @formatter:off */
+		self::OID_DN_QUALIFIER => Element::TYPE_PRINTABLE_STRING, 
+		self::OID_COUNTRY_NAME => Element::TYPE_PRINTABLE_STRING, 
+		self::OID_SERIAL_NUMBER => Element::TYPE_PRINTABLE_STRING
+		/* @formatter:on */
+	);
     
-    /**
-     * OID to attribute names mapping.
-     *
-     * First name is the primary name. If there's more than one name, others may
-     * be used as an alias.
-     *
-     * Generated using ldap-attribs.py.
-     *
-     * @internal
-     *
-     * @var array
-     */
-    const MAP_OID_TO_NAME = array(
-        /* @formatter:off */
-        "0.9.2342.19200300.100.1.1" => ["uid", "userid"],
-        "0.9.2342.19200300.100.1.2" => ["textEncodedORAddress"],
-        "0.9.2342.19200300.100.1.3" => ["mail", "rfc822Mailbox"],
-        "0.9.2342.19200300.100.1.4" => ["info"],
-        "0.9.2342.19200300.100.1.5" => ["drink", "favouriteDrink"],
-        "0.9.2342.19200300.100.1.6" => ["roomNumber"],
-        "0.9.2342.19200300.100.1.7" => ["photo"],
-        "0.9.2342.19200300.100.1.8" => ["userClass"],
-        "0.9.2342.19200300.100.1.9" => ["host"],
-        "0.9.2342.19200300.100.1.10" => ["manager"],
-        "0.9.2342.19200300.100.1.11" => ["documentIdentifier"],
-        "0.9.2342.19200300.100.1.12" => ["documentTitle"],
-        "0.9.2342.19200300.100.1.13" => ["documentVersion"],
-        "0.9.2342.19200300.100.1.14" => ["documentAuthor"],
-        "0.9.2342.19200300.100.1.15" => ["documentLocation"],
-        "0.9.2342.19200300.100.1.20" => ["homePhone", "homeTelephoneNumber"],
-        "0.9.2342.19200300.100.1.21" => ["secretary"],
-        "0.9.2342.19200300.100.1.22" => ["otherMailbox"],
-        "0.9.2342.19200300.100.1.25" => ["dc", "domainComponent"],
-        "0.9.2342.19200300.100.1.26" => ["aRecord"],
-        "0.9.2342.19200300.100.1.27" => ["mDRecord"],
-        "0.9.2342.19200300.100.1.28" => ["mXRecord"],
-        "0.9.2342.19200300.100.1.29" => ["nSRecord"],
-        "0.9.2342.19200300.100.1.30" => ["sOARecord"],
-        "0.9.2342.19200300.100.1.31" => ["cNAMERecord"],
-        "0.9.2342.19200300.100.1.37" => ["associatedDomain"],
-        "0.9.2342.19200300.100.1.38" => ["associatedName"],
-        "0.9.2342.19200300.100.1.39" => ["homePostalAddress"],
-        "0.9.2342.19200300.100.1.40" => ["personalTitle"],
-        "0.9.2342.19200300.100.1.41" => ["mobile", "mobileTelephoneNumber"],
-        "0.9.2342.19200300.100.1.42" => ["pager", "pagerTelephoneNumber"],
-        "0.9.2342.19200300.100.1.43" => ["co", "friendlyCountryName"],
-        "0.9.2342.19200300.100.1.44" => ["uniqueIdentifier"],
-        "0.9.2342.19200300.100.1.45" => ["organizationalStatus"],
-        "0.9.2342.19200300.100.1.46" => ["janetMailbox"],
-        "0.9.2342.19200300.100.1.47" => ["mailPreferenceOption"],
-        "0.9.2342.19200300.100.1.48" => ["buildingName"],
-        "0.9.2342.19200300.100.1.49" => ["dSAQuality"],
-        "0.9.2342.19200300.100.1.50" => ["singleLevelQuality"],
-        "0.9.2342.19200300.100.1.51" => ["subtreeMinimumQuality"],
-        "0.9.2342.19200300.100.1.52" => ["subtreeMaximumQuality"],
-        "0.9.2342.19200300.100.1.53" => ["personalSignature"],
-        "0.9.2342.19200300.100.1.54" => ["dITRedirect"],
-        "0.9.2342.19200300.100.1.55" => ["audio"],
-        "0.9.2342.19200300.100.1.56" => ["documentPublisher"],
-        "0.9.2342.19200300.100.1.60" => ["jpegPhoto"],
-        "1.2.840.113549.1.9.1" => ["email", "emailAddress", "pkcs9email"],
-        "1.2.840.113556.1.2.102" => ["memberOf"],
-        "1.3.6.1.1.1.1.0" => ["uidNumber"],
-        "1.3.6.1.1.1.1.1" => ["gidNumber"],
-        "1.3.6.1.1.1.1.2" => ["gecos"],
-        "1.3.6.1.1.1.1.3" => ["homeDirectory"],
-        "1.3.6.1.1.1.1.4" => ["loginShell"],
-        "1.3.6.1.1.1.1.5" => ["shadowLastChange"],
-        "1.3.6.1.1.1.1.6" => ["shadowMin"],
-        "1.3.6.1.1.1.1.7" => ["shadowMax"],
-        "1.3.6.1.1.1.1.8" => ["shadowWarning"],
-        "1.3.6.1.1.1.1.9" => ["shadowInactive"],
-        "1.3.6.1.1.1.1.10" => ["shadowExpire"],
-        "1.3.6.1.1.1.1.11" => ["shadowFlag"],
-        "1.3.6.1.1.1.1.12" => ["memberUid"],
-        "1.3.6.1.1.1.1.13" => ["memberNisNetgroup"],
-        "1.3.6.1.1.1.1.14" => ["nisNetgroupTriple"],
-        "1.3.6.1.1.1.1.15" => ["ipServicePort"],
-        "1.3.6.1.1.1.1.16" => ["ipServiceProtocol"],
-        "1.3.6.1.1.1.1.17" => ["ipProtocolNumber"],
-        "1.3.6.1.1.1.1.18" => ["oncRpcNumber"],
-        "1.3.6.1.1.1.1.19" => ["ipHostNumber"],
-        "1.3.6.1.1.1.1.20" => ["ipNetworkNumber"],
-        "1.3.6.1.1.1.1.21" => ["ipNetmaskNumber"],
-        "1.3.6.1.1.1.1.22" => ["macAddress"],
-        "1.3.6.1.1.1.1.23" => ["bootParameter"],
-        "1.3.6.1.1.1.1.24" => ["bootFile"],
-        "1.3.6.1.1.1.1.26" => ["nisMapName"],
-        "1.3.6.1.1.1.1.27" => ["nisMapEntry"],
-        "1.3.6.1.1.4" => ["vendorName"],
-        "1.3.6.1.1.5" => ["vendorVersion"],
-        "1.3.6.1.1.16.4" => ["entryUUID"],
-        "1.3.6.1.1.20" => ["entryDN"],
-        "2.5.4.0" => ["objectClass"],
-        "2.5.4.1" => ["aliasedObjectName", "aliasedEntryName"],
-        "2.5.4.2" => ["knowledgeInformation"],
-        "2.5.4.3" => ["cn", "commonName"],
-        "2.5.4.4" => ["sn", "surname"],
-        "2.5.4.5" => ["serialNumber"],
-        "2.5.4.6" => ["c", "countryName"],
-        "2.5.4.7" => ["l", "localityName"],
-        "2.5.4.8" => ["st", "stateOrProvinceName"],
-        "2.5.4.9" => ["street", "streetAddress"],
-        "2.5.4.10" => ["o", "organizationName"],
-        "2.5.4.11" => ["ou", "organizationalUnitName"],
-        "2.5.4.12" => ["title"],
-        "2.5.4.13" => ["description"],
-        "2.5.4.14" => ["searchGuide"],
-        "2.5.4.15" => ["businessCategory"],
-        "2.5.4.16" => ["postalAddress"],
-        "2.5.4.17" => ["postalCode"],
-        "2.5.4.18" => ["postOfficeBox"],
-        "2.5.4.19" => ["physicalDeliveryOfficeName"],
-        "2.5.4.20" => ["telephoneNumber"],
-        "2.5.4.21" => ["telexNumber"],
-        "2.5.4.22" => ["teletexTerminalIdentifier"],
-        "2.5.4.23" => ["facsimileTelephoneNumber", "fax"],
-        "2.5.4.24" => ["x121Address"],
-        "2.5.4.25" => ["internationaliSDNNumber"],
-        "2.5.4.26" => ["registeredAddress"],
-        "2.5.4.27" => ["destinationIndicator"],
-        "2.5.4.28" => ["preferredDeliveryMethod"],
-        "2.5.4.29" => ["presentationAddress"],
-        "2.5.4.30" => ["supportedApplicationContext"],
-        "2.5.4.31" => ["member"],
-        "2.5.4.32" => ["owner"],
-        "2.5.4.33" => ["roleOccupant"],
-        "2.5.4.34" => ["seeAlso"],
-        "2.5.4.35" => ["userPassword"],
-        "2.5.4.36" => ["userCertificate"],
-        "2.5.4.37" => ["cACertificate"],
-        "2.5.4.38" => ["authorityRevocationList"],
-        "2.5.4.39" => ["certificateRevocationList"],
-        "2.5.4.40" => ["crossCertificatePair"],
-        "2.5.4.41" => ["name"],
-        "2.5.4.42" => ["givenName", "gn"],
-        "2.5.4.43" => ["initials"],
-        "2.5.4.44" => ["generationQualifier"],
-        "2.5.4.45" => ["x500UniqueIdentifier"],
-        "2.5.4.46" => ["dnQualifier"],
-        "2.5.4.47" => ["enhancedSearchGuide"],
-        "2.5.4.48" => ["protocolInformation"],
-        "2.5.4.49" => ["distinguishedName"],
-        "2.5.4.50" => ["uniqueMember"],
-        "2.5.4.51" => ["houseIdentifier"],
-        "2.5.4.52" => ["supportedAlgorithms"],
-        "2.5.4.53" => ["deltaRevocationList"],
-        "2.5.4.54" => ["dmdName"],
-        "2.5.4.65" => ["pseudonym"],
-        "2.5.18.1" => ["createTimestamp"],
-        "2.5.18.2" => ["modifyTimestamp"],
-        "2.5.18.3" => ["creatorsName"],
-        "2.5.18.4" => ["modifiersName"],
-        "2.5.18.5" => ["administrativeRole"],
-        "2.5.18.6" => ["subtreeSpecification"],
-        "2.5.18.9" => ["hasSubordinates"],
-        "2.5.18.10" => ["subschemaSubentry"],
-        "2.5.21.1" => ["dITStructureRules"],
-        "2.5.21.2" => ["dITContentRules"],
-        "2.5.21.4" => ["matchingRules"],
-        "2.5.21.5" => ["attributeTypes"],
-        "2.5.21.6" => ["objectClasses"],
-        "2.5.21.7" => ["nameForms"],
-        "2.5.21.8" => ["matchingRuleUse"],
-        "2.5.21.9" => ["structuralObjectClass"],
-        "2.16.840.1.113730.3.1.1" => ["carLicense"],
-        "2.16.840.1.113730.3.1.2" => ["departmentNumber"],
-        "2.16.840.1.113730.3.1.3" => ["employeeNumber"],
-        "2.16.840.1.113730.3.1.4" => ["employeeType"],
-        "2.16.840.1.113730.3.1.34" => ["ref"],
-        "2.16.840.1.113730.3.1.39" => ["preferredLanguage"],
-        "2.16.840.1.113730.3.1.40" => ["userSMIMECertificate"],
-        "2.16.840.1.113730.3.1.216" => ["userPKCS12"],
-        "2.16.840.1.113730.3.1.241" => ["displayName"]
-        /* @formatter:on */
-    );
+	/**
+	 * OID to attribute names mapping.
+	 *
+	 * First name is the primary name. If there's more than one name, others may
+	 * be used as an alias.
+	 *
+	 * Generated using ldap-attribs.py.
+	 *
+	 * @internal
+	 *
+	 * @var array
+	 */
+	const MAP_OID_TO_NAME = array(
+		/* @formatter:off */
+		"0.9.2342.19200300.100.1.1" => ["uid", "userid"],
+		"0.9.2342.19200300.100.1.2" => ["textEncodedORAddress"],
+		"0.9.2342.19200300.100.1.3" => ["mail", "rfc822Mailbox"],
+		"0.9.2342.19200300.100.1.4" => ["info"],
+		"0.9.2342.19200300.100.1.5" => ["drink", "favouriteDrink"],
+		"0.9.2342.19200300.100.1.6" => ["roomNumber"],
+		"0.9.2342.19200300.100.1.7" => ["photo"],
+		"0.9.2342.19200300.100.1.8" => ["userClass"],
+		"0.9.2342.19200300.100.1.9" => ["host"],
+		"0.9.2342.19200300.100.1.10" => ["manager"],
+		"0.9.2342.19200300.100.1.11" => ["documentIdentifier"],
+		"0.9.2342.19200300.100.1.12" => ["documentTitle"],
+		"0.9.2342.19200300.100.1.13" => ["documentVersion"],
+		"0.9.2342.19200300.100.1.14" => ["documentAuthor"],
+		"0.9.2342.19200300.100.1.15" => ["documentLocation"],
+		"0.9.2342.19200300.100.1.20" => ["homePhone", "homeTelephoneNumber"],
+		"0.9.2342.19200300.100.1.21" => ["secretary"],
+		"0.9.2342.19200300.100.1.22" => ["otherMailbox"],
+		"0.9.2342.19200300.100.1.25" => ["dc", "domainComponent"],
+		"0.9.2342.19200300.100.1.26" => ["aRecord"],
+		"0.9.2342.19200300.100.1.27" => ["mDRecord"],
+		"0.9.2342.19200300.100.1.28" => ["mXRecord"],
+		"0.9.2342.19200300.100.1.29" => ["nSRecord"],
+		"0.9.2342.19200300.100.1.30" => ["sOARecord"],
+		"0.9.2342.19200300.100.1.31" => ["cNAMERecord"],
+		"0.9.2342.19200300.100.1.37" => ["associatedDomain"],
+		"0.9.2342.19200300.100.1.38" => ["associatedName"],
+		"0.9.2342.19200300.100.1.39" => ["homePostalAddress"],
+		"0.9.2342.19200300.100.1.40" => ["personalTitle"],
+		"0.9.2342.19200300.100.1.41" => ["mobile", "mobileTelephoneNumber"],
+		"0.9.2342.19200300.100.1.42" => ["pager", "pagerTelephoneNumber"],
+		"0.9.2342.19200300.100.1.43" => ["co", "friendlyCountryName"],
+		"0.9.2342.19200300.100.1.44" => ["uniqueIdentifier"],
+		"0.9.2342.19200300.100.1.45" => ["organizationalStatus"],
+		"0.9.2342.19200300.100.1.46" => ["janetMailbox"],
+		"0.9.2342.19200300.100.1.47" => ["mailPreferenceOption"],
+		"0.9.2342.19200300.100.1.48" => ["buildingName"],
+		"0.9.2342.19200300.100.1.49" => ["dSAQuality"],
+		"0.9.2342.19200300.100.1.50" => ["singleLevelQuality"],
+		"0.9.2342.19200300.100.1.51" => ["subtreeMinimumQuality"],
+		"0.9.2342.19200300.100.1.52" => ["subtreeMaximumQuality"],
+		"0.9.2342.19200300.100.1.53" => ["personalSignature"],
+		"0.9.2342.19200300.100.1.54" => ["dITRedirect"],
+		"0.9.2342.19200300.100.1.55" => ["audio"],
+		"0.9.2342.19200300.100.1.56" => ["documentPublisher"],
+		"0.9.2342.19200300.100.1.60" => ["jpegPhoto"],
+		"1.2.840.113549.1.9.1" => ["email", "emailAddress", "pkcs9email"],
+		"1.2.840.113556.1.2.102" => ["memberOf"],
+		"1.3.6.1.1.1.1.0" => ["uidNumber"],
+		"1.3.6.1.1.1.1.1" => ["gidNumber"],
+		"1.3.6.1.1.1.1.2" => ["gecos"],
+		"1.3.6.1.1.1.1.3" => ["homeDirectory"],
+		"1.3.6.1.1.1.1.4" => ["loginShell"],
+		"1.3.6.1.1.1.1.5" => ["shadowLastChange"],
+		"1.3.6.1.1.1.1.6" => ["shadowMin"],
+		"1.3.6.1.1.1.1.7" => ["shadowMax"],
+		"1.3.6.1.1.1.1.8" => ["shadowWarning"],
+		"1.3.6.1.1.1.1.9" => ["shadowInactive"],
+		"1.3.6.1.1.1.1.10" => ["shadowExpire"],
+		"1.3.6.1.1.1.1.11" => ["shadowFlag"],
+		"1.3.6.1.1.1.1.12" => ["memberUid"],
+		"1.3.6.1.1.1.1.13" => ["memberNisNetgroup"],
+		"1.3.6.1.1.1.1.14" => ["nisNetgroupTriple"],
+		"1.3.6.1.1.1.1.15" => ["ipServicePort"],
+		"1.3.6.1.1.1.1.16" => ["ipServiceProtocol"],
+		"1.3.6.1.1.1.1.17" => ["ipProtocolNumber"],
+		"1.3.6.1.1.1.1.18" => ["oncRpcNumber"],
+		"1.3.6.1.1.1.1.19" => ["ipHostNumber"],
+		"1.3.6.1.1.1.1.20" => ["ipNetworkNumber"],
+		"1.3.6.1.1.1.1.21" => ["ipNetmaskNumber"],
+		"1.3.6.1.1.1.1.22" => ["macAddress"],
+		"1.3.6.1.1.1.1.23" => ["bootParameter"],
+		"1.3.6.1.1.1.1.24" => ["bootFile"],
+		"1.3.6.1.1.1.1.26" => ["nisMapName"],
+		"1.3.6.1.1.1.1.27" => ["nisMapEntry"],
+		"1.3.6.1.1.4" => ["vendorName"],
+		"1.3.6.1.1.5" => ["vendorVersion"],
+		"1.3.6.1.1.16.4" => ["entryUUID"],
+		"1.3.6.1.1.20" => ["entryDN"],
+		"2.5.4.0" => ["objectClass"],
+		"2.5.4.1" => ["aliasedObjectName", "aliasedEntryName"],
+		"2.5.4.2" => ["knowledgeInformation"],
+		"2.5.4.3" => ["cn", "commonName"],
+		"2.5.4.4" => ["sn", "surname"],
+		"2.5.4.5" => ["serialNumber"],
+		"2.5.4.6" => ["c", "countryName"],
+		"2.5.4.7" => ["l", "localityName"],
+		"2.5.4.8" => ["st", "stateOrProvinceName"],
+		"2.5.4.9" => ["street", "streetAddress"],
+		"2.5.4.10" => ["o", "organizationName"],
+		"2.5.4.11" => ["ou", "organizationalUnitName"],
+		"2.5.4.12" => ["title"],
+		"2.5.4.13" => ["description"],
+		"2.5.4.14" => ["searchGuide"],
+		"2.5.4.15" => ["businessCategory"],
+		"2.5.4.16" => ["postalAddress"],
+		"2.5.4.17" => ["postalCode"],
+		"2.5.4.18" => ["postOfficeBox"],
+		"2.5.4.19" => ["physicalDeliveryOfficeName"],
+		"2.5.4.20" => ["telephoneNumber"],
+		"2.5.4.21" => ["telexNumber"],
+		"2.5.4.22" => ["teletexTerminalIdentifier"],
+		"2.5.4.23" => ["facsimileTelephoneNumber", "fax"],
+		"2.5.4.24" => ["x121Address"],
+		"2.5.4.25" => ["internationaliSDNNumber"],
+		"2.5.4.26" => ["registeredAddress"],
+		"2.5.4.27" => ["destinationIndicator"],
+		"2.5.4.28" => ["preferredDeliveryMethod"],
+		"2.5.4.29" => ["presentationAddress"],
+		"2.5.4.30" => ["supportedApplicationContext"],
+		"2.5.4.31" => ["member"],
+		"2.5.4.32" => ["owner"],
+		"2.5.4.33" => ["roleOccupant"],
+		"2.5.4.34" => ["seeAlso"],
+		"2.5.4.35" => ["userPassword"],
+		"2.5.4.36" => ["userCertificate"],
+		"2.5.4.37" => ["cACertificate"],
+		"2.5.4.38" => ["authorityRevocationList"],
+		"2.5.4.39" => ["certificateRevocationList"],
+		"2.5.4.40" => ["crossCertificatePair"],
+		"2.5.4.41" => ["name"],
+		"2.5.4.42" => ["givenName", "gn"],
+		"2.5.4.43" => ["initials"],
+		"2.5.4.44" => ["generationQualifier"],
+		"2.5.4.45" => ["x500UniqueIdentifier"],
+		"2.5.4.46" => ["dnQualifier"],
+		"2.5.4.47" => ["enhancedSearchGuide"],
+		"2.5.4.48" => ["protocolInformation"],
+		"2.5.4.49" => ["distinguishedName"],
+		"2.5.4.50" => ["uniqueMember"],
+		"2.5.4.51" => ["houseIdentifier"],
+		"2.5.4.52" => ["supportedAlgorithms"],
+		"2.5.4.53" => ["deltaRevocationList"],
+		"2.5.4.54" => ["dmdName"],
+		"2.5.4.65" => ["pseudonym"],
+		"2.5.18.1" => ["createTimestamp"],
+		"2.5.18.2" => ["modifyTimestamp"],
+		"2.5.18.3" => ["creatorsName"],
+		"2.5.18.4" => ["modifiersName"],
+		"2.5.18.5" => ["administrativeRole"],
+		"2.5.18.6" => ["subtreeSpecification"],
+		"2.5.18.9" => ["hasSubordinates"],
+		"2.5.18.10" => ["subschemaSubentry"],
+		"2.5.21.1" => ["dITStructureRules"],
+		"2.5.21.2" => ["dITContentRules"],
+		"2.5.21.4" => ["matchingRules"],
+		"2.5.21.5" => ["attributeTypes"],
+		"2.5.21.6" => ["objectClasses"],
+		"2.5.21.7" => ["nameForms"],
+		"2.5.21.8" => ["matchingRuleUse"],
+		"2.5.21.9" => ["structuralObjectClass"],
+		"2.16.840.1.113730.3.1.1" => ["carLicense"],
+		"2.16.840.1.113730.3.1.2" => ["departmentNumber"],
+		"2.16.840.1.113730.3.1.3" => ["employeeNumber"],
+		"2.16.840.1.113730.3.1.4" => ["employeeType"],
+		"2.16.840.1.113730.3.1.34" => ["ref"],
+		"2.16.840.1.113730.3.1.39" => ["preferredLanguage"],
+		"2.16.840.1.113730.3.1.40" => ["userSMIMECertificate"],
+		"2.16.840.1.113730.3.1.216" => ["userPKCS12"],
+		"2.16.840.1.113730.3.1.241" => ["displayName"]
+		/* @formatter:on */
+	);
     
-    /**
-     * OID of the attribute.
-     *
-     * @var string $_oid
-     */
-    protected $_oid;
+	/**
+	 * OID of the attribute.
+	 *
+	 * @var string $_oid
+	 */
+	protected $_oid;
     
-    /**
-     * Constructor.
-     *
-     * @param string $oid OID in dotted format.
-     */
-    public function __construct(string $oid)
-    {
-        $this->_oid = $oid;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $oid OID in dotted format.
+	 */
+	public function __construct(string $oid)
+	{
+		$this->_oid = $oid;
+	}
     
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param ObjectIdentifier $oi
-     * @return self
-     */
-    public static function fromASN1(ObjectIdentifier $oi): self
-    {
-        return new self($oi->oid());
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param ObjectIdentifier $oi
+	 * @return self
+	 */
+	public static function fromASN1(ObjectIdentifier $oi): self
+	{
+		return new self($oi->oid());
+	}
     
-    /**
-     * Initialize from attribute name.
-     *
-     * @param string $name
-     * @return self
-     */
-    public static function fromName(string $name): self
-    {
-        $oid = self::attrNameToOID($name);
-        return new self($oid);
-    }
+	/**
+	 * Initialize from attribute name.
+	 *
+	 * @param string $name
+	 * @return self
+	 */
+	public static function fromName(string $name): self
+	{
+		$oid = self::attrNameToOID($name);
+		return new self($oid);
+	}
     
-    /**
-     * Get OID of the attribute.
-     *
-     * @return string OID in dotted format
-     */
-    public function oid(): string
-    {
-        return $this->_oid;
-    }
+	/**
+	 * Get OID of the attribute.
+	 *
+	 * @return string OID in dotted format
+	 */
+	public function oid(): string
+	{
+		return $this->_oid;
+	}
     
-    /**
-     * Get name of the attribute.
-     *
-     * @return string
-     */
-    public function typeName(): string
-    {
-        if (array_key_exists($this->_oid, self::MAP_OID_TO_NAME)) {
-            return self::MAP_OID_TO_NAME[$this->_oid][0];
-        }
-        return $this->_oid;
-    }
+	/**
+	 * Get name of the attribute.
+	 *
+	 * @return string
+	 */
+	public function typeName(): string
+	{
+		if (array_key_exists($this->_oid, self::MAP_OID_TO_NAME)) {
+			return self::MAP_OID_TO_NAME[$this->_oid][0];
+		}
+		return $this->_oid;
+	}
     
-    /**
-     * Generate ASN.1 element.
-     *
-     * @return ObjectIdentifier
-     */
-    public function toASN1(): ObjectIdentifier
-    {
-        return new ObjectIdentifier($this->_oid);
-    }
+	/**
+	 * Generate ASN.1 element.
+	 *
+	 * @return ObjectIdentifier
+	 */
+	public function toASN1(): ObjectIdentifier
+	{
+		return new ObjectIdentifier($this->_oid);
+	}
     
-    /**
-     * Get name to OID lookup map.
-     *
-     * @return array
-     */
-    private static function _oidReverseMap(): array
-    {
-        static $map;
-        if (!isset($map)) {
-            $map = array();
-            // for eatch attribute type
-            foreach (self::MAP_OID_TO_NAME as $oid => $names) {
-                // for primary name and aliases
-                foreach ($names as $name) {
-                    $map[strtolower($name)] = $oid;
-                }
-            }
-        }
-        return $map;
-    }
+	/**
+	 * Get name to OID lookup map.
+	 *
+	 * @return array
+	 */
+	private static function _oidReverseMap(): array
+	{
+		static $map;
+		if (!isset($map)) {
+			$map = array();
+			// for eatch attribute type
+			foreach (self::MAP_OID_TO_NAME as $oid => $names) {
+				// for primary name and aliases
+				foreach ($names as $name) {
+					$map[strtolower($name)] = $oid;
+				}
+			}
+		}
+		return $map;
+	}
     
-    /**
-     * Convert attribute name to OID.
-     *
-     * @param string $name Primary attribute name or an alias
-     * @throws \OutOfBoundsException
-     * @return string OID in dotted format
-     */
-    public static function attrNameToOID(string $name): string
-    {
-        // if already in OID form
-        if (preg_match('/^[0-9]+(?:\.[0-9]+)*$/', $name)) {
-            return $name;
-        }
-        $map = self::_oidReverseMap();
-        $k = strtolower($name);
-        if (!isset($map[$k])) {
-            throw new \OutOfBoundsException("No OID for $name.");
-        }
-        return $map[$k];
-    }
+	/**
+	 * Convert attribute name to OID.
+	 *
+	 * @param string $name Primary attribute name or an alias
+	 * @throws \OutOfBoundsException
+	 * @return string OID in dotted format
+	 */
+	public static function attrNameToOID(string $name): string
+	{
+		// if already in OID form
+		if (preg_match('/^[0-9]+(?:\.[0-9]+)*$/', $name)) {
+			return $name;
+		}
+		$map = self::_oidReverseMap();
+		$k = strtolower($name);
+		if (!isset($map[$k])) {
+			throw new \OutOfBoundsException("No OID for $name.");
+		}
+		return $map[$k];
+	}
     
-    /**
-     * Get ASN.1 string for given attribute type.
-     *
-     * @param string $oid Attribute OID
-     * @param string $str String
-     * @throws \LogicException
-     * @return \ASN1\Type\StringType
-     */
-    public static function asn1StringForType(string $oid, string $str): StringType
-    {
-        if (!array_key_exists($oid, self::MAP_ATTR_TO_STR_TYPE)) {
-            return new UTF8String($str);
-        }
-        switch (self::MAP_ATTR_TO_STR_TYPE[$oid]) {
-            case Element::TYPE_PRINTABLE_STRING:
-                return new PrintableString($str);
-            // @codeCoverageIgnoreStart
-            default:
-                // only reachable during development
-                throw new \LogicException();
-        }
-        // @codeCoverageIgnoreEnd
-    }
+	/**
+	 * Get ASN.1 string for given attribute type.
+	 *
+	 * @param string $oid Attribute OID
+	 * @param string $str String
+	 * @throws \LogicException
+	 * @return \ASN1\Type\StringType
+	 */
+	public static function asn1StringForType(string $oid, string $str): StringType
+	{
+		if (!array_key_exists($oid, self::MAP_ATTR_TO_STR_TYPE)) {
+			return new UTF8String($str);
+		}
+		switch (self::MAP_ATTR_TO_STR_TYPE[$oid]) {
+			case Element::TYPE_PRINTABLE_STRING:
+				return new PrintableString($str);
+			// @codeCoverageIgnoreStart
+			default:
+				// only reachable during development
+				throw new \LogicException();
+		}
+		// @codeCoverageIgnoreEnd
+	}
 }

lib/X501/MatchingRule/CaseIgnoreMatch.php

Indentation +10 added lines, -10 removed lines

@@ -13,14 +13,14 @@
  */
 class CaseIgnoreMatch extends StringPrepMatchingRule
 {
-    /**
-     * Constructor.
-     *
-     * @param int $string_type ASN.1 string type tag
-     */
-    public function __construct(int $string_type)
-    {
-        parent::__construct(
-            StringPreparer::forStringType($string_type)->withCaseFolding(true));
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $string_type ASN.1 string type tag
+	 */
+	public function __construct(int $string_type)
+	{
+		parent::__construct(
+			StringPreparer::forStringType($string_type)->withCaseFolding(true));
+	}
 }

lib/X501/MatchingRule/CaseExactMatch.php

Indentation +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@
  */
 class CaseExactMatch extends StringPrepMatchingRule
 {
-    /**
-     * Constructor.
-     *
-     * @param int $string_type ASN.1 string type tag
-     */
-    public function __construct(int $string_type)
-    {
-        parent::__construct(StringPreparer::forStringType($string_type));
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param int $string_type ASN.1 string type tag
+	 */
+	public function __construct(int $string_type)
+	{
+		parent::__construct(StringPreparer::forStringType($string_type));
+	}
 }

lib/X501/DN/DNParser.php

Indentation +369 added lines, -369 removed lines

@@ -15,390 +15,390 @@
  */
 class DNParser
 {
-    /**
-     * DN string.
-     *
-     * @var string
-     */
-    private $_dn;
+	/**
+	 * DN string.
+	 *
+	 * @var string
+	 */
+	private $_dn;
     
-    /**
-     * DN string length.
-     *
-     * @var int
-     */
-    private $_len;
+	/**
+	 * DN string length.
+	 *
+	 * @var int
+	 */
+	private $_len;
     
-    /**
-     * RFC 2253 special characters.
-     *
-     * @var string
-     */
-    const SPECIAL_CHARS = ",=+<>#;";
+	/**
+	 * RFC 2253 special characters.
+	 *
+	 * @var string
+	 */
+	const SPECIAL_CHARS = ",=+<>#;";
     
-    /**
-     * Parse distinguished name string to name-components.
-     *
-     * @param string $dn
-     * @return array
-     */
-    public static function parseString(string $dn): array
-    {
-        $parser = new self($dn);
-        return $parser->parse();
-    }
+	/**
+	 * Parse distinguished name string to name-components.
+	 *
+	 * @param string $dn
+	 * @return array
+	 */
+	public static function parseString(string $dn): array
+	{
+		$parser = new self($dn);
+		return $parser->parse();
+	}
     
-    /**
-     * Escape a AttributeValue string conforming to RFC 2253.
-     *
-     * @link https://tools.ietf.org/html/rfc2253#section-2.4
-     * @param string $str
-     * @return string
-     */
-    public static function escapeString(string $str): string
-    {
-        // one of the characters ",", "+", """, "\", "<", ">" or ";"
-        $str = preg_replace('/([,\+"\\\<\>;])/u', '\\\\$1', $str);
-        // a space character occurring at the end of the string
-        $str = preg_replace('/( )$/u', '\\\\$1', $str);
-        // a space or "#" character occurring at the beginning of the string
-        $str = preg_replace('/^([ #])/u', '\\\\$1', $str);
-        // implementation specific special characters
-        $str = preg_replace_callback('/([\pC])/u',
-            function ($m) {
-                $octets = str_split(bin2hex($m[1]), 2);
-                return implode("",
-                    array_map(
-                        function ($octet) {
-                            return '\\' . strtoupper($octet);
-                        }, $octets));
-            }, $str);
-        return $str;
-    }
+	/**
+	 * Escape a AttributeValue string conforming to RFC 2253.
+	 *
+	 * @link https://tools.ietf.org/html/rfc2253#section-2.4
+	 * @param string $str
+	 * @return string
+	 */
+	public static function escapeString(string $str): string
+	{
+		// one of the characters ",", "+", """, "\", "<", ">" or ";"
+		$str = preg_replace('/([,\+"\\\<\>;])/u', '\\\\$1', $str);
+		// a space character occurring at the end of the string
+		$str = preg_replace('/( )$/u', '\\\\$1', $str);
+		// a space or "#" character occurring at the beginning of the string
+		$str = preg_replace('/^([ #])/u', '\\\\$1', $str);
+		// implementation specific special characters
+		$str = preg_replace_callback('/([\pC])/u',
+			function ($m) {
+				$octets = str_split(bin2hex($m[1]), 2);
+				return implode("",
+					array_map(
+						function ($octet) {
+							return '\\' . strtoupper($octet);
+						}, $octets));
+			}, $str);
+		return $str;
+	}
     
-    /**
-     * Constructor.
-     *
-     * @param string $dn Distinguised name
-     */
-    protected function __construct(string $dn)
-    {
-        $this->_dn = $dn;
-        $this->_len = strlen($dn);
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string $dn Distinguised name
+	 */
+	protected function __construct(string $dn)
+	{
+		$this->_dn = $dn;
+		$this->_len = strlen($dn);
+	}
     
-    /**
-     * Parse DN to name-components.
-     *
-     * @throws \RuntimeException
-     * @return array
-     */
-    protected function parse(): array
-    {
-        $offset = 0;
-        $name = $this->_parseName($offset);
-        if ($offset < $this->_len) {
-            $remains = substr($this->_dn, $offset);
-            throw new \UnexpectedValueException(
-                "Parser finished before the end of string" .
-                     ", remaining: '$remains'.");
-        }
-        return $name;
-    }
+	/**
+	 * Parse DN to name-components.
+	 *
+	 * @throws \RuntimeException
+	 * @return array
+	 */
+	protected function parse(): array
+	{
+		$offset = 0;
+		$name = $this->_parseName($offset);
+		if ($offset < $this->_len) {
+			$remains = substr($this->_dn, $offset);
+			throw new \UnexpectedValueException(
+				"Parser finished before the end of string" .
+					 ", remaining: '$remains'.");
+		}
+		return $name;
+	}
     
-    /**
-     * Parse 'name'.
-     *
-     * name-component *("," name-component)
-     *
-     * @param int $offset
-     * @return array Array of name-components
-     */
-    private function _parseName(int &$offset): array
-    {
-        $idx = $offset;
-        $names = array();
-        while ($idx < $this->_len) {
-            $names[] = $this->_parseNameComponent($idx);
-            if ($idx >= $this->_len) {
-                break;
-            }
-            $this->_skipWs($idx);
-            if ("," != $this->_dn[$idx] && ";" != $this->_dn[$idx]) {
-                break;
-            }
-            $idx++;
-            $this->_skipWs($idx);
-        }
-        $offset = $idx;
-        return array_reverse($names);
-    }
+	/**
+	 * Parse 'name'.
+	 *
+	 * name-component *("," name-component)
+	 *
+	 * @param int $offset
+	 * @return array Array of name-components
+	 */
+	private function _parseName(int &$offset): array
+	{
+		$idx = $offset;
+		$names = array();
+		while ($idx < $this->_len) {
+			$names[] = $this->_parseNameComponent($idx);
+			if ($idx >= $this->_len) {
+				break;
+			}
+			$this->_skipWs($idx);
+			if ("," != $this->_dn[$idx] && ";" != $this->_dn[$idx]) {
+				break;
+			}
+			$idx++;
+			$this->_skipWs($idx);
+		}
+		$offset = $idx;
+		return array_reverse($names);
+	}
     
-    /**
-     * Parse 'name-component'.
-     *
-     * attributeTypeAndValue *("+" attributeTypeAndValue)
-     *
-     * @param int $offset
-     * @return array Array of [type, value] tuples
-     */
-    private function _parseNameComponent(int &$offset): array
-    {
-        $idx = $offset;
-        $tvpairs = array();
-        while ($idx < $this->_len) {
-            $tvpairs[] = $this->_parseAttrTypeAndValue($idx);
-            $this->_skipWs($idx);
-            if ($idx >= $this->_len || "+" != $this->_dn[$idx]) {
-                break;
-            }
-            ++$idx;
-            $this->_skipWs($idx);
-        }
-        $offset = $idx;
-        return $tvpairs;
-    }
+	/**
+	 * Parse 'name-component'.
+	 *
+	 * attributeTypeAndValue *("+" attributeTypeAndValue)
+	 *
+	 * @param int $offset
+	 * @return array Array of [type, value] tuples
+	 */
+	private function _parseNameComponent(int &$offset): array
+	{
+		$idx = $offset;
+		$tvpairs = array();
+		while ($idx < $this->_len) {
+			$tvpairs[] = $this->_parseAttrTypeAndValue($idx);
+			$this->_skipWs($idx);
+			if ($idx >= $this->_len || "+" != $this->_dn[$idx]) {
+				break;
+			}
+			++$idx;
+			$this->_skipWs($idx);
+		}
+		$offset = $idx;
+		return $tvpairs;
+	}
     
-    /**
-     * Parse 'attributeTypeAndValue'.
-     *
-     * attributeType "=" attributeValue
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return array A tuple of [type, value]. Value may be either a string or
-     *         an Element, if it's encoded as hexstring.
-     */
-    private function _parseAttrTypeAndValue(int &$offset): array
-    {
-        $idx = $offset;
-        $type = $this->_parseAttrType($idx);
-        $this->_skipWs($idx);
-        if ($idx >= $this->_len || "=" != $this->_dn[$idx++]) {
-            throw new \UnexpectedValueException("Invalid type and value pair.");
-        }
-        $this->_skipWs($idx);
-        // hexstring
-        if ($idx < $this->_len && "#" == $this->_dn[$idx]) {
-            ++$idx;
-            $data = $this->_parseAttrHexValue($idx);
-            try {
-                $value = Element::fromDER($data);
-            } catch (DecodeException $e) {
-                throw new \UnexpectedValueException(
-                    "Invalid DER encoding from hexstring.", 0, $e);
-            }
-        } else {
-            $value = $this->_parseAttrStringValue($idx);
-        }
-        $offset = $idx;
-        return array($type, $value);
-    }
+	/**
+	 * Parse 'attributeTypeAndValue'.
+	 *
+	 * attributeType "=" attributeValue
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return array A tuple of [type, value]. Value may be either a string or
+	 *         an Element, if it's encoded as hexstring.
+	 */
+	private function _parseAttrTypeAndValue(int &$offset): array
+	{
+		$idx = $offset;
+		$type = $this->_parseAttrType($idx);
+		$this->_skipWs($idx);
+		if ($idx >= $this->_len || "=" != $this->_dn[$idx++]) {
+			throw new \UnexpectedValueException("Invalid type and value pair.");
+		}
+		$this->_skipWs($idx);
+		// hexstring
+		if ($idx < $this->_len && "#" == $this->_dn[$idx]) {
+			++$idx;
+			$data = $this->_parseAttrHexValue($idx);
+			try {
+				$value = Element::fromDER($data);
+			} catch (DecodeException $e) {
+				throw new \UnexpectedValueException(
+					"Invalid DER encoding from hexstring.", 0, $e);
+			}
+		} else {
+			$value = $this->_parseAttrStringValue($idx);
+		}
+		$offset = $idx;
+		return array($type, $value);
+	}
     
-    /**
-     * Parse 'attributeType'.
-     *
-     * (ALPHA 1*keychar) / oid
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrType(int &$offset): string
-    {
-        $idx = $offset;
-        // dotted OID
-        $type = $this->_regexMatch('/^(?:oid\.)?([0-9]+(?:\.[0-9]+)*)/i', $idx);
-        if (null === $type) {
-            // name
-            $type = $this->_regexMatch('/^[a-z][a-z0-9\-]*/i', $idx);
-            if (null === $type) {
-                throw new \UnexpectedValueException("Invalid attribute type.");
-            }
-        }
-        $offset = $idx;
-        return $type;
-    }
+	/**
+	 * Parse 'attributeType'.
+	 *
+	 * (ALPHA 1*keychar) / oid
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrType(int &$offset): string
+	{
+		$idx = $offset;
+		// dotted OID
+		$type = $this->_regexMatch('/^(?:oid\.)?([0-9]+(?:\.[0-9]+)*)/i', $idx);
+		if (null === $type) {
+			// name
+			$type = $this->_regexMatch('/^[a-z][a-z0-9\-]*/i', $idx);
+			if (null === $type) {
+				throw new \UnexpectedValueException("Invalid attribute type.");
+			}
+		}
+		$offset = $idx;
+		return $type;
+	}
     
-    /**
-     * Parse 'attributeValue' of string type.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrStringValue(int &$offset): string
-    {
-        $idx = $offset;
-        if ($idx >= $this->_len) {
-            return "";
-        }
-        if ('"' == $this->_dn[$idx]) { // quoted string
-            $val = $this->_parseQuotedAttrString($idx);
-        } else { // string
-            $val = $this->_parseAttrString($idx);
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse 'attributeValue' of string type.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrStringValue(int &$offset): string
+	{
+		$idx = $offset;
+		if ($idx >= $this->_len) {
+			return "";
+		}
+		if ('"' == $this->_dn[$idx]) { // quoted string
+			$val = $this->_parseQuotedAttrString($idx);
+		} else { // string
+			$val = $this->_parseAttrString($idx);
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Parse plain 'attributeValue' string.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrString(int &$offset): string
-    {
-        $idx = $offset;
-        $val = "";
-        $wsidx = null;
-        while ($idx < $this->_len) {
-            $c = $this->_dn[$idx];
-            // pair (escape sequence)
-            if ("\\" == $c) {
-                ++$idx;
-                $val .= $this->_parsePairAfterSlash($idx);
-                $wsidx = null;
-                continue;
-            } else if ('"' == $c) {
-                throw new \UnexpectedValueException("Unexpected quotation.");
-            } else if (false !== strpos(self::SPECIAL_CHARS, $c)) {
-                break;
-            }
-            // keep track of the first consecutive whitespace
-            if (' ' == $c) {
-                if (null === $wsidx) {
-                    $wsidx = $idx;
-                }
-            } else {
-                $wsidx = null;
-            }
-            // stringchar
-            $val .= $c;
-            ++$idx;
-        }
-        // if there was non-escaped whitespace in the end of the value
-        if (null !== $wsidx) {
-            $val = substr($val, 0, -($idx - $wsidx));
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse plain 'attributeValue' string.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrString(int &$offset): string
+	{
+		$idx = $offset;
+		$val = "";
+		$wsidx = null;
+		while ($idx < $this->_len) {
+			$c = $this->_dn[$idx];
+			// pair (escape sequence)
+			if ("\\" == $c) {
+				++$idx;
+				$val .= $this->_parsePairAfterSlash($idx);
+				$wsidx = null;
+				continue;
+			} else if ('"' == $c) {
+				throw new \UnexpectedValueException("Unexpected quotation.");
+			} else if (false !== strpos(self::SPECIAL_CHARS, $c)) {
+				break;
+			}
+			// keep track of the first consecutive whitespace
+			if (' ' == $c) {
+				if (null === $wsidx) {
+					$wsidx = $idx;
+				}
+			} else {
+				$wsidx = null;
+			}
+			// stringchar
+			$val .= $c;
+			++$idx;
+		}
+		// if there was non-escaped whitespace in the end of the value
+		if (null !== $wsidx) {
+			$val = substr($val, 0, -($idx - $wsidx));
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Parse quoted 'attributeValue' string.
-     *
-     * @param int $offset Offset to starting quote
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseQuotedAttrString(int &$offset): string
-    {
-        $idx = $offset + 1;
-        $val = "";
-        while ($idx < $this->_len) {
-            $c = $this->_dn[$idx];
-            if ("\\" == $c) { // pair
-                ++$idx;
-                $val .= $this->_parsePairAfterSlash($idx);
-                continue;
-            } else if ('"' == $c) {
-                ++$idx;
-                break;
-            }
-            $val .= $c;
-            ++$idx;
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse quoted 'attributeValue' string.
+	 *
+	 * @param int $offset Offset to starting quote
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseQuotedAttrString(int &$offset): string
+	{
+		$idx = $offset + 1;
+		$val = "";
+		while ($idx < $this->_len) {
+			$c = $this->_dn[$idx];
+			if ("\\" == $c) { // pair
+				++$idx;
+				$val .= $this->_parsePairAfterSlash($idx);
+				continue;
+			} else if ('"' == $c) {
+				++$idx;
+				break;
+			}
+			$val .= $c;
+			++$idx;
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Parse 'attributeValue' of binary type.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parseAttrHexValue(int &$offset): string
-    {
-        $idx = $offset;
-        $hexstr = $this->_regexMatch('/^(?:[0-9a-f]{2})+/i', $idx);
-        if (null === $hexstr) {
-            throw new \UnexpectedValueException("Invalid hexstring.");
-        }
-        $data = hex2bin($hexstr);
-        $offset = $idx;
-        return $data;
-    }
+	/**
+	 * Parse 'attributeValue' of binary type.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parseAttrHexValue(int &$offset): string
+	{
+		$idx = $offset;
+		$hexstr = $this->_regexMatch('/^(?:[0-9a-f]{2})+/i', $idx);
+		if (null === $hexstr) {
+			throw new \UnexpectedValueException("Invalid hexstring.");
+		}
+		$data = hex2bin($hexstr);
+		$offset = $idx;
+		return $data;
+	}
     
-    /**
-     * Parse 'pair' after leading slash.
-     *
-     * @param int $offset
-     * @throws \UnexpectedValueException
-     * @return string
-     */
-    private function _parsePairAfterSlash(int &$offset): string
-    {
-        $idx = $offset;
-        if ($idx >= $this->_len) {
-            throw new \UnexpectedValueException(
-                "Unexpected end of escape sequence.");
-        }
-        $c = $this->_dn[$idx++];
-        // special | \ | " | SPACE
-        if (false !== strpos(self::SPECIAL_CHARS . '\\" ', $c)) {
-            $val = $c;
-        } else { // hexpair
-            if ($idx >= $this->_len) {
-                throw new \UnexpectedValueException("Unexpected end of hexpair.");
-            }
-            $val = @hex2bin($c . $this->_dn[$idx++]);
-            if (false === $val) {
-                throw new \UnexpectedValueException("Invalid hexpair.");
-            }
-        }
-        $offset = $idx;
-        return $val;
-    }
+	/**
+	 * Parse 'pair' after leading slash.
+	 *
+	 * @param int $offset
+	 * @throws \UnexpectedValueException
+	 * @return string
+	 */
+	private function _parsePairAfterSlash(int &$offset): string
+	{
+		$idx = $offset;
+		if ($idx >= $this->_len) {
+			throw new \UnexpectedValueException(
+				"Unexpected end of escape sequence.");
+		}
+		$c = $this->_dn[$idx++];
+		// special | \ | " | SPACE
+		if (false !== strpos(self::SPECIAL_CHARS . '\\" ', $c)) {
+			$val = $c;
+		} else { // hexpair
+			if ($idx >= $this->_len) {
+				throw new \UnexpectedValueException("Unexpected end of hexpair.");
+			}
+			$val = @hex2bin($c . $this->_dn[$idx++]);
+			if (false === $val) {
+				throw new \UnexpectedValueException("Invalid hexpair.");
+			}
+		}
+		$offset = $idx;
+		return $val;
+	}
     
-    /**
-     * Match DN to pattern and extract the last capture group.
-     *
-     * Updates offset to fully matched pattern.
-     *
-     * @param string $pattern
-     * @param int $offset
-     * @return string|null Null if pattern doesn't match
-     */
-    private function _regexMatch(string $pattern, int &$offset)
-    {
-        $idx = $offset;
-        if (!preg_match($pattern, substr($this->_dn, $idx), $match)) {
-            return null;
-        }
-        $idx += strlen($match[0]);
-        $offset = $idx;
-        return end($match);
-    }
+	/**
+	 * Match DN to pattern and extract the last capture group.
+	 *
+	 * Updates offset to fully matched pattern.
+	 *
+	 * @param string $pattern
+	 * @param int $offset
+	 * @return string|null Null if pattern doesn't match
+	 */
+	private function _regexMatch(string $pattern, int &$offset)
+	{
+		$idx = $offset;
+		if (!preg_match($pattern, substr($this->_dn, $idx), $match)) {
+			return null;
+		}
+		$idx += strlen($match[0]);
+		$offset = $idx;
+		return end($match);
+	}
     
-    /**
-     * Skip consecutive spaces.
-     *
-     * @param int $offset
-     */
-    private function _skipWs(int &$offset)
-    {
-        $idx = $offset;
-        while ($idx < $this->_len) {
-            if (" " != $this->_dn[$idx]) {
-                break;
-            }
-            ++$idx;
-        }
-        $offset = $idx;
-    }
+	/**
+	 * Skip consecutive spaces.
+	 *
+	 * @param int $offset
+	 */
+	private function _skipWs(int &$offset)
+	{
+		$idx = $offset;
+		while ($idx < $this->_len) {
+			if (" " != $this->_dn[$idx]) {
+				break;
+			}
+			++$idx;
+		}
+		$offset = $idx;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -65,11 +65,11 @@ 
         $str = preg_replace('/^([ #])/u', '\\\\$1', $str);
         // implementation specific special characters
         $str = preg_replace_callback('/([\pC])/u',
-            function ($m) {
+            function($m) {
                 $octets = str_split(bin2hex($m[1]), 2);
                 return implode("",
                     array_map(
-                        function ($octet) {
+                        function($octet) {
                             return '\\' . strtoupper($octet);
                         }, $octets));
             }, $str);
@@ -114,7 +114,7 @@ 
      * @param int $offset
      * @return array Array of name-components
      */
-    private function _parseName(int &$offset): array
+    private function _parseName(int & $offset): array
     {
         $idx = $offset;
         $names = array();
@@ -142,7 +142,7 @@ 
      * @param int $offset
      * @return array Array of [type, value] tuples
      */
-    private function _parseNameComponent(int &$offset): array
+    private function _parseNameComponent(int & $offset): array
     {
         $idx = $offset;
         $tvpairs = array();
@@ -169,7 +169,7 @@ 
      * @return array A tuple of [type, value]. Value may be either a string or
      *         an Element, if it's encoded as hexstring.
      */
-    private function _parseAttrTypeAndValue(int &$offset): array
+    private function _parseAttrTypeAndValue(int & $offset): array
     {
         $idx = $offset;
         $type = $this->_parseAttrType($idx);
@@ -204,7 +204,7 @@ 
      * @throws \UnexpectedValueException
      * @return string
      */
-    private function _parseAttrType(int &$offset): string
+    private function _parseAttrType(int & $offset): string
     {
         $idx = $offset;
         // dotted OID
@@ -227,7 +227,7 @@ 
      * @throws \UnexpectedValueException
      * @return string
      */
-    private function _parseAttrStringValue(int &$offset): string
+    private function _parseAttrStringValue(int & $offset): string
     {
         $idx = $offset;
         if ($idx >= $this->_len) {
@@ -249,7 +249,7 @@ 
      * @throws \UnexpectedValueException
      * @return string
      */
-    private function _parseAttrString(int &$offset): string
+    private function _parseAttrString(int & $offset): string
     {
         $idx = $offset;
         $val = "";
@@ -294,7 +294,7 @@ 
      * @throws \UnexpectedValueException
      * @return string
      */
-    private function _parseQuotedAttrString(int &$offset): string
+    private function _parseQuotedAttrString(int & $offset): string
     {
         $idx = $offset + 1;
         $val = "";
@@ -322,7 +322,7 @@ 
      * @throws \UnexpectedValueException
      * @return string
      */
-    private function _parseAttrHexValue(int &$offset): string
+    private function _parseAttrHexValue(int & $offset): string
     {
         $idx = $offset;
         $hexstr = $this->_regexMatch('/^(?:[0-9a-f]{2})+/i', $idx);
@@ -341,7 +341,7 @@ 
      * @throws \UnexpectedValueException
      * @return string
      */
-    private function _parsePairAfterSlash(int &$offset): string
+    private function _parsePairAfterSlash(int & $offset): string
     {
         $idx = $offset;
         if ($idx >= $this->_len) {
@@ -374,7 +374,7 @@ 
      * @param int $offset
      * @return string|null Null if pattern doesn't match
      */
-    private function _regexMatch(string $pattern, int &$offset)
+    private function _regexMatch(string $pattern, int & $offset)
     {
         $idx = $offset;
         if (!preg_match($pattern, substr($this->_dn, $idx), $match)) {
@@ -390,7 +390,7 @@ 
      *
      * @param int $offset
      */
-    private function _skipWs(int &$offset)
+    private function _skipWs(int & $offset)
     {
         $idx = $offset;
         while ($idx < $this->_len) {

lib/X501/StringPrep/StringPreparer.php

Indentation +68 added lines, -68 removed lines

@@ -11,77 +11,77 @@
  */
 class StringPreparer
 {
-    const STEP_TRANSCODE = 1;
-    const STEP_MAP = 2;
-    const STEP_NORMALIZE = 3;
-    const STEP_PROHIBIT = 4;
-    const STEP_CHECK_BIDI = 5;
-    const STEP_INSIGNIFICANT_CHARS = 6;
+	const STEP_TRANSCODE = 1;
+	const STEP_MAP = 2;
+	const STEP_NORMALIZE = 3;
+	const STEP_PROHIBIT = 4;
+	const STEP_CHECK_BIDI = 5;
+	const STEP_INSIGNIFICANT_CHARS = 6;
     
-    /**
-     * Preparation steps.
-     *
-     * @var PrepareStep[] $_steps
-     */
-    protected $_steps;
+	/**
+	 * Preparation steps.
+	 *
+	 * @var PrepareStep[] $_steps
+	 */
+	protected $_steps;
     
-    /**
-     * Constructor.
-     *
-     * @param PrepareStep[] $steps Preparation steps to apply
-     */
-    protected function __construct(array $steps)
-    {
-        $this->_steps = $steps;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param PrepareStep[] $steps Preparation steps to apply
+	 */
+	protected function __construct(array $steps)
+	{
+		$this->_steps = $steps;
+	}
     
-    /**
-     * Get default instance for given string type.
-     *
-     * @param int $string_type ASN.1 string type tag.
-     * @return self
-     */
-    public static function forStringType(int $string_type): self
-    {
-        $steps = array(
-            /* @formatter:off */
-            self::STEP_TRANSCODE => new TranscodeStep($string_type), 
-            self::STEP_MAP => new MapStep(), 
-            self::STEP_NORMALIZE => new NormalizeStep(), 
-            self::STEP_PROHIBIT => new ProhibitStep(), 
-            self::STEP_CHECK_BIDI => new CheckBidiStep(), 
-            // @todo Vary by string type
-            self::STEP_INSIGNIFICANT_CHARS => 
-                new InsignificantNonSubstringSpaceStep()
-            /* @formatter:on */
-        );
-        return new self($steps);
-    }
+	/**
+	 * Get default instance for given string type.
+	 *
+	 * @param int $string_type ASN.1 string type tag.
+	 * @return self
+	 */
+	public static function forStringType(int $string_type): self
+	{
+		$steps = array(
+			/* @formatter:off */
+			self::STEP_TRANSCODE => new TranscodeStep($string_type), 
+			self::STEP_MAP => new MapStep(), 
+			self::STEP_NORMALIZE => new NormalizeStep(), 
+			self::STEP_PROHIBIT => new ProhibitStep(), 
+			self::STEP_CHECK_BIDI => new CheckBidiStep(), 
+			// @todo Vary by string type
+			self::STEP_INSIGNIFICANT_CHARS => 
+				new InsignificantNonSubstringSpaceStep()
+			/* @formatter:on */
+		);
+		return new self($steps);
+	}
     
-    /**
-     * Get self with case folding set.
-     *
-     * @param bool $fold True to apply case folding
-     * @return self
-     */
-    public function withCaseFolding(bool $fold): self
-    {
-        $obj = clone $this;
-        $obj->_steps[self::STEP_MAP] = new MapStep($fold);
-        return $obj;
-    }
+	/**
+	 * Get self with case folding set.
+	 *
+	 * @param bool $fold True to apply case folding
+	 * @return self
+	 */
+	public function withCaseFolding(bool $fold): self
+	{
+		$obj = clone $this;
+		$obj->_steps[self::STEP_MAP] = new MapStep($fold);
+		return $obj;
+	}
     
-    /**
-     * Prepare string.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function prepare(string $string): string
-    {
-        foreach ($this->_steps as $step) {
-            $string = $step->apply($string);
-        }
-        return $string;
-    }
+	/**
+	 * Prepare string.
+	 *
+	 * @param string $string
+	 * @return string
+	 */
+	public function prepare(string $string): string
+	{
+		foreach ($this->_steps as $step) {
+			$string = $step->apply($string);
+		}
+		return $string;
+	}
 }