@@ -7,14 +7,14 @@ |
||
7 | 7 | */ |
8 | 8 | class Enumerated extends Integer |
9 | 9 | { |
10 | - /** |
|
11 | - * Constructor. |
|
12 | - * |
|
13 | - * @param int|string $number |
|
14 | - */ |
|
15 | - public function __construct($number) |
|
16 | - { |
|
17 | - parent::__construct($number); |
|
18 | - $this->_typeTag = self::TYPE_ENUMERATED; |
|
19 | - } |
|
10 | + /** |
|
11 | + * Constructor. |
|
12 | + * |
|
13 | + * @param int|string $number |
|
14 | + */ |
|
15 | + public function __construct($number) |
|
16 | + { |
|
17 | + parent::__construct($number); |
|
18 | + $this->_typeTag = self::TYPE_ENUMERATED; |
|
19 | + } |
|
20 | 20 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $obj = clone $this; |
33 | 33 | usort($obj->_elements, |
34 | - function (Element $a, Element $b) { |
|
34 | + function(Element $a, Element $b) { |
|
35 | 35 | if ($a->typeClass() != $b->typeClass()) { |
36 | 36 | return $a->typeClass() < $b->typeClass() ? -1 : 1; |
37 | 37 | } |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | { |
54 | 54 | $obj = clone $this; |
55 | 55 | usort($obj->_elements, |
56 | - function (Element $a, Element $b) { |
|
56 | + function(Element $a, Element $b) { |
|
57 | 57 | $a_der = $a->toDER(); |
58 | 58 | $b_der = $b->toDER(); |
59 | 59 | return strcmp($a_der, $b_der); |
@@ -12,54 +12,54 @@ |
||
12 | 12 | */ |
13 | 13 | class Set extends Structure |
14 | 14 | { |
15 | - /** |
|
16 | - * Constructor |
|
17 | - * |
|
18 | - * @param Element[] $elements Any number of elements |
|
19 | - */ |
|
20 | - public function __construct(Element ...$elements) |
|
21 | - { |
|
22 | - $this->_typeTag = self::TYPE_SET; |
|
23 | - parent::__construct(...$elements); |
|
24 | - } |
|
15 | + /** |
|
16 | + * Constructor |
|
17 | + * |
|
18 | + * @param Element[] $elements Any number of elements |
|
19 | + */ |
|
20 | + public function __construct(Element ...$elements) |
|
21 | + { |
|
22 | + $this->_typeTag = self::TYPE_SET; |
|
23 | + parent::__construct(...$elements); |
|
24 | + } |
|
25 | 25 | |
26 | - /** |
|
27 | - * Sort by canonical ascending order. |
|
28 | - * Used for DER encoding of SET type. |
|
29 | - * |
|
30 | - * @return self |
|
31 | - */ |
|
32 | - public function sortedSet(): self |
|
33 | - { |
|
34 | - $obj = clone $this; |
|
35 | - usort($obj->_elements, |
|
36 | - function (Element $a, Element $b) { |
|
37 | - if ($a->typeClass() != $b->typeClass()) { |
|
38 | - return $a->typeClass() < $b->typeClass() ? -1 : 1; |
|
39 | - } |
|
40 | - if ($a->tag() == $b->tag()) { |
|
41 | - return 0; |
|
42 | - } |
|
43 | - return $a->tag() < $b->tag() ? -1 : 1; |
|
44 | - }); |
|
45 | - return $obj; |
|
46 | - } |
|
26 | + /** |
|
27 | + * Sort by canonical ascending order. |
|
28 | + * Used for DER encoding of SET type. |
|
29 | + * |
|
30 | + * @return self |
|
31 | + */ |
|
32 | + public function sortedSet(): self |
|
33 | + { |
|
34 | + $obj = clone $this; |
|
35 | + usort($obj->_elements, |
|
36 | + function (Element $a, Element $b) { |
|
37 | + if ($a->typeClass() != $b->typeClass()) { |
|
38 | + return $a->typeClass() < $b->typeClass() ? -1 : 1; |
|
39 | + } |
|
40 | + if ($a->tag() == $b->tag()) { |
|
41 | + return 0; |
|
42 | + } |
|
43 | + return $a->tag() < $b->tag() ? -1 : 1; |
|
44 | + }); |
|
45 | + return $obj; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Sort by encoding ascending order. |
|
50 | - * Used for DER encoding of SET OF type. |
|
51 | - * |
|
52 | - * @return self |
|
53 | - */ |
|
54 | - public function sortedSetOf(): self |
|
55 | - { |
|
56 | - $obj = clone $this; |
|
57 | - usort($obj->_elements, |
|
58 | - function (Element $a, Element $b) { |
|
59 | - $a_der = $a->toDER(); |
|
60 | - $b_der = $b->toDER(); |
|
61 | - return strcmp($a_der, $b_der); |
|
62 | - }); |
|
63 | - return $obj; |
|
64 | - } |
|
48 | + /** |
|
49 | + * Sort by encoding ascending order. |
|
50 | + * Used for DER encoding of SET OF type. |
|
51 | + * |
|
52 | + * @return self |
|
53 | + */ |
|
54 | + public function sortedSetOf(): self |
|
55 | + { |
|
56 | + $obj = clone $this; |
|
57 | + usort($obj->_elements, |
|
58 | + function (Element $a, Element $b) { |
|
59 | + $a_der = $a->toDER(); |
|
60 | + $b_der = $b->toDER(); |
|
61 | + return strcmp($a_der, $b_der); |
|
62 | + }); |
|
63 | + return $obj; |
|
64 | + } |
|
65 | 65 | } |
@@ -273,7 +273,7 @@ |
||
273 | 273 | /** |
274 | 274 | * Test that number is valid for this context. |
275 | 275 | * |
276 | - * @param mixed $num |
|
276 | + * @param string $num |
|
277 | 277 | * @return boolean |
278 | 278 | */ |
279 | 279 | private static function _validateNumber($num): bool |
@@ -17,271 +17,271 @@ |
||
17 | 17 | */ |
18 | 18 | class Real extends Element |
19 | 19 | { |
20 | - use UniversalClass; |
|
21 | - use PrimitiveType; |
|
20 | + use UniversalClass; |
|
21 | + use PrimitiveType; |
|
22 | 22 | |
23 | - /** |
|
24 | - * Regex pattern to parse NR3 form number conforming to DER. |
|
25 | - * |
|
26 | - * @var string |
|
27 | - */ |
|
28 | - const NR3_REGEX = '/^(-?)(\d+)?\.E([+\-]?\d+)$/'; |
|
23 | + /** |
|
24 | + * Regex pattern to parse NR3 form number conforming to DER. |
|
25 | + * |
|
26 | + * @var string |
|
27 | + */ |
|
28 | + const NR3_REGEX = '/^(-?)(\d+)?\.E([+\-]?\d+)$/'; |
|
29 | 29 | |
30 | - /** |
|
31 | - * Regex pattern to parse PHP exponent number format. |
|
32 | - * |
|
33 | - * @link http://php.net/manual/en/language.types.float.php |
|
34 | - * @var string |
|
35 | - */ |
|
36 | - const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */ |
|
37 | - '([+\-]?'. // sign |
|
38 | - '(?:'. |
|
39 | - '\d+'. // LNUM |
|
40 | - '|'. |
|
41 | - '(?:\d*\.\d+|\d+\.\d*)'. // DNUM |
|
42 | - '))[eE]'. |
|
43 | - '([+\-]?\d+)'. // exponent |
|
44 | - '$/'; /* @formatter:on */ |
|
30 | + /** |
|
31 | + * Regex pattern to parse PHP exponent number format. |
|
32 | + * |
|
33 | + * @link http://php.net/manual/en/language.types.float.php |
|
34 | + * @var string |
|
35 | + */ |
|
36 | + const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */ |
|
37 | + '([+\-]?'. // sign |
|
38 | + '(?:'. |
|
39 | + '\d+'. // LNUM |
|
40 | + '|'. |
|
41 | + '(?:\d*\.\d+|\d+\.\d*)'. // DNUM |
|
42 | + '))[eE]'. |
|
43 | + '([+\-]?\d+)'. // exponent |
|
44 | + '$/'; /* @formatter:on */ |
|
45 | 45 | |
46 | - /** |
|
47 | - * Number zero represented in NR3 form. |
|
48 | - * |
|
49 | - * @var string |
|
50 | - */ |
|
51 | - const NR3_ZERO = ".E+0"; |
|
46 | + /** |
|
47 | + * Number zero represented in NR3 form. |
|
48 | + * |
|
49 | + * @var string |
|
50 | + */ |
|
51 | + const NR3_ZERO = ".E+0"; |
|
52 | 52 | |
53 | - /** |
|
54 | - * Number in NR3 form. |
|
55 | - * |
|
56 | - * @var string |
|
57 | - */ |
|
58 | - private $_number; |
|
53 | + /** |
|
54 | + * Number in NR3 form. |
|
55 | + * |
|
56 | + * @var string |
|
57 | + */ |
|
58 | + private $_number; |
|
59 | 59 | |
60 | - /** |
|
61 | - * Constructor. |
|
62 | - * |
|
63 | - * @param string $number Number in NR3 form. |
|
64 | - */ |
|
65 | - public function __construct(string $number) |
|
66 | - { |
|
67 | - $this->_typeTag = self::TYPE_REAL; |
|
68 | - if (!self::_validateNumber($number)) { |
|
69 | - throw new \InvalidArgumentException( |
|
70 | - "'$number' is not a valid NR3 form real."); |
|
71 | - } |
|
72 | - $this->_number = $number; |
|
73 | - } |
|
60 | + /** |
|
61 | + * Constructor. |
|
62 | + * |
|
63 | + * @param string $number Number in NR3 form. |
|
64 | + */ |
|
65 | + public function __construct(string $number) |
|
66 | + { |
|
67 | + $this->_typeTag = self::TYPE_REAL; |
|
68 | + if (!self::_validateNumber($number)) { |
|
69 | + throw new \InvalidArgumentException( |
|
70 | + "'$number' is not a valid NR3 form real."); |
|
71 | + } |
|
72 | + $this->_number = $number; |
|
73 | + } |
|
74 | 74 | |
75 | - /** |
|
76 | - * Initialize from float. |
|
77 | - * |
|
78 | - * @param float $number |
|
79 | - * @return self |
|
80 | - */ |
|
81 | - public static function fromFloat(float $number): self |
|
82 | - { |
|
83 | - return new self(self::_decimalToNR3(strval($number))); |
|
84 | - } |
|
75 | + /** |
|
76 | + * Initialize from float. |
|
77 | + * |
|
78 | + * @param float $number |
|
79 | + * @return self |
|
80 | + */ |
|
81 | + public static function fromFloat(float $number): self |
|
82 | + { |
|
83 | + return new self(self::_decimalToNR3(strval($number))); |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * Get number as a float. |
|
88 | - * |
|
89 | - * @return float |
|
90 | - */ |
|
91 | - public function float(): float |
|
92 | - { |
|
93 | - return self::_nr3ToDecimal($this->_number); |
|
94 | - } |
|
86 | + /** |
|
87 | + * Get number as a float. |
|
88 | + * |
|
89 | + * @return float |
|
90 | + */ |
|
91 | + public function float(): float |
|
92 | + { |
|
93 | + return self::_nr3ToDecimal($this->_number); |
|
94 | + } |
|
95 | 95 | |
96 | - /** |
|
97 | - * |
|
98 | - * {@inheritdoc} |
|
99 | - */ |
|
100 | - protected function _encodedContentDER(): string |
|
101 | - { |
|
102 | - /* if the real value is the value zero, there shall be no contents |
|
96 | + /** |
|
97 | + * |
|
98 | + * {@inheritdoc} |
|
99 | + */ |
|
100 | + protected function _encodedContentDER(): string |
|
101 | + { |
|
102 | + /* if the real value is the value zero, there shall be no contents |
|
103 | 103 | octets in the encoding. (X.690 07-2002, section 8.5.2) */ |
104 | - if (self::NR3_ZERO == $this->_number) { |
|
105 | - return ""; |
|
106 | - } |
|
107 | - // encode in NR3 decimal encoding |
|
108 | - $data = chr(0x03) . $this->_number; |
|
109 | - return $data; |
|
110 | - } |
|
104 | + if (self::NR3_ZERO == $this->_number) { |
|
105 | + return ""; |
|
106 | + } |
|
107 | + // encode in NR3 decimal encoding |
|
108 | + $data = chr(0x03) . $this->_number; |
|
109 | + return $data; |
|
110 | + } |
|
111 | 111 | |
112 | - /** |
|
113 | - * |
|
114 | - * {@inheritdoc} |
|
115 | - * @return self |
|
116 | - */ |
|
117 | - protected static function _decodeFromDER(Identifier $identifier, string $data, |
|
118 | - int &$offset): ElementBase |
|
119 | - { |
|
120 | - $idx = $offset; |
|
121 | - $length = Length::expectFromDER($data, $idx)->intLength(); |
|
122 | - // if length is zero, value is zero (spec 8.5.2) |
|
123 | - if (!$length) { |
|
124 | - $obj = new self(self::NR3_ZERO); |
|
125 | - } else { |
|
126 | - $bytes = substr($data, $idx, $length); |
|
127 | - $byte = ord($bytes[0]); |
|
128 | - if (0x80 & $byte) { // bit 8 = 1 |
|
129 | - $obj = self::_decodeBinaryEncoding($bytes); |
|
130 | - } else if ($byte >> 6 == 0x00) { // bit 8 = 0, bit 7 = 0 |
|
131 | - $obj = self::_decodeDecimalEncoding($bytes); |
|
132 | - } else { // bit 8 = 0, bit 7 = 1 |
|
133 | - $obj = self::_decodeSpecialRealValue($bytes); |
|
134 | - } |
|
135 | - } |
|
136 | - $offset = $idx + $length; |
|
137 | - return $obj; |
|
138 | - } |
|
112 | + /** |
|
113 | + * |
|
114 | + * {@inheritdoc} |
|
115 | + * @return self |
|
116 | + */ |
|
117 | + protected static function _decodeFromDER(Identifier $identifier, string $data, |
|
118 | + int &$offset): ElementBase |
|
119 | + { |
|
120 | + $idx = $offset; |
|
121 | + $length = Length::expectFromDER($data, $idx)->intLength(); |
|
122 | + // if length is zero, value is zero (spec 8.5.2) |
|
123 | + if (!$length) { |
|
124 | + $obj = new self(self::NR3_ZERO); |
|
125 | + } else { |
|
126 | + $bytes = substr($data, $idx, $length); |
|
127 | + $byte = ord($bytes[0]); |
|
128 | + if (0x80 & $byte) { // bit 8 = 1 |
|
129 | + $obj = self::_decodeBinaryEncoding($bytes); |
|
130 | + } else if ($byte >> 6 == 0x00) { // bit 8 = 0, bit 7 = 0 |
|
131 | + $obj = self::_decodeDecimalEncoding($bytes); |
|
132 | + } else { // bit 8 = 0, bit 7 = 1 |
|
133 | + $obj = self::_decodeSpecialRealValue($bytes); |
|
134 | + } |
|
135 | + } |
|
136 | + $offset = $idx + $length; |
|
137 | + return $obj; |
|
138 | + } |
|
139 | 139 | |
140 | - /** |
|
141 | - * |
|
142 | - * @todo Implement |
|
143 | - * @param string $data |
|
144 | - */ |
|
145 | - protected static function _decodeBinaryEncoding(string $data) |
|
146 | - { |
|
147 | - throw new \RuntimeException( |
|
148 | - "Binary encoding of REAL is not implemented."); |
|
149 | - } |
|
140 | + /** |
|
141 | + * |
|
142 | + * @todo Implement |
|
143 | + * @param string $data |
|
144 | + */ |
|
145 | + protected static function _decodeBinaryEncoding(string $data) |
|
146 | + { |
|
147 | + throw new \RuntimeException( |
|
148 | + "Binary encoding of REAL is not implemented."); |
|
149 | + } |
|
150 | 150 | |
151 | - /** |
|
152 | - * |
|
153 | - * @param string $data |
|
154 | - * @throws \RuntimeException |
|
155 | - * @return \ASN1\Type\Primitive\Real |
|
156 | - */ |
|
157 | - protected static function _decodeDecimalEncoding(string $data): Real |
|
158 | - { |
|
159 | - $nr = ord($data[0]) & 0x03; |
|
160 | - if ($nr != 0x03) { |
|
161 | - throw new \RuntimeException("Only NR3 form supported."); |
|
162 | - } |
|
163 | - $str = substr($data, 1); |
|
164 | - return new self($str); |
|
165 | - } |
|
151 | + /** |
|
152 | + * |
|
153 | + * @param string $data |
|
154 | + * @throws \RuntimeException |
|
155 | + * @return \ASN1\Type\Primitive\Real |
|
156 | + */ |
|
157 | + protected static function _decodeDecimalEncoding(string $data): Real |
|
158 | + { |
|
159 | + $nr = ord($data[0]) & 0x03; |
|
160 | + if ($nr != 0x03) { |
|
161 | + throw new \RuntimeException("Only NR3 form supported."); |
|
162 | + } |
|
163 | + $str = substr($data, 1); |
|
164 | + return new self($str); |
|
165 | + } |
|
166 | 166 | |
167 | - /** |
|
168 | - * |
|
169 | - * @todo Implement |
|
170 | - * @param string $data |
|
171 | - */ |
|
172 | - protected static function _decodeSpecialRealValue(string $data) |
|
173 | - { |
|
174 | - if (strlen($data) != 1) { |
|
175 | - throw new DecodeException( |
|
176 | - "SpecialRealValue must have one content octet."); |
|
177 | - } |
|
178 | - $byte = ord($data[0]); |
|
179 | - if ($byte == 0x40) { // positive infinity |
|
180 | - throw new \RuntimeException("PLUS-INFINITY not supported."); |
|
181 | - } else if ($byte == 0x41) { // negative infinity |
|
182 | - throw new \RuntimeException("MINUS-INFINITY not supported."); |
|
183 | - } else { |
|
184 | - throw new DecodeException("Invalid SpecialRealValue encoding."); |
|
185 | - } |
|
186 | - } |
|
167 | + /** |
|
168 | + * |
|
169 | + * @todo Implement |
|
170 | + * @param string $data |
|
171 | + */ |
|
172 | + protected static function _decodeSpecialRealValue(string $data) |
|
173 | + { |
|
174 | + if (strlen($data) != 1) { |
|
175 | + throw new DecodeException( |
|
176 | + "SpecialRealValue must have one content octet."); |
|
177 | + } |
|
178 | + $byte = ord($data[0]); |
|
179 | + if ($byte == 0x40) { // positive infinity |
|
180 | + throw new \RuntimeException("PLUS-INFINITY not supported."); |
|
181 | + } else if ($byte == 0x41) { // negative infinity |
|
182 | + throw new \RuntimeException("MINUS-INFINITY not supported."); |
|
183 | + } else { |
|
184 | + throw new DecodeException("Invalid SpecialRealValue encoding."); |
|
185 | + } |
|
186 | + } |
|
187 | 187 | |
188 | - /** |
|
189 | - * Convert decimal number string to NR3 form. |
|
190 | - * |
|
191 | - * @param string $str |
|
192 | - * @return string |
|
193 | - */ |
|
194 | - private static function _decimalToNR3(string $str): string |
|
195 | - { |
|
196 | - // if number is in exponent form |
|
197 | - if (preg_match(self::PHP_EXPONENT_DNUM, $str, $match)) { |
|
198 | - $parts = explode(".", $match[1]); |
|
199 | - $m = ltrim($parts[0], "0"); |
|
200 | - $e = intval($match[2]); |
|
201 | - // if mantissa had decimals |
|
202 | - if (count($parts) == 2) { |
|
203 | - $d = rtrim($parts[1], "0"); |
|
204 | - $e -= strlen($d); |
|
205 | - $m .= $d; |
|
206 | - } |
|
207 | - } else { |
|
208 | - // explode from decimal |
|
209 | - $parts = explode(".", $str); |
|
210 | - $m = ltrim($parts[0], "0"); |
|
211 | - // if number had decimals |
|
212 | - if (count($parts) == 2) { |
|
213 | - // exponent is negative number of the decimals |
|
214 | - $e = -strlen($parts[1]); |
|
215 | - // append decimals to the mantissa |
|
216 | - $m .= $parts[1]; |
|
217 | - } else { |
|
218 | - $e = 0; |
|
219 | - } |
|
220 | - // shift trailing zeroes from the mantissa to the exponent |
|
221 | - while (substr($m, -1) === "0") { |
|
222 | - $e++; |
|
223 | - $m = substr($m, 0, -1); |
|
224 | - } |
|
225 | - } |
|
226 | - /* if exponent is zero, it must be prefixed with a "+" sign |
|
188 | + /** |
|
189 | + * Convert decimal number string to NR3 form. |
|
190 | + * |
|
191 | + * @param string $str |
|
192 | + * @return string |
|
193 | + */ |
|
194 | + private static function _decimalToNR3(string $str): string |
|
195 | + { |
|
196 | + // if number is in exponent form |
|
197 | + if (preg_match(self::PHP_EXPONENT_DNUM, $str, $match)) { |
|
198 | + $parts = explode(".", $match[1]); |
|
199 | + $m = ltrim($parts[0], "0"); |
|
200 | + $e = intval($match[2]); |
|
201 | + // if mantissa had decimals |
|
202 | + if (count($parts) == 2) { |
|
203 | + $d = rtrim($parts[1], "0"); |
|
204 | + $e -= strlen($d); |
|
205 | + $m .= $d; |
|
206 | + } |
|
207 | + } else { |
|
208 | + // explode from decimal |
|
209 | + $parts = explode(".", $str); |
|
210 | + $m = ltrim($parts[0], "0"); |
|
211 | + // if number had decimals |
|
212 | + if (count($parts) == 2) { |
|
213 | + // exponent is negative number of the decimals |
|
214 | + $e = -strlen($parts[1]); |
|
215 | + // append decimals to the mantissa |
|
216 | + $m .= $parts[1]; |
|
217 | + } else { |
|
218 | + $e = 0; |
|
219 | + } |
|
220 | + // shift trailing zeroes from the mantissa to the exponent |
|
221 | + while (substr($m, -1) === "0") { |
|
222 | + $e++; |
|
223 | + $m = substr($m, 0, -1); |
|
224 | + } |
|
225 | + } |
|
226 | + /* if exponent is zero, it must be prefixed with a "+" sign |
|
227 | 227 | (X.690 07-2002, section 11.3.2.6) */ |
228 | - if (0 == $e) { |
|
229 | - $es = "+"; |
|
230 | - } else { |
|
231 | - $es = $e < 0 ? "-" : ""; |
|
232 | - } |
|
233 | - return sprintf("%s.E%s%d", $m, $es, abs($e)); |
|
234 | - } |
|
228 | + if (0 == $e) { |
|
229 | + $es = "+"; |
|
230 | + } else { |
|
231 | + $es = $e < 0 ? "-" : ""; |
|
232 | + } |
|
233 | + return sprintf("%s.E%s%d", $m, $es, abs($e)); |
|
234 | + } |
|
235 | 235 | |
236 | - /** |
|
237 | - * Convert NR3 form number to decimal. |
|
238 | - * |
|
239 | - * @param string $str |
|
240 | - * @throws \UnexpectedValueException |
|
241 | - * @return float |
|
242 | - */ |
|
243 | - private static function _nr3ToDecimal(string $str): float |
|
244 | - { |
|
245 | - if (!preg_match(self::NR3_REGEX, $str, $match)) { |
|
246 | - throw new \UnexpectedValueException( |
|
247 | - "'$str' is not a valid NR3 form real."); |
|
248 | - } |
|
249 | - $m = $match[2]; |
|
250 | - // if number started with minus sign |
|
251 | - $inv = $match[1] == "-"; |
|
252 | - $e = intval($match[3]); |
|
253 | - // positive exponent |
|
254 | - if ($e > 0) { |
|
255 | - // pad with trailing zeroes |
|
256 | - $num = $m . str_repeat("0", $e); |
|
257 | - } else if ($e < 0) { |
|
258 | - // pad with leading zeroes |
|
259 | - if (strlen($m) < abs($e)) { |
|
260 | - $m = str_repeat("0", abs($e) - strlen($m)) . $m; |
|
261 | - } |
|
262 | - // insert decimal point |
|
263 | - $num = substr($m, 0, $e) . "." . substr($m, $e); |
|
264 | - } else { |
|
265 | - $num = empty($m) ? "0" : $m; |
|
266 | - } |
|
267 | - // if number is negative |
|
268 | - if ($inv) { |
|
269 | - $num = "-$num"; |
|
270 | - } |
|
271 | - return floatval($num); |
|
272 | - } |
|
236 | + /** |
|
237 | + * Convert NR3 form number to decimal. |
|
238 | + * |
|
239 | + * @param string $str |
|
240 | + * @throws \UnexpectedValueException |
|
241 | + * @return float |
|
242 | + */ |
|
243 | + private static function _nr3ToDecimal(string $str): float |
|
244 | + { |
|
245 | + if (!preg_match(self::NR3_REGEX, $str, $match)) { |
|
246 | + throw new \UnexpectedValueException( |
|
247 | + "'$str' is not a valid NR3 form real."); |
|
248 | + } |
|
249 | + $m = $match[2]; |
|
250 | + // if number started with minus sign |
|
251 | + $inv = $match[1] == "-"; |
|
252 | + $e = intval($match[3]); |
|
253 | + // positive exponent |
|
254 | + if ($e > 0) { |
|
255 | + // pad with trailing zeroes |
|
256 | + $num = $m . str_repeat("0", $e); |
|
257 | + } else if ($e < 0) { |
|
258 | + // pad with leading zeroes |
|
259 | + if (strlen($m) < abs($e)) { |
|
260 | + $m = str_repeat("0", abs($e) - strlen($m)) . $m; |
|
261 | + } |
|
262 | + // insert decimal point |
|
263 | + $num = substr($m, 0, $e) . "." . substr($m, $e); |
|
264 | + } else { |
|
265 | + $num = empty($m) ? "0" : $m; |
|
266 | + } |
|
267 | + // if number is negative |
|
268 | + if ($inv) { |
|
269 | + $num = "-$num"; |
|
270 | + } |
|
271 | + return floatval($num); |
|
272 | + } |
|
273 | 273 | |
274 | - /** |
|
275 | - * Test that number is valid for this context. |
|
276 | - * |
|
277 | - * @param mixed $num |
|
278 | - * @return boolean |
|
279 | - */ |
|
280 | - private static function _validateNumber($num): bool |
|
281 | - { |
|
282 | - if (!preg_match(self::NR3_REGEX, $num)) { |
|
283 | - return false; |
|
284 | - } |
|
285 | - return true; |
|
286 | - } |
|
274 | + /** |
|
275 | + * Test that number is valid for this context. |
|
276 | + * |
|
277 | + * @param mixed $num |
|
278 | + * @return boolean |
|
279 | + */ |
|
280 | + private static function _validateNumber($num): bool |
|
281 | + { |
|
282 | + if (!preg_match(self::NR3_REGEX, $num)) { |
|
283 | + return false; |
|
284 | + } |
|
285 | + return true; |
|
286 | + } |
|
287 | 287 | } |
@@ -33,14 +33,14 @@ discard block |
||
33 | 33 | * @link http://php.net/manual/en/language.types.float.php |
34 | 34 | * @var string |
35 | 35 | */ |
36 | - const PHP_EXPONENT_DNUM = '/^'. /* @formatter:off */ |
|
37 | - '([+\-]?'. // sign |
|
38 | - '(?:'. |
|
39 | - '\d+'. // LNUM |
|
40 | - '|'. |
|
41 | - '(?:\d*\.\d+|\d+\.\d*)'. // DNUM |
|
42 | - '))[eE]'. |
|
43 | - '([+\-]?\d+)'. // exponent |
|
36 | + const PHP_EXPONENT_DNUM = '/^' . /* @formatter:off */ |
|
37 | + '([+\-]?' . // sign |
|
38 | + '(?:' . |
|
39 | + '\d+' . // LNUM |
|
40 | + '|' . |
|
41 | + '(?:\d*\.\d+|\d+\.\d*)' . // DNUM |
|
42 | + '))[eE]' . |
|
43 | + '([+\-]?\d+)' . // exponent |
|
44 | 44 | '$/'; /* @formatter:on */ |
45 | 45 | |
46 | 46 | /** |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * @return self |
116 | 116 | */ |
117 | 117 | protected static function _decodeFromDER(Identifier $identifier, string $data, |
118 | - int &$offset): ElementBase |
|
118 | + int & $offset): ElementBase |
|
119 | 119 | { |
120 | 120 | $idx = $offset; |
121 | 121 | $length = Length::expectFromDER($data, $idx)->intLength(); |
@@ -9,10 +9,10 @@ |
||
9 | 9 | */ |
10 | 10 | interface Encodable |
11 | 11 | { |
12 | - /** |
|
13 | - * Encode object to DER. |
|
14 | - * |
|
15 | - * @return string |
|
16 | - */ |
|
17 | - public function toDER(): string; |
|
12 | + /** |
|
13 | + * Encode object to DER. |
|
14 | + * |
|
15 | + * @return string |
|
16 | + */ |
|
17 | + public function toDER(): string; |
|
18 | 18 | } |
@@ -11,13 +11,13 @@ |
||
11 | 11 | */ |
12 | 12 | trait UniversalClass |
13 | 13 | { |
14 | - /** |
|
15 | - * |
|
16 | - * @see \ASN1\Element::typeClass() |
|
17 | - * @return int |
|
18 | - */ |
|
19 | - public function typeClass(): int |
|
20 | - { |
|
21 | - return Identifier::CLASS_UNIVERSAL; |
|
22 | - } |
|
14 | + /** |
|
15 | + * |
|
16 | + * @see \ASN1\Element::typeClass() |
|
17 | + * @return int |
|
18 | + */ |
|
19 | + public function typeClass(): int |
|
20 | + { |
|
21 | + return Identifier::CLASS_UNIVERSAL; |
|
22 | + } |
|
23 | 23 | } |
@@ -12,14 +12,14 @@ |
||
12 | 12 | */ |
13 | 13 | class Sequence extends Structure |
14 | 14 | { |
15 | - /** |
|
16 | - * Constructor |
|
17 | - * |
|
18 | - * @param Element[] $elements Any number of elements |
|
19 | - */ |
|
20 | - public function __construct(Element ...$elements) |
|
21 | - { |
|
22 | - $this->_typeTag = self::TYPE_SEQUENCE; |
|
23 | - parent::__construct(...$elements); |
|
24 | - } |
|
15 | + /** |
|
16 | + * Constructor |
|
17 | + * |
|
18 | + * @param Element[] $elements Any number of elements |
|
19 | + */ |
|
20 | + public function __construct(Element ...$elements) |
|
21 | + { |
|
22 | + $this->_typeTag = self::TYPE_SEQUENCE; |
|
23 | + parent::__construct(...$elements); |
|
24 | + } |
|
25 | 25 | } |
@@ -12,26 +12,26 @@ |
||
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 | - * |
|
30 | - * {@inheritdoc} |
|
31 | - */ |
|
32 | - protected function _validateString(string $string): bool |
|
33 | - { |
|
34 | - // allow everything |
|
35 | - return true; |
|
36 | - } |
|
28 | + /** |
|
29 | + * |
|
30 | + * {@inheritdoc} |
|
31 | + */ |
|
32 | + protected function _validateString(string $string): bool |
|
33 | + { |
|
34 | + // allow everything |
|
35 | + return true; |
|
36 | + } |
|
37 | 37 | } |
@@ -12,16 +12,16 @@ |
||
12 | 12 | */ |
13 | 13 | class OctetString 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_OCTET_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_OCTET_STRING; |
|
25 | + parent::__construct($string); |
|
26 | + } |
|
27 | 27 | } |
@@ -12,26 +12,26 @@ |
||
12 | 12 | */ |
13 | 13 | class PrintableString 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_PRINTABLE_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_PRINTABLE_STRING; |
|
25 | + parent::__construct($string); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * |
|
30 | - * {@inheritdoc} |
|
31 | - */ |
|
32 | - protected function _validateString(string $string): bool |
|
33 | - { |
|
34 | - $chars = preg_quote(" '()+,-./:=?]", "/"); |
|
35 | - return preg_match('/[^A-Za-z0-9' . $chars . ']/', $string) == 0; |
|
36 | - } |
|
28 | + /** |
|
29 | + * |
|
30 | + * {@inheritdoc} |
|
31 | + */ |
|
32 | + protected function _validateString(string $string): bool |
|
33 | + { |
|
34 | + $chars = preg_quote(" '()+,-./:=?]", "/"); |
|
35 | + return preg_match('/[^A-Za-z0-9' . $chars . ']/', $string) == 0; |
|
36 | + } |
|
37 | 37 | } |