@@ -11,13 +11,13 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | trait UniversalClass |
| 13 | 13 | { |
| 14 | - /** |
|
| 15 | - * @see \Sop\ASN1\Feature\ElementBase::typeClass() |
|
| 16 | - * |
|
| 17 | - * @return int |
|
| 18 | - */ |
|
| 19 | - public function typeClass(): int |
|
| 20 | - { |
|
| 21 | - return Identifier::CLASS_UNIVERSAL; |
|
| 22 | - } |
|
| 14 | + /** |
|
| 15 | + * @see \Sop\ASN1\Feature\ElementBase::typeClass() |
|
| 16 | + * |
|
| 17 | + * @return int |
|
| 18 | + */ |
|
| 19 | + public function typeClass(): int |
|
| 20 | + { |
|
| 21 | + return Identifier::CLASS_UNIVERSAL; |
|
| 22 | + } |
|
| 23 | 23 | } |
@@ -14,36 +14,36 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | abstract class PrimitiveString extends StringType |
| 16 | 16 | { |
| 17 | - use PrimitiveType; |
|
| 17 | + use PrimitiveType; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * {@inheritdoc} |
|
| 21 | - */ |
|
| 22 | - protected function _encodedContentDER(): string |
|
| 23 | - { |
|
| 24 | - return $this->_string; |
|
| 25 | - } |
|
| 19 | + /** |
|
| 20 | + * {@inheritdoc} |
|
| 21 | + */ |
|
| 22 | + protected function _encodedContentDER(): string |
|
| 23 | + { |
|
| 24 | + return $this->_string; |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * {@inheritdoc} |
|
| 29 | - */ |
|
| 30 | - protected static function _decodeFromDER(Identifier $identifier, |
|
| 31 | - string $data, int &$offset): ElementBase |
|
| 32 | - { |
|
| 33 | - $idx = $offset; |
|
| 34 | - if (!$identifier->isPrimitive()) { |
|
| 35 | - throw new DecodeException('DER encoded string must be primitive.'); |
|
| 36 | - } |
|
| 37 | - $length = Length::expectFromDER($data, $idx)->intLength(); |
|
| 38 | - $str = $length ? substr($data, $idx, $length) : ''; |
|
| 39 | - // substr should never return false, since length is |
|
| 40 | - // checked by Length::expectFromDER. |
|
| 41 | - assert(is_string($str), new DecodeException('substr')); |
|
| 42 | - $offset = $idx + $length; |
|
| 43 | - try { |
|
| 44 | - return new static($str); |
|
| 45 | - } catch (\InvalidArgumentException $e) { |
|
| 46 | - throw new DecodeException($e->getMessage(), 0, $e); |
|
| 47 | - } |
|
| 48 | - } |
|
| 27 | + /** |
|
| 28 | + * {@inheritdoc} |
|
| 29 | + */ |
|
| 30 | + protected static function _decodeFromDER(Identifier $identifier, |
|
| 31 | + string $data, int &$offset): ElementBase |
|
| 32 | + { |
|
| 33 | + $idx = $offset; |
|
| 34 | + if (!$identifier->isPrimitive()) { |
|
| 35 | + throw new DecodeException('DER encoded string must be primitive.'); |
|
| 36 | + } |
|
| 37 | + $length = Length::expectFromDER($data, $idx)->intLength(); |
|
| 38 | + $str = $length ? substr($data, $idx, $length) : ''; |
|
| 39 | + // substr should never return false, since length is |
|
| 40 | + // checked by Length::expectFromDER. |
|
| 41 | + assert(is_string($str), new DecodeException('substr')); |
|
| 42 | + $offset = $idx + $length; |
|
| 43 | + try { |
|
| 44 | + return new static($str); |
|
| 45 | + } catch (\InvalidArgumentException $e) { |
|
| 46 | + throw new DecodeException($e->getMessage(), 0, $e); |
|
| 47 | + } |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -11,93 +11,93 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | abstract class TimeType extends Element |
| 13 | 13 | { |
| 14 | - /** |
|
| 15 | - * UTC timezone. |
|
| 16 | - * |
|
| 17 | - * @var string |
|
| 18 | - */ |
|
| 19 | - const TZ_UTC = 'UTC'; |
|
| 14 | + /** |
|
| 15 | + * UTC timezone. |
|
| 16 | + * |
|
| 17 | + * @var string |
|
| 18 | + */ |
|
| 19 | + const TZ_UTC = 'UTC'; |
|
| 20 | 20 | |
| 21 | - /** |
|
| 22 | - * Date and time. |
|
| 23 | - * |
|
| 24 | - * @var \DateTimeImmutable |
|
| 25 | - */ |
|
| 26 | - protected $_dateTime; |
|
| 21 | + /** |
|
| 22 | + * Date and time. |
|
| 23 | + * |
|
| 24 | + * @var \DateTimeImmutable |
|
| 25 | + */ |
|
| 26 | + protected $_dateTime; |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Constructor. |
|
| 30 | - * |
|
| 31 | - * @param \DateTimeImmutable $dt |
|
| 32 | - */ |
|
| 33 | - public function __construct(\DateTimeImmutable $dt) |
|
| 34 | - { |
|
| 35 | - $this->_dateTime = $dt; |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * Constructor. |
|
| 30 | + * |
|
| 31 | + * @param \DateTimeImmutable $dt |
|
| 32 | + */ |
|
| 33 | + public function __construct(\DateTimeImmutable $dt) |
|
| 34 | + { |
|
| 35 | + $this->_dateTime = $dt; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - /** |
|
| 39 | - * Initialize from datetime string. |
|
| 40 | - * |
|
| 41 | - * @see http://php.net/manual/en/datetime.formats.php |
|
| 42 | - * |
|
| 43 | - * @param string $time Time string |
|
| 44 | - * @param null|string $tz timezone, if null use default |
|
| 45 | - * |
|
| 46 | - * @throws \RuntimeException |
|
| 47 | - * |
|
| 48 | - * @return self |
|
| 49 | - */ |
|
| 50 | - public static function fromString(string $time, ?string $tz = null): self |
|
| 51 | - { |
|
| 52 | - try { |
|
| 53 | - if (!isset($tz)) { |
|
| 54 | - $tz = date_default_timezone_get(); |
|
| 55 | - } |
|
| 56 | - return new static( |
|
| 57 | - new \DateTimeImmutable($time, self::_createTimeZone($tz))); |
|
| 58 | - } catch (\Exception $e) { |
|
| 59 | - throw new \RuntimeException( |
|
| 60 | - 'Failed to create DateTime: ' . |
|
| 61 | - self::_getLastDateTimeImmutableErrorsStr(), 0, $e); |
|
| 62 | - } |
|
| 63 | - } |
|
| 38 | + /** |
|
| 39 | + * Initialize from datetime string. |
|
| 40 | + * |
|
| 41 | + * @see http://php.net/manual/en/datetime.formats.php |
|
| 42 | + * |
|
| 43 | + * @param string $time Time string |
|
| 44 | + * @param null|string $tz timezone, if null use default |
|
| 45 | + * |
|
| 46 | + * @throws \RuntimeException |
|
| 47 | + * |
|
| 48 | + * @return self |
|
| 49 | + */ |
|
| 50 | + public static function fromString(string $time, ?string $tz = null): self |
|
| 51 | + { |
|
| 52 | + try { |
|
| 53 | + if (!isset($tz)) { |
|
| 54 | + $tz = date_default_timezone_get(); |
|
| 55 | + } |
|
| 56 | + return new static( |
|
| 57 | + new \DateTimeImmutable($time, self::_createTimeZone($tz))); |
|
| 58 | + } catch (\Exception $e) { |
|
| 59 | + throw new \RuntimeException( |
|
| 60 | + 'Failed to create DateTime: ' . |
|
| 61 | + self::_getLastDateTimeImmutableErrorsStr(), 0, $e); |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * Get the date and time. |
|
| 67 | - * |
|
| 68 | - * @return \DateTimeImmutable |
|
| 69 | - */ |
|
| 70 | - public function dateTime(): \DateTimeImmutable |
|
| 71 | - { |
|
| 72 | - return $this->_dateTime; |
|
| 73 | - } |
|
| 65 | + /** |
|
| 66 | + * Get the date and time. |
|
| 67 | + * |
|
| 68 | + * @return \DateTimeImmutable |
|
| 69 | + */ |
|
| 70 | + public function dateTime(): \DateTimeImmutable |
|
| 71 | + { |
|
| 72 | + return $this->_dateTime; |
|
| 73 | + } |
|
| 74 | 74 | |
| 75 | - /** |
|
| 76 | - * Create DateTimeZone object from string. |
|
| 77 | - * |
|
| 78 | - * @param string $tz |
|
| 79 | - * |
|
| 80 | - * @throws \UnexpectedValueException If timezone is invalid |
|
| 81 | - * |
|
| 82 | - * @return \DateTimeZone |
|
| 83 | - */ |
|
| 84 | - protected static function _createTimeZone(string $tz): \DateTimeZone |
|
| 85 | - { |
|
| 86 | - try { |
|
| 87 | - return new \DateTimeZone($tz); |
|
| 88 | - } catch (\Exception $e) { |
|
| 89 | - throw new \UnexpectedValueException('Invalid timezone.', 0, $e); |
|
| 90 | - } |
|
| 91 | - } |
|
| 75 | + /** |
|
| 76 | + * Create DateTimeZone object from string. |
|
| 77 | + * |
|
| 78 | + * @param string $tz |
|
| 79 | + * |
|
| 80 | + * @throws \UnexpectedValueException If timezone is invalid |
|
| 81 | + * |
|
| 82 | + * @return \DateTimeZone |
|
| 83 | + */ |
|
| 84 | + protected static function _createTimeZone(string $tz): \DateTimeZone |
|
| 85 | + { |
|
| 86 | + try { |
|
| 87 | + return new \DateTimeZone($tz); |
|
| 88 | + } catch (\Exception $e) { |
|
| 89 | + throw new \UnexpectedValueException('Invalid timezone.', 0, $e); |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - /** |
|
| 94 | - * Get last error caused by DateTimeImmutable. |
|
| 95 | - * |
|
| 96 | - * @return string |
|
| 97 | - */ |
|
| 98 | - protected static function _getLastDateTimeImmutableErrorsStr(): string |
|
| 99 | - { |
|
| 100 | - $errors = \DateTimeImmutable::getLastErrors()['errors']; |
|
| 101 | - return implode(', ', $errors); |
|
| 102 | - } |
|
| 93 | + /** |
|
| 94 | + * Get last error caused by DateTimeImmutable. |
|
| 95 | + * |
|
| 96 | + * @return string |
|
| 97 | + */ |
|
| 98 | + protected static function _getLastDateTimeImmutableErrorsStr(): string |
|
| 99 | + { |
|
| 100 | + $errors = \DateTimeImmutable::getLastErrors()['errors']; |
|
| 101 | + return implode(', ', $errors); |
|
| 102 | + } |
|
| 103 | 103 | } |
@@ -13,15 +13,15 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | interface ImplicitTagging extends ElementBase |
| 15 | 15 | { |
| 16 | - /** |
|
| 17 | - * Get implicitly tagged wrapped element. |
|
| 18 | - * |
|
| 19 | - * @param int $tag Tag of the element |
|
| 20 | - * @param int $class Expected type class of the element |
|
| 21 | - * |
|
| 22 | - * @throws \UnexpectedValueException If expectation fails |
|
| 23 | - * |
|
| 24 | - * @return \Sop\ASN1\Type\UnspecifiedType |
|
| 25 | - */ |
|
| 26 | - public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType; |
|
| 16 | + /** |
|
| 17 | + * Get implicitly tagged wrapped element. |
|
| 18 | + * |
|
| 19 | + * @param int $tag Tag of the element |
|
| 20 | + * @param int $class Expected type class of the element |
|
| 21 | + * |
|
| 22 | + * @throws \UnexpectedValueException If expectation fails |
|
| 23 | + * |
|
| 24 | + * @return \Sop\ASN1\Type\UnspecifiedType |
|
| 25 | + */ |
|
| 26 | + public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType; |
|
| 27 | 27 | } |
@@ -17,38 +17,38 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | class NullType extends Element |
| 19 | 19 | { |
| 20 | - use UniversalClass; |
|
| 21 | - use PrimitiveType; |
|
| 20 | + use UniversalClass; |
|
| 21 | + use PrimitiveType; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Constructor. |
|
| 25 | - */ |
|
| 26 | - public function __construct() |
|
| 27 | - { |
|
| 28 | - $this->_typeTag = self::TYPE_NULL; |
|
| 29 | - } |
|
| 23 | + /** |
|
| 24 | + * Constructor. |
|
| 25 | + */ |
|
| 26 | + public function __construct() |
|
| 27 | + { |
|
| 28 | + $this->_typeTag = self::TYPE_NULL; |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * {@inheritdoc} |
|
| 33 | - */ |
|
| 34 | - protected function _encodedContentDER(): string |
|
| 35 | - { |
|
| 36 | - return ''; |
|
| 37 | - } |
|
| 31 | + /** |
|
| 32 | + * {@inheritdoc} |
|
| 33 | + */ |
|
| 34 | + protected function _encodedContentDER(): string |
|
| 35 | + { |
|
| 36 | + return ''; |
|
| 37 | + } |
|
| 38 | 38 | |
| 39 | - /** |
|
| 40 | - * {@inheritdoc} |
|
| 41 | - */ |
|
| 42 | - protected static function _decodeFromDER(Identifier $identifier, |
|
| 43 | - string $data, int &$offset): ElementBase |
|
| 44 | - { |
|
| 45 | - $idx = $offset; |
|
| 46 | - if (!$identifier->isPrimitive()) { |
|
| 47 | - throw new DecodeException('Null value must be primitive.'); |
|
| 48 | - } |
|
| 49 | - // null type has always zero length |
|
| 50 | - Length::expectFromDER($data, $idx, 0); |
|
| 51 | - $offset = $idx; |
|
| 52 | - return new self(); |
|
| 53 | - } |
|
| 39 | + /** |
|
| 40 | + * {@inheritdoc} |
|
| 41 | + */ |
|
| 42 | + protected static function _decodeFromDER(Identifier $identifier, |
|
| 43 | + string $data, int &$offset): ElementBase |
|
| 44 | + { |
|
| 45 | + $idx = $offset; |
|
| 46 | + if (!$identifier->isPrimitive()) { |
|
| 47 | + throw new DecodeException('Null value must be primitive.'); |
|
| 48 | + } |
|
| 49 | + // null type has always zero length |
|
| 50 | + Length::expectFromDER($data, $idx, 0); |
|
| 51 | + $offset = $idx; |
|
| 52 | + return new self(); |
|
| 53 | + } |
|
| 54 | 54 | } |
@@ -12,26 +12,26 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | class T61String extends PrimitiveString |
| 14 | 14 | { |
| 15 | - use UniversalClass; |
|
| 15 | + use UniversalClass; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Constructor. |
|
| 19 | - * |
|
| 20 | - * @param string $string |
|
| 21 | - */ |
|
| 22 | - public function __construct(string $string) |
|
| 23 | - { |
|
| 24 | - $this->_typeTag = self::TYPE_T61_STRING; |
|
| 25 | - parent::__construct($string); |
|
| 26 | - } |
|
| 17 | + /** |
|
| 18 | + * Constructor. |
|
| 19 | + * |
|
| 20 | + * @param string $string |
|
| 21 | + */ |
|
| 22 | + public function __construct(string $string) |
|
| 23 | + { |
|
| 24 | + $this->_typeTag = self::TYPE_T61_STRING; |
|
| 25 | + parent::__construct($string); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * {@inheritdoc} |
|
| 30 | - */ |
|
| 31 | - protected function _validateString(string $string): bool |
|
| 32 | - { |
|
| 33 | - // allow everything since there's literally |
|
| 34 | - // thousands of allowed characters (16 bit composed characters) |
|
| 35 | - return true; |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * {@inheritdoc} |
|
| 30 | + */ |
|
| 31 | + protected function _validateString(string $string): bool |
|
| 32 | + { |
|
| 33 | + // allow everything since there's literally |
|
| 34 | + // thousands of allowed characters (16 bit composed characters) |
|
| 35 | + return true; |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -14,24 +14,24 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | class UTF8String extends PrimitiveString |
| 16 | 16 | { |
| 17 | - use UniversalClass; |
|
| 17 | + use UniversalClass; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Constructor. |
|
| 21 | - * |
|
| 22 | - * @param string $string |
|
| 23 | - */ |
|
| 24 | - public function __construct(string $string) |
|
| 25 | - { |
|
| 26 | - $this->_typeTag = self::TYPE_UTF8_STRING; |
|
| 27 | - parent::__construct($string); |
|
| 28 | - } |
|
| 19 | + /** |
|
| 20 | + * Constructor. |
|
| 21 | + * |
|
| 22 | + * @param string $string |
|
| 23 | + */ |
|
| 24 | + public function __construct(string $string) |
|
| 25 | + { |
|
| 26 | + $this->_typeTag = self::TYPE_UTF8_STRING; |
|
| 27 | + parent::__construct($string); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * {@inheritdoc} |
|
| 32 | - */ |
|
| 33 | - protected function _validateString(string $string): bool |
|
| 34 | - { |
|
| 35 | - return mb_check_encoding($string, 'UTF-8'); |
|
| 36 | - } |
|
| 30 | + /** |
|
| 31 | + * {@inheritdoc} |
|
| 32 | + */ |
|
| 33 | + protected function _validateString(string $string): bool |
|
| 34 | + { |
|
| 35 | + return mb_check_encoding($string, 'UTF-8'); |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -17,70 +17,70 @@ |
||
| 17 | 17 | */ |
| 18 | 18 | class UTCTime extends TimeType |
| 19 | 19 | { |
| 20 | - use UniversalClass; |
|
| 21 | - use PrimitiveType; |
|
| 20 | + use UniversalClass; |
|
| 21 | + use PrimitiveType; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Regular expression to parse date. |
|
| 25 | - * |
|
| 26 | - * DER restricts format to UTC timezone (Z suffix). |
|
| 27 | - * |
|
| 28 | - * @var string |
|
| 29 | - */ |
|
| 30 | - const REGEX = '#^' . |
|
| 31 | - '(\d\d)' . // YY |
|
| 32 | - '(\d\d)' . // MM |
|
| 33 | - '(\d\d)' . // DD |
|
| 34 | - '(\d\d)' . // hh |
|
| 35 | - '(\d\d)' . // mm |
|
| 36 | - '(\d\d)' . // ss |
|
| 37 | - 'Z' . // TZ |
|
| 38 | - '$#'; |
|
| 23 | + /** |
|
| 24 | + * Regular expression to parse date. |
|
| 25 | + * |
|
| 26 | + * DER restricts format to UTC timezone (Z suffix). |
|
| 27 | + * |
|
| 28 | + * @var string |
|
| 29 | + */ |
|
| 30 | + const REGEX = '#^' . |
|
| 31 | + '(\d\d)' . // YY |
|
| 32 | + '(\d\d)' . // MM |
|
| 33 | + '(\d\d)' . // DD |
|
| 34 | + '(\d\d)' . // hh |
|
| 35 | + '(\d\d)' . // mm |
|
| 36 | + '(\d\d)' . // ss |
|
| 37 | + 'Z' . // TZ |
|
| 38 | + '$#'; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * Constructor. |
|
| 42 | - * |
|
| 43 | - * @param \DateTimeImmutable $dt |
|
| 44 | - */ |
|
| 45 | - public function __construct(\DateTimeImmutable $dt) |
|
| 46 | - { |
|
| 47 | - $this->_typeTag = self::TYPE_UTC_TIME; |
|
| 48 | - parent::__construct($dt); |
|
| 49 | - } |
|
| 40 | + /** |
|
| 41 | + * Constructor. |
|
| 42 | + * |
|
| 43 | + * @param \DateTimeImmutable $dt |
|
| 44 | + */ |
|
| 45 | + public function __construct(\DateTimeImmutable $dt) |
|
| 46 | + { |
|
| 47 | + $this->_typeTag = self::TYPE_UTC_TIME; |
|
| 48 | + parent::__construct($dt); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - /** |
|
| 52 | - * {@inheritdoc} |
|
| 53 | - */ |
|
| 54 | - protected function _encodedContentDER(): string |
|
| 55 | - { |
|
| 56 | - $dt = $this->_dateTime->setTimezone(self::_createTimeZone(self::TZ_UTC)); |
|
| 57 | - return $dt->format('ymdHis\\Z'); |
|
| 58 | - } |
|
| 51 | + /** |
|
| 52 | + * {@inheritdoc} |
|
| 53 | + */ |
|
| 54 | + protected function _encodedContentDER(): string |
|
| 55 | + { |
|
| 56 | + $dt = $this->_dateTime->setTimezone(self::_createTimeZone(self::TZ_UTC)); |
|
| 57 | + return $dt->format('ymdHis\\Z'); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - /** |
|
| 61 | - * {@inheritdoc} |
|
| 62 | - */ |
|
| 63 | - protected static function _decodeFromDER(Identifier $identifier, |
|
| 64 | - string $data, int &$offset): ElementBase |
|
| 65 | - { |
|
| 66 | - $idx = $offset; |
|
| 67 | - $length = Length::expectFromDER($data, $idx)->intLength(); |
|
| 68 | - $str = substr($data, $idx, $length); |
|
| 69 | - $idx += $length; |
|
| 70 | - /** @var string[] $match */ |
|
| 71 | - if (!preg_match(self::REGEX, $str, $match)) { |
|
| 72 | - throw new DecodeException('Invalid UTCTime format.'); |
|
| 73 | - } |
|
| 74 | - [, $year, $month, $day, $hour, $minute, $second] = $match; |
|
| 75 | - $time = $year . $month . $day . $hour . $minute . $second . self::TZ_UTC; |
|
| 76 | - $dt = \DateTimeImmutable::createFromFormat('!ymdHisT', $time, |
|
| 77 | - self::_createTimeZone(self::TZ_UTC)); |
|
| 78 | - if (!$dt) { |
|
| 79 | - throw new DecodeException( |
|
| 80 | - 'Failed to decode UTCTime: ' . |
|
| 81 | - self::_getLastDateTimeImmutableErrorsStr()); |
|
| 82 | - } |
|
| 83 | - $offset = $idx; |
|
| 84 | - return new self($dt); |
|
| 85 | - } |
|
| 60 | + /** |
|
| 61 | + * {@inheritdoc} |
|
| 62 | + */ |
|
| 63 | + protected static function _decodeFromDER(Identifier $identifier, |
|
| 64 | + string $data, int &$offset): ElementBase |
|
| 65 | + { |
|
| 66 | + $idx = $offset; |
|
| 67 | + $length = Length::expectFromDER($data, $idx)->intLength(); |
|
| 68 | + $str = substr($data, $idx, $length); |
|
| 69 | + $idx += $length; |
|
| 70 | + /** @var string[] $match */ |
|
| 71 | + if (!preg_match(self::REGEX, $str, $match)) { |
|
| 72 | + throw new DecodeException('Invalid UTCTime format.'); |
|
| 73 | + } |
|
| 74 | + [, $year, $month, $day, $hour, $minute, $second] = $match; |
|
| 75 | + $time = $year . $month . $day . $hour . $minute . $second . self::TZ_UTC; |
|
| 76 | + $dt = \DateTimeImmutable::createFromFormat('!ymdHisT', $time, |
|
| 77 | + self::_createTimeZone(self::TZ_UTC)); |
|
| 78 | + if (!$dt) { |
|
| 79 | + throw new DecodeException( |
|
| 80 | + 'Failed to decode UTCTime: ' . |
|
| 81 | + self::_getLastDateTimeImmutableErrorsStr()); |
|
| 82 | + } |
|
| 83 | + $offset = $idx; |
|
| 84 | + return new self($dt); |
|
| 85 | + } |
|
| 86 | 86 | } |
@@ -12,25 +12,25 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | class GeneralString extends PrimitiveString |
| 14 | 14 | { |
| 15 | - use UniversalClass; |
|
| 15 | + use UniversalClass; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Constructor. |
|
| 19 | - * |
|
| 20 | - * @param string $string |
|
| 21 | - */ |
|
| 22 | - public function __construct(string $string) |
|
| 23 | - { |
|
| 24 | - $this->_typeTag = self::TYPE_GENERAL_STRING; |
|
| 25 | - parent::__construct($string); |
|
| 26 | - } |
|
| 17 | + /** |
|
| 18 | + * Constructor. |
|
| 19 | + * |
|
| 20 | + * @param string $string |
|
| 21 | + */ |
|
| 22 | + public function __construct(string $string) |
|
| 23 | + { |
|
| 24 | + $this->_typeTag = self::TYPE_GENERAL_STRING; |
|
| 25 | + parent::__construct($string); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * {@inheritdoc} |
|
| 30 | - */ |
|
| 31 | - protected function _validateString(string $string): bool |
|
| 32 | - { |
|
| 33 | - // allow everything |
|
| 34 | - return true; |
|
| 35 | - } |
|
| 28 | + /** |
|
| 29 | + * {@inheritdoc} |
|
| 30 | + */ |
|
| 31 | + protected function _validateString(string $string): bool |
|
| 32 | + { |
|
| 33 | + // allow everything |
|
| 34 | + return true; |
|
| 35 | + } |
|
| 36 | 36 | } |