sop / x501

lib/X501/StringPrep/PrepareStep.php

Indentation +8 added lines, -8 removed lines

@@ -12,12 +12,12 @@
  */
 interface PrepareStep
 {
-    /**
-     * Apply string preparation step.
-     *
-     * @param string $string String to prepare
-     *
-     * @return string Prepared string
-     */
-    public function apply(string $string): string;
+	/**
+	 * Apply string preparation step.
+	 *
+	 * @param string $string String to prepare
+	 *
+	 * @return string Prepared string
+	 */
+	public function apply(string $string): string;
 }

lib/X501/StringPrep/NormalizeStep.php

Indentation +9 added lines, -9 removed lines

@@ -12,13 +12,13 @@
  */
 class NormalizeStep implements PrepareStep
 {
-    /**
-     * @param string $string UTF-8 encoded string
-     *
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        return normalizer_normalize($string, \Normalizer::NFKC);
-    }
+	/**
+	 * @param string $string UTF-8 encoded string
+	 *
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		return normalizer_normalize($string, \Normalizer::NFKC);
+	}
 }

lib/X501/StringPrep/TranscodeStep.php

Indentation +46 added lines, -46 removed lines

@@ -15,52 +15,52 @@
  */
 class TranscodeStep implements PrepareStep
 {
-    /**
-     * ASN.1 type of the string.
-     *
-     * @var int
-     */
-    protected $_type;
+	/**
+	 * ASN.1 type of the string.
+	 *
+	 * @var int
+	 */
+	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;
+	}
 
-    /**
-     * @param string $string String to prepare
-     *
-     * @throws \LogicException If string type is not supported
-     *
-     * @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) . '.');
-    }
+	/**
+	 * @param string $string String to prepare
+	 *
+	 * @throws \LogicException If string type is not supported
+	 *
+	 * @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) . '.');
+	}
 }

Switch Indentation +16 added lines, -16 removed lines

@@ -43,22 +43,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) . '.');

lib/X501/StringPrep/MapStep.php

Indentation +28 added lines, -28 removed lines

@@ -12,34 +12,34 @@
  */
 class MapStep implements PrepareStep
 {
-    /**
-     * Whether to apply case folding.
-     *
-     * @var bool
-     */
-    protected $_fold;
+	/**
+	 * Whether to apply case folding.
+	 *
+	 * @var bool
+	 */
+	protected $_fold;
 
-    /**
-     * Constructor.
-     *
-     * @param bool $fold_case Whether to apply case folding
-     */
-    public function __construct(bool $fold_case = false)
-    {
-        $this->_fold = $fold_case;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param bool $fold_case Whether to apply case folding
+	 */
+	public function __construct(bool $fold_case = false)
+	{
+		$this->_fold = $fold_case;
+	}
 
-    /**
-     * @param string $string UTF-8 encoded string
-     *
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // @todo Implement character mappings
-        if ($this->_fold) {
-            $string = mb_convert_case($string, MB_CASE_LOWER, 'UTF-8');
-        }
-        return $string;
-    }
+	/**
+	 * @param string $string UTF-8 encoded string
+	 *
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// @todo Implement character mappings
+		if ($this->_fold) {
+			$string = mb_convert_case($string, MB_CASE_LOWER, 'UTF-8');
+		}
+		return $string;
+	}
 }

lib/X501/StringPrep/ProhibitStep.php

Indentation +12 added lines, -12 removed lines

@@ -12,16 +12,16 @@
  */
 class ProhibitStep implements PrepareStep
 {
-    /**
-     * @param string $string UTF-8 encoded string
-     *
-     * @throws \UnexpectedValueException If string contains prohibited characters
-     *
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // @todo Implement
-        return $string;
-    }
+	/**
+	 * @param string $string UTF-8 encoded string
+	 *
+	 * @throws \UnexpectedValueException If string contains prohibited characters
+	 *
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// @todo Implement
+		return $string;
+	}
 }

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[]
-     */
-    protected $_steps;
+	/**
+	 * Preparation steps.
+	 *
+	 * @var PrepareStep[]
+	 */
+	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 = [
-            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(),
-        ];
-        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 = [
+			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(),
+		];
+		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;
+	}
 }

lib/X501/StringPrep/CheckBidiStep.php

Indentation +10 added lines, -10 removed lines

@@ -12,14 +12,14 @@
  */
 class CheckBidiStep implements PrepareStep
 {
-    /**
-     * @param string $string UTF-8 encoded string
-     *
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // @todo Implement
-        return $string;
-    }
+	/**
+	 * @param string $string UTF-8 encoded string
+	 *
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// @todo Implement
+		return $string;
+	}
 }

lib/X501/StringPrep/InsignificantNonSubstringSpaceStep.php

Indentation +18 added lines, -18 removed lines

@@ -14,22 +14,22 @@
  */
 class InsignificantNonSubstringSpaceStep implements PrepareStep
 {
-    /**
-     * @param string $string UTF-8 encoded string
-     *
-     * @return string
-     */
-    public function apply(string $string): string
-    {
-        // if value contains no non-space characters
-        if (preg_match('/^\p{Zs}*$/u', $string)) {
-            return '  ';
-        }
-        // trim leading and trailing spaces
-        $string = preg_replace('/^\p{Zs}+/u', '', $string);
-        $string = preg_replace('/\p{Zs}+$/u', '', $string);
-        // convert inner space sequences to two U+0020 characters
-        $string = preg_replace('/\p{Zs}+/u', '  ', $string);
-        return " {$string} ";
-    }
+	/**
+	 * @param string $string UTF-8 encoded string
+	 *
+	 * @return string
+	 */
+	public function apply(string $string): string
+	{
+		// if value contains no non-space characters
+		if (preg_match('/^\p{Zs}*$/u', $string)) {
+			return '  ';
+		}
+		// trim leading and trailing spaces
+		$string = preg_replace('/^\p{Zs}+/u', '', $string);
+		$string = preg_replace('/\p{Zs}+$/u', '', $string);
+		// convert inner space sequences to two U+0020 characters
+		$string = preg_replace('/\p{Zs}+/u', '  ', $string);
+		return " {$string} ";
+	}
 }

lib/X501/ASN1/AttributeTypeAndValue.php

Indentation +101 added lines, -101 removed lines

@@ -15,114 +15,114 @@
  */
 class AttributeTypeAndValue
 {
-    use TypedAttribute;
+	use TypedAttribute;
 
-    /**
-     * Attribute value.
-     *
-     * @var AttributeValue
-     */
-    protected $_value;
+	/**
+	 * Attribute value.
+	 *
+	 * @var AttributeValue
+	 */
+	protected $_value;
 
-    /**
-     * Constructor.
-     *
-     * @param AttributeType  $type  Attribute type
-     * @param AttributeValue $value Attribute value
-     */
-    public function __construct(AttributeType $type, AttributeValue $value)
-    {
-        $this->_type = $type;
-        $this->_value = $value;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param AttributeType  $type  Attribute type
+	 * @param AttributeValue $value Attribute value
+	 */
+	public function __construct(AttributeType $type, AttributeValue $value)
+	{
+		$this->_type = $type;
+		$this->_value = $value;
+	}
 
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
+	/**
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
 
-    /**
-     * Initialize from ASN.1.
-     *
-     * @param Sequence $seq
-     *
-     * @return self
-     */
-    public static function fromASN1(Sequence $seq): self
-    {
-        $type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
-        $value = AttributeValue::fromASN1ByOID($type->oid(), $seq->at(1));
-        return new self($type, $value);
-    }
+	/**
+	 * Initialize from ASN.1.
+	 *
+	 * @param Sequence $seq
+	 *
+	 * @return self
+	 */
+	public static function fromASN1(Sequence $seq): self
+	{
+		$type = AttributeType::fromASN1($seq->at(0)->asObjectIdentifier());
+		$value = AttributeValue::fromASN1ByOID($type->oid(), $seq->at(1));
+		return new self($type, $value);
+	}
 
-    /**
-     * Convenience method to initialize from attribute value.
-     *
-     * @param AttributeValue $value Attribute value
-     *
-     * @return self
-     */
-    public static function fromAttributeValue(AttributeValue $value): self
-    {
-        return new self(new AttributeType($value->oid()), $value);
-    }
+	/**
+	 * Convenience method to initialize from attribute value.
+	 *
+	 * @param AttributeValue $value Attribute value
+	 *
+	 * @return self
+	 */
+	public static function fromAttributeValue(AttributeValue $value): self
+	{
+		return new self(new AttributeType($value->oid()), $value);
+	}
 
-    /**
-     * Get attribute value.
-     *
-     * @return AttributeValue
-     */
-    public function value(): AttributeValue
-    {
-        return $this->_value;
-    }
+	/**
+	 * Get attribute value.
+	 *
+	 * @return AttributeValue
+	 */
+	public function value(): AttributeValue
+	{
+		return $this->_value;
+	}
 
-    /**
-     * Generate ASN.1 structure.
-     *
-     * @return Sequence
-     */
-    public function toASN1(): Sequence
-    {
-        return new Sequence($this->_type->toASN1(), $this->_value->toASN1());
-    }
+	/**
+	 * Generate ASN.1 structure.
+	 *
+	 * @return Sequence
+	 */
+	public function toASN1(): Sequence
+	{
+		return new Sequence($this->_type->toASN1(), $this->_value->toASN1());
+	}
 
-    /**
-     * Get attributeTypeAndValue string conforming to RFC 2253.
-     *
-     * @see https://tools.ietf.org/html/rfc2253#section-2.3
-     *
-     * @return string
-     */
-    public function toString(): string
-    {
-        return $this->_type->typeName() . '=' . $this->_value->rfc2253String();
-    }
+	/**
+	 * Get attributeTypeAndValue string conforming to RFC 2253.
+	 *
+	 * @see https://tools.ietf.org/html/rfc2253#section-2.3
+	 *
+	 * @return string
+	 */
+	public function toString(): string
+	{
+		return $this->_type->typeName() . '=' . $this->_value->rfc2253String();
+	}
 
-    /**
-     * Check whether attribute is semantically equal to other.
-     *
-     * @param AttributeTypeAndValue $other Object to compare to
-     *
-     * @return bool
-     */
-    public function equals(AttributeTypeAndValue $other): bool
-    {
-        // check that attribute types match
-        if ($this->oid() !== $other->oid()) {
-            return false;
-        }
-        $matcher = $this->_value->equalityMatchingRule();
-        $result = $matcher->compare($this->_value->stringValue(),
-            $other->_value->stringValue());
-        // match
-        if ($result) {
-            return true;
-        }
-        // no match or Undefined
-        return false;
-    }
+	/**
+	 * Check whether attribute is semantically equal to other.
+	 *
+	 * @param AttributeTypeAndValue $other Object to compare to
+	 *
+	 * @return bool
+	 */
+	public function equals(AttributeTypeAndValue $other): bool
+	{
+		// check that attribute types match
+		if ($this->oid() !== $other->oid()) {
+			return false;
+		}
+		$matcher = $this->_value->equalityMatchingRule();
+		$result = $matcher->compare($this->_value->stringValue(),
+			$other->_value->stringValue());
+		// match
+		if ($result) {
+			return true;
+		}
+		// no match or Undefined
+		return false;
+	}
 }