sop / x501

lib/X501/MatchingRule/MatchingRule.php

Indentation +10 added lines, -10 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\MatchingRule;
 

lib/X501/DN/DNParser.php

Indentation +393 added lines, -393 removed lines

@@ -15,414 +15,414 @@
  */
 class DNParser
 {
-    /**
-     * RFC 2253 special characters.
-     *
-     * @var string
-     */
-    const SPECIAL_CHARS = ',=+<>#;';
+	/**
+	 * RFC 2253 special characters.
+	 *
+	 * @var string
+	 */
+	const SPECIAL_CHARS = ',=+<>#;';
 
-    /**
-     * 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;
 
-    /**
-     * 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 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.
-     *
-     * @see 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.
+	 *
+	 * @see 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;
+	}
 
-    /**
-     * 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 = [];
-        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 = [];
+		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 = [];
-        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 = [];
+		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 [$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 [$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;
-            }
-            if ('"' == $c) {
-                throw new \UnexpectedValueException('Unexpected quotation.');
-            }
-            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;
+			}
+			if ('"' == $c) {
+				throw new \UnexpectedValueException('Unexpected quotation.');
+			}
+			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;
-            }
-            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;
+			}
+			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 null|string Null if pattern doesn't match
-     */
-    private function _regexMatch(string $pattern, int &$offset): ?string
-    {
-        $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 null|string Null if pattern doesn't match
+	 */
+	private function _regexMatch(string $pattern, int &$offset): ?string
+	{
+		$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): void
-    {
-        $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): void
+	{
+		$idx = $offset;
+		while ($idx < $this->_len) {
+			if (' ' != $this->_dn[$idx]) {
+				break;
+			}
+			++$idx;
+		}
+		$offset = $idx;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\DN;
 
@@ -79,11 +79,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);

lib/X501/MatchingRule/StringPrepMatchingRule.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\MatchingRule;
 

Indentation +24 added lines, -24 removed lines

@@ -11,30 +11,30 @@
  */
 abstract class StringPrepMatchingRule extends MatchingRule
 {
-    /**
-     * String preparer.
-     *
-     * @var StringPreparer
-     */
-    protected $_prep;
+	/**
+	 * String preparer.
+	 *
+	 * @var StringPreparer
+	 */
+	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): ?bool
-    {
-        $assertion = $this->_prep->prepare($assertion);
-        $value = $this->_prep->prepare($value);
-        return 0 === strcmp($assertion, $value);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function compare($assertion, $value): ?bool
+	{
+		$assertion = $this->_prep->prepare($assertion);
+		$value = $this->_prep->prepare($value);
+		return 0 === strcmp($assertion, $value);
+	}
 }

lib/X501/MatchingRule/BinaryMatch.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\MatchingRule;
 

Indentation +7 added lines, -7 removed lines

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

lib/X501/ASN1/Name.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\ASN1;
 
@@ -55,7 +55,7 @@ 
     public static function fromASN1(Sequence $seq): self
     {
         $rdns = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return RDN::fromASN1($el->asSet());
             }, $seq->elements());
         return new self(...$rdns);
@@ -100,7 +100,7 @@ 
     public function toASN1(): Sequence
     {
         $elements = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toASN1();
             }, $this->_rdns);
         return new Sequence(...$elements);
@@ -116,7 +116,7 @@ 
     public function toString(): string
     {
         $parts = array_map(
-            function (RDN $rdn) {
+            function(RDN $rdn) {
                 return $rdn->toString();
             }, array_reverse($this->_rdns));
         return implode(',', $parts);
@@ -210,7 +210,7 @@ 
         $oid = AttributeType::attrNameToOID($name);
         return (int) array_sum(
             array_map(
-                function (RDN $rdn) use ($oid): int {
+                function(RDN $rdn) use ($oid): int {
                     return count($rdn->allOf($oid));
                 }, $this->_rdns));
     }

Indentation +204 added lines, -204 removed lines

@@ -20,208 +20,208 @@
  */
 class Name implements \Countable, \IteratorAggregate
 {
-    /**
-     * Relative distinguished name components.
-     *
-     * @var RDN[]
-     */
-    protected $_rdns;
-
-    /**
-     * Constructor.
-     *
-     * @param RDN ...$rdns RDN components
-     */
-    public function __construct(RDN ...$rdns)
-    {
-        $this->_rdns = $rdns;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $rdns = array_map(
-            function (UnspecifiedType $el) {
-                return RDN::fromASN1($el->asSet());
-            }, $seq->elements());
-        return new self(...$rdns);
-    }
-
-    /**
-     * Initialize from distinguished name string.
-     *
-     * @see https://tools.ietf.org/html/rfc1779
-     *
-     * @param string $str
-     *
-     * @return self
-     */
-    public static function fromString(string $str): self
-    {
-        $rdns = [];
-        foreach (DNParser::parseString($str) as $nameComponent) {
-            $attribs = [];
-            foreach ($nameComponent as [$name, $val]) {
-                $type = AttributeType::fromName($name);
-                // hexstrings are parsed to ASN.1 elements
-                if ($val instanceof Element) {
-                    $el = $val;
-                } else {
-                    $el = AttributeType::asn1StringForType($type->oid(), $val);
-                }
-                $value = AttributeValue::fromASN1ByOID($type->oid(),
-                    $el->asUnspecified());
-                $attribs[] = new AttributeTypeAndValue($type, $value);
-            }
-            $rdns[] = new RDN(...$attribs);
-        }
-        return new self(...$rdns);
-    }
-
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $elements = array_map(
-            function (RDN $rdn) {
-                return $rdn->toASN1();
-            }, $this->_rdns);
-        return new Sequence(...$elements);
-    }
-
-    /**
-     * Get distinguised name string conforming to RFC 2253.
-     *
-     * @see https://tools.ietf.org/html/rfc2253#section-2.1
-     *
-     * @return string
-     */
-    public function toString(): string
-    {
-        $parts = array_map(
-            function (RDN $rdn) {
-                return $rdn->toString();
-            }, array_reverse($this->_rdns));
-        return implode(',', $parts);
-    }
-
-    /**
-     * Whether name is semantically equal to other.
-     *
-     * Comparison conforms to RFC 4518 string preparation algorithm.
-     *
-     * @see https://tools.ietf.org/html/rfc4518
-     *
-     * @param Name $other Object to compare to
-     *
-     * @return bool
-     */
-    public function equals(Name $other): bool
-    {
-        // if RDN count doesn't match
-        if (count($this) !== count($other)) {
-            return false;
-        }
-        for ($i = count($this) - 1; $i >= 0; --$i) {
-            $rdn1 = $this->_rdns[$i];
-            $rdn2 = $other->_rdns[$i];
-            if (!$rdn1->equals($rdn2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get all RDN objects.
-     *
-     * @return RDN[]
-     */
-    public function all(): array
-    {
-        return $this->_rdns;
-    }
-
-    /**
-     * Get the first AttributeValue of given type.
-     *
-     * Relative name components shall be traversed in encoding order, which is
-     * reversed in regards to the string representation.
-     * Multi-valued RDN with multiple attributes of the requested type is
-     * ambiguous and shall throw an exception.
-     *
-     * @param string $name Attribute OID or name
-     *
-     * @throws \RuntimeException If attribute cannot be resolved
-     *
-     * @return AttributeValue
-     */
-    public function firstValueOf(string $name): AttributeValue
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        foreach ($this->_rdns as $rdn) {
-            $tvs = $rdn->allOf($oid);
-            if (count($tvs) > 1) {
-                throw new \RangeException("RDN with multiple {$name} attributes.");
-            }
-            if (1 === count($tvs)) {
-                return $tvs[0]->value();
-            }
-        }
-        throw new \RangeException("Attribute {$name} not found.");
-    }
-
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_rdns);
-    }
-
-    /**
-     * Get the number of attributes of given type.
-     *
-     * @param string $name Attribute OID or name
-     *
-     * @return int
-     */
-    public function countOfType(string $name): int
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        return (int) array_sum(
-            array_map(
-                function (RDN $rdn) use ($oid): int {
-                    return count($rdn->allOf($oid));
-                }, $this->_rdns));
-    }
-
-    /**
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_rdns);
-    }
+	/**
+	 * Relative distinguished name components.
+	 *
+	 * @var RDN[]
+	 */
+	protected $_rdns;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param RDN ...$rdns RDN components
+	 */
+	public function __construct(RDN ...$rdns)
+	{
+		$this->_rdns = $rdns;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$rdns = array_map(
+			function (UnspecifiedType $el) {
+				return RDN::fromASN1($el->asSet());
+			}, $seq->elements());
+		return new self(...$rdns);
+	}
+
+	/**
+	 * Initialize from distinguished name string.
+	 *
+	 * @see https://tools.ietf.org/html/rfc1779
+	 *
+	 * @param string $str
+	 *
+	 * @return self
+	 */
+	public static function fromString(string $str): self
+	{
+		$rdns = [];
+		foreach (DNParser::parseString($str) as $nameComponent) {
+			$attribs = [];
+			foreach ($nameComponent as [$name, $val]) {
+				$type = AttributeType::fromName($name);
+				// hexstrings are parsed to ASN.1 elements
+				if ($val instanceof Element) {
+					$el = $val;
+				} else {
+					$el = AttributeType::asn1StringForType($type->oid(), $val);
+				}
+				$value = AttributeValue::fromASN1ByOID($type->oid(),
+					$el->asUnspecified());
+				$attribs[] = new AttributeTypeAndValue($type, $value);
+			}
+			$rdns[] = new RDN(...$attribs);
+		}
+		return new self(...$rdns);
+	}
+
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$elements = array_map(
+			function (RDN $rdn) {
+				return $rdn->toASN1();
+			}, $this->_rdns);
+		return new Sequence(...$elements);
+	}
+
+	/**
+	 * Get distinguised name string conforming to RFC 2253.
+	 *
+	 * @see https://tools.ietf.org/html/rfc2253#section-2.1
+	 *
+	 * @return string
+	 */
+	public function toString(): string
+	{
+		$parts = array_map(
+			function (RDN $rdn) {
+				return $rdn->toString();
+			}, array_reverse($this->_rdns));
+		return implode(',', $parts);
+	}
+
+	/**
+	 * Whether name is semantically equal to other.
+	 *
+	 * Comparison conforms to RFC 4518 string preparation algorithm.
+	 *
+	 * @see https://tools.ietf.org/html/rfc4518
+	 *
+	 * @param Name $other Object to compare to
+	 *
+	 * @return bool
+	 */
+	public function equals(Name $other): bool
+	{
+		// if RDN count doesn't match
+		if (count($this) !== count($other)) {
+			return false;
+		}
+		for ($i = count($this) - 1; $i >= 0; --$i) {
+			$rdn1 = $this->_rdns[$i];
+			$rdn2 = $other->_rdns[$i];
+			if (!$rdn1->equals($rdn2)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Get all RDN objects.
+	 *
+	 * @return RDN[]
+	 */
+	public function all(): array
+	{
+		return $this->_rdns;
+	}
+
+	/**
+	 * Get the first AttributeValue of given type.
+	 *
+	 * Relative name components shall be traversed in encoding order, which is
+	 * reversed in regards to the string representation.
+	 * Multi-valued RDN with multiple attributes of the requested type is
+	 * ambiguous and shall throw an exception.
+	 *
+	 * @param string $name Attribute OID or name
+	 *
+	 * @throws \RuntimeException If attribute cannot be resolved
+	 *
+	 * @return AttributeValue
+	 */
+	public function firstValueOf(string $name): AttributeValue
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		foreach ($this->_rdns as $rdn) {
+			$tvs = $rdn->allOf($oid);
+			if (count($tvs) > 1) {
+				throw new \RangeException("RDN with multiple {$name} attributes.");
+			}
+			if (1 === count($tvs)) {
+				return $tvs[0]->value();
+			}
+		}
+		throw new \RangeException("Attribute {$name} not found.");
+	}
+
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_rdns);
+	}
+
+	/**
+	 * Get the number of attributes of given type.
+	 *
+	 * @param string $name Attribute OID or name
+	 *
+	 * @return int
+	 */
+	public function countOfType(string $name): int
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		return (int) array_sum(
+			array_map(
+				function (RDN $rdn) use ($oid): int {
+					return count($rdn->allOf($oid));
+				}, $this->_rdns));
+	}
+
+	/**
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_rdns);
+	}
 }

lib/X501/ASN1/RDN.php

Indentation +158 added lines, -158 removed lines

@@ -15,173 +15,173 @@
  */
 class RDN implements \Countable, \IteratorAggregate
 {
-    /**
-     * Attributes.
-     *
-     * @var AttributeTypeAndValue[]
-     */
-    protected $_attribs;
+	/**
+	 * Attributes.
+	 *
+	 * @var AttributeTypeAndValue[]
+	 */
+	protected $_attribs;
 
-    /**
-     * Constructor.
-     *
-     * @param AttributeTypeAndValue ...$attribs One or more attributes
-     */
-    public function __construct(AttributeTypeAndValue ...$attribs)
-    {
-        if (!count($attribs)) {
-            throw new \UnexpectedValueException(
-                'RDN must have at least one AttributeTypeAndValue.');
-        }
-        $this->_attribs = $attribs;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeTypeAndValue ...$attribs One or more attributes
+	 */
+	public function __construct(AttributeTypeAndValue ...$attribs)
+	{
+		if (!count($attribs)) {
+			throw new \UnexpectedValueException(
+				'RDN must have at least one AttributeTypeAndValue.');
+		}
+		$this->_attribs = $attribs;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 
-    /**
-     * Convenience method to initialize RDN from AttributeValue objects.
-     *
-     * @param AttributeValue ...$values One or more attributes
-     *
-     * @return self
-     */
-    public static function fromAttributeValues(AttributeValue ...$values): self
-    {
-        $attribs = array_map(
-            function (AttributeValue $value) {
-                return new AttributeTypeAndValue(
-                    new AttributeType($value->oid()), $value);
-            }, $values);
-        return new self(...$attribs);
-    }
+	/**
+	 * Convenience method to initialize RDN from AttributeValue objects.
+	 *
+	 * @param AttributeValue ...$values One or more attributes
+	 *
+	 * @return self
+	 */
+	public static function fromAttributeValues(AttributeValue ...$values): self
+	{
+		$attribs = array_map(
+			function (AttributeValue $value) {
+				return new AttributeTypeAndValue(
+					new AttributeType($value->oid()), $value);
+			}, $values);
+		return new self(...$attribs);
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Set $set
-     *
-     * @return self
-     */
-    public static function fromASN1(Set $set): self
-    {
-        $attribs = array_map(
-            function (UnspecifiedType $el) {
-                return AttributeTypeAndValue::fromASN1($el->asSequence());
-            }, $set->elements());
-        return new self(...$attribs);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Set $set
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Set $set): self
+	{
+		$attribs = array_map(
+			function (UnspecifiedType $el) {
+				return AttributeTypeAndValue::fromASN1($el->asSequence());
+			}, $set->elements());
+		return new self(...$attribs);
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Set
-     */
-    public function toASN1(): Set
-    {
-        $elements = array_map(
-            function (AttributeTypeAndValue $tv) {
-                return $tv->toASN1();
-            }, $this->_attribs);
-        $set = new Set(...$elements);
-        return $set->sortedSetOf();
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Set
+	 */
+	public function toASN1(): Set
+	{
+		$elements = array_map(
+			function (AttributeTypeAndValue $tv) {
+				return $tv->toASN1();
+			}, $this->_attribs);
+		$set = new Set(...$elements);
+		return $set->sortedSetOf();
+	}
 
-    /**
-     * Get name-component string conforming to RFC 2253.
-     *
-     * @see https://tools.ietf.org/html/rfc2253#section-2.2
-     *
-     * @return string
-     */
-    public function toString(): string
-    {
-        $parts = array_map(
-            function (AttributeTypeAndValue $tv) {
-                return $tv->toString();
-            }, $this->_attribs);
-        return implode('+', $parts);
-    }
+	/**
+	 * Get name-component string conforming to RFC 2253.
+	 *
+	 * @see https://tools.ietf.org/html/rfc2253#section-2.2
+	 *
+	 * @return string
+	 */
+	public function toString(): string
+	{
+		$parts = array_map(
+			function (AttributeTypeAndValue $tv) {
+				return $tv->toString();
+			}, $this->_attribs);
+		return implode('+', $parts);
+	}
 
-    /**
-     * Check whether RDN is semantically equal to other.
-     *
-     * @param RDN $other Object to compare to
-     *
-     * @return bool
-     */
-    public function equals(RDN $other): bool
-    {
-        // if attribute count doesn't match
-        if (count($this) !== count($other)) {
-            return false;
-        }
-        $attribs1 = $this->_attribs;
-        $attribs2 = $other->_attribs;
-        // if there's multiple attributes, sort using SET OF rules
-        if (count($attribs1) > 1) {
-            $attribs1 = self::fromASN1($this->toASN1())->_attribs;
-            $attribs2 = self::fromASN1($other->toASN1())->_attribs;
-        }
-        for ($i = count($attribs1) - 1; $i >= 0; --$i) {
-            $tv1 = $attribs1[$i];
-            $tv2 = $attribs2[$i];
-            if (!$tv1->equals($tv2)) {
-                return false;
-            }
-        }
-        return true;
-    }
+	/**
+	 * Check whether RDN is semantically equal to other.
+	 *
+	 * @param RDN $other Object to compare to
+	 *
+	 * @return bool
+	 */
+	public function equals(RDN $other): bool
+	{
+		// if attribute count doesn't match
+		if (count($this) !== count($other)) {
+			return false;
+		}
+		$attribs1 = $this->_attribs;
+		$attribs2 = $other->_attribs;
+		// if there's multiple attributes, sort using SET OF rules
+		if (count($attribs1) > 1) {
+			$attribs1 = self::fromASN1($this->toASN1())->_attribs;
+			$attribs2 = self::fromASN1($other->toASN1())->_attribs;
+		}
+		for ($i = count($attribs1) - 1; $i >= 0; --$i) {
+			$tv1 = $attribs1[$i];
+			$tv2 = $attribs2[$i];
+			if (!$tv1->equals($tv2)) {
+				return false;
+			}
+		}
+		return true;
+	}
 
-    /**
-     * Get all AttributeTypeAndValue objects.
-     *
-     * @return AttributeTypeAndValue[]
-     */
-    public function all(): array
-    {
-        return $this->_attribs;
-    }
+	/**
+	 * Get all AttributeTypeAndValue objects.
+	 *
+	 * @return AttributeTypeAndValue[]
+	 */
+	public function all(): array
+	{
+		return $this->_attribs;
+	}
 
-    /**
-     * Get all AttributeTypeAndValue objects of the given attribute type.
-     *
-     * @param string $name Attribute OID or name
-     *
-     * @return AttributeTypeAndValue[]
-     */
-    public function allOf(string $name): array
-    {
-        $oid = AttributeType::attrNameToOID($name);
-        $attribs = array_filter($this->_attribs,
-            function (AttributeTypeAndValue $tv) use ($oid) {
-                return $tv->oid() === $oid;
-            });
-        return array_values($attribs);
-    }
+	/**
+	 * Get all AttributeTypeAndValue objects of the given attribute type.
+	 *
+	 * @param string $name Attribute OID or name
+	 *
+	 * @return AttributeTypeAndValue[]
+	 */
+	public function allOf(string $name): array
+	{
+		$oid = AttributeType::attrNameToOID($name);
+		$attribs = array_filter($this->_attribs,
+			function (AttributeTypeAndValue $tv) use ($oid) {
+				return $tv->oid() === $oid;
+			});
+		return array_values($attribs);
+	}
 
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_attribs);
-    }
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_attribs);
+	}
 
-    /**
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_attribs);
-    }
+	/**
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_attribs);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\ASN1;
 
@@ -54,7 +54,7 @@ 
     public static function fromAttributeValues(AttributeValue ...$values): self
     {
         $attribs = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return new AttributeTypeAndValue(
                     new AttributeType($value->oid()), $value);
             }, $values);
@@ -71,7 +71,7 @@ 
     public static function fromASN1(Set $set): self
     {
         $attribs = array_map(
-            function (UnspecifiedType $el) {
+            function(UnspecifiedType $el) {
                 return AttributeTypeAndValue::fromASN1($el->asSequence());
             }, $set->elements());
         return new self(...$attribs);
@@ -85,7 +85,7 @@ 
     public function toASN1(): Set
     {
         $elements = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toASN1();
             }, $this->_attribs);
         $set = new Set(...$elements);
@@ -102,7 +102,7 @@ 
     public function toString(): string
     {
         $parts = array_map(
-            function (AttributeTypeAndValue $tv) {
+            function(AttributeTypeAndValue $tv) {
                 return $tv->toString();
             }, $this->_attribs);
         return implode('+', $parts);
@@ -159,7 +159,7 @@ 
     {
         $oid = AttributeType::attrNameToOID($name);
         $attribs = array_filter($this->_attribs,
-            function (AttributeTypeAndValue $tv) use ($oid) {
+            function(AttributeTypeAndValue $tv) use ($oid) {
                 return $tv->oid() === $oid;
             });
         return array_values($attribs);

lib/X501/ASN1/Attribute.php

Indentation +147 added lines, -147 removed lines

@@ -17,161 +17,161 @@
  */
 class Attribute implements \Countable, \IteratorAggregate
 {
-    use TypedAttribute;
+	use TypedAttribute;
 
-    /**
-     * Attribute values.
-     *
-     * @var AttributeValue[]
-     */
-    protected $_values;
+	/**
+	 * Attribute values.
+	 *
+	 * @var AttributeValue[]
+	 */
+	protected $_values;
 
-    /**
-     * Constructor.
-     *
-     * @param AttributeType  $type      Attribute type
-     * @param AttributeValue ...$values Attribute values
-     */
-    public function __construct(AttributeType $type, AttributeValue ...$values)
-    {
-        // check that attribute values have correct oid
-        array_walk($values,
-            function (AttributeValue $value) use ($type) {
-                if ($value->oid() !== $type->oid()) {
-                    throw new \LogicException('Attribute OID mismatch.');
-                }
-            });
-        $this->_type = $type;
-        $this->_values = $values;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeType  $type      Attribute type
+	 * @param AttributeValue ...$values Attribute values
+	 */
+	public function __construct(AttributeType $type, AttributeValue ...$values)
+	{
+		// check that attribute values have correct oid
+		array_walk($values,
+			function (AttributeValue $value) use ($type) {
+				if ($value->oid() !== $type->oid()) {
+					throw new \LogicException('Attribute OID mismatch.');
+				}
+			});
+		$this->_type = $type;
+		$this->_values = $values;
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
-        $values = array_map(
-            function (UnspecifiedType $el) use ($type) {
-                return AttributeValue::fromASN1ByOID($type->oid(), $el);
-            }, $seq->at(1)->asSet()->elements());
-        return new self($type, ...$values);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
+		$values = array_map(
+			function (UnspecifiedType $el) use ($type) {
+				return AttributeValue::fromASN1ByOID($type->oid(), $el);
+			}, $seq->at(1)->asSet()->elements());
+		return new self($type, ...$values);
+	}
 
-    /**
-     * Convenience method to initialize from attribute values.
-     *
-     * @param AttributeValue ...$values One or more values
-     *
-     * @throws \LogicException
-     *
-     * @return self
-     */
-    public static function fromAttributeValues(AttributeValue ...$values): self
-    {
-        // we need at least one value to determine OID
-        if (!count($values)) {
-            throw new \LogicException('No values.');
-        }
-        $oid = reset($values)->oid();
-        return new self(new AttributeType($oid), ...$values);
-    }
+	/**
+	 * Convenience method to initialize from attribute values.
+	 *
+	 * @param AttributeValue ...$values One or more values
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return self
+	 */
+	public static function fromAttributeValues(AttributeValue ...$values): self
+	{
+		// we need at least one value to determine OID
+		if (!count($values)) {
+			throw new \LogicException('No values.');
+		}
+		$oid = reset($values)->oid();
+		return new self(new AttributeType($oid), ...$values);
+	}
 
-    /**
-     * Get first value of the attribute.
-     *
-     * @throws \LogicException
-     *
-     * @return AttributeValue
-     */
-    public function first(): AttributeValue
-    {
-        if (!count($this->_values)) {
-            throw new \LogicException('Attribute contains no values.');
-        }
-        return $this->_values[0];
-    }
+	/**
+	 * Get first value of the attribute.
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return AttributeValue
+	 */
+	public function first(): AttributeValue
+	{
+		if (!count($this->_values)) {
+			throw new \LogicException('Attribute contains no values.');
+		}
+		return $this->_values[0];
+	}
 
-    /**
-     * Get all values.
-     *
-     * @return AttributeValue[]
-     */
-    public function values(): array
-    {
-        return $this->_values;
-    }
+	/**
+	 * Get all values.
+	 *
+	 * @return AttributeValue[]
+	 */
+	public function values(): array
+	{
+		return $this->_values;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        $values = array_map(
-            function (AttributeValue $value) {
-                return $value->toASN1();
-            }, $this->_values);
-        $valueset = new Set(...$values);
-        return new Sequence($this->_type->toASN1(), $valueset->sortedSetOf());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		$values = array_map(
+			function (AttributeValue $value) {
+				return $value->toASN1();
+			}, $this->_values);
+		$valueset = new Set(...$values);
+		return new Sequence($this->_type->toASN1(), $valueset->sortedSetOf());
+	}
 
-    /**
-     * Cast attribute values to another AttributeValue class.
-     *
-     * This method is generally used to cast UnknownAttributeValue values
-     * to specific objects when class is declared outside this package.
-     *
-     * The new class must be derived from AttributeValue and have the same OID
-     * as current attribute values.
-     *
-     * @param string $cls AttributeValue class name
-     *
-     * @throws \LogicException
-     *
-     * @return self
-     */
-    public function castValues(string $cls): self
-    {
-        $refl = new \ReflectionClass($cls);
-        if (!$refl->isSubclassOf(AttributeValue::class)) {
-            throw new \LogicException(
-                "{$cls} must be derived from " . AttributeValue::class . '.');
-        }
-        $oid = $this->oid();
-        $values = array_map(
-            function (AttributeValue $value) use ($cls, $oid) {
-                $value = $cls::fromSelf($value);
-                if ($value->oid() !== $oid) {
-                    throw new \LogicException('Attribute OID mismatch.');
-                }
-                return $value;
-            }, $this->_values);
-        return self::fromAttributeValues(...$values);
-    }
+	/**
+	 * Cast attribute values to another AttributeValue class.
+	 *
+	 * This method is generally used to cast UnknownAttributeValue values
+	 * to specific objects when class is declared outside this package.
+	 *
+	 * The new class must be derived from AttributeValue and have the same OID
+	 * as current attribute values.
+	 *
+	 * @param string $cls AttributeValue class name
+	 *
+	 * @throws \LogicException
+	 *
+	 * @return self
+	 */
+	public function castValues(string $cls): self
+	{
+		$refl = new \ReflectionClass($cls);
+		if (!$refl->isSubclassOf(AttributeValue::class)) {
+			throw new \LogicException(
+				"{$cls} must be derived from " . AttributeValue::class . '.');
+		}
+		$oid = $this->oid();
+		$values = array_map(
+			function (AttributeValue $value) use ($cls, $oid) {
+				$value = $cls::fromSelf($value);
+				if ($value->oid() !== $oid) {
+					throw new \LogicException('Attribute OID mismatch.');
+				}
+				return $value;
+			}, $this->_values);
+		return self::fromAttributeValues(...$values);
+	}
 
-    /**
-     * @see \Countable::count()
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return count($this->_values);
-    }
+	/**
+	 * @see \Countable::count()
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return count($this->_values);
+	}
 
-    /**
-     * @see \IteratorAggregate::getIterator()
-     *
-     * @return \ArrayIterator
-     */
-    public function getIterator(): \ArrayIterator
-    {
-        return new \ArrayIterator($this->_values);
-    }
+	/**
+	 * @see \IteratorAggregate::getIterator()
+	 *
+	 * @return \ArrayIterator
+	 */
+	public function getIterator(): \ArrayIterator
+	{
+		return new \ArrayIterator($this->_values);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Sop\X501\ASN1;
 
@@ -36,7 +36,7 @@ 
     {
         // check that attribute values have correct oid
         array_walk($values,
-            function (AttributeValue $value) use ($type) {
+            function(AttributeValue $value) use ($type) {
                 if ($value->oid() !== $type->oid()) {
                     throw new \LogicException('Attribute OID mismatch.');
                 }
@@ -56,7 +56,7 @@ 
     {
         $type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
         $values = array_map(
-            function (UnspecifiedType $el) use ($type) {
+            function(UnspecifiedType $el) use ($type) {
                 return AttributeValue::fromASN1ByOID($type->oid(), $el);
             }, $seq->at(1)->asSet()->elements());
         return new self($type, ...$values);
@@ -114,7 +114,7 @@ 
     public function toASN1(): Sequence
     {
         $values = array_map(
-            function (AttributeValue $value) {
+            function(AttributeValue $value) {
                 return $value->toASN1();
             }, $this->_values);
         $valueset = new Set(...$values);
@@ -145,7 +145,7 @@ 
         }
         $oid = $this->oid();
         $values = array_map(
-            function (AttributeValue $value) use ($cls, $oid) {
+            function(AttributeValue $value) use ($cls, $oid) {
                 $value = $cls::fromSelf($value);
                 if ($value->oid() !== $oid) {
                     throw new \LogicException('Attribute OID mismatch.');