GitHub Access Token became invalid

It seems like the GitHub access token used for retrieving details about this repository from GitHub became invalid. This might prevent certain types of inspections from being run (in particular, everything related to pull requests).
Please ask an admin of your repository to re-new the access token on this website.
Passed
Push — master ( 977674...95c197 )
by Joni
02:30
created
lib/ASN1/Component/Length.php 1 patch
Indentation   +201 added lines, -201 removed lines patch added patch discarded remove patch
@@ -12,214 +12,214 @@
 block discarded – undo
12 12
  */
13 13
 class Length implements Encodable
14 14
 {
15
-    /**
16
-     * Length.
17
-     *
18
-     * @var BigInt
19
-     */
20
-    private $_length;
15
+	/**
16
+	 * Length.
17
+	 *
18
+	 * @var BigInt
19
+	 */
20
+	private $_length;
21 21
     
22
-    /**
23
-     * Whether length is indefinite.
24
-     *
25
-     * @var bool
26
-     */
27
-    private $_indefinite;
22
+	/**
23
+	 * Whether length is indefinite.
24
+	 *
25
+	 * @var bool
26
+	 */
27
+	private $_indefinite;
28 28
     
29
-    /**
30
-     * Constructor.
31
-     *
32
-     * @param int|string $length Length
33
-     * @param bool $indefinite Whether length is indefinite
34
-     */
35
-    public function __construct($length, bool $indefinite = false)
36
-    {
37
-        $this->_length = new BigInt($length);
38
-        $this->_indefinite = $indefinite;
39
-    }
29
+	/**
30
+	 * Constructor.
31
+	 *
32
+	 * @param int|string $length Length
33
+	 * @param bool $indefinite Whether length is indefinite
34
+	 */
35
+	public function __construct($length, bool $indefinite = false)
36
+	{
37
+		$this->_length = new BigInt($length);
38
+		$this->_indefinite = $indefinite;
39
+	}
40 40
     
41
-    /**
42
-     * Decode length component from DER data.
43
-     *
44
-     * @param string $data DER encoded data
45
-     * @param int|null $offset Reference to the variable that contains offset
46
-     *        into the data where to start parsing. Variable is updated to
47
-     *        the offset next to the parsed length component. If null, start
48
-     *        from offset 0.
49
-     * @throws DecodeException If decoding fails
50
-     * @return self
51
-     */
52
-    public static function fromDER(string $data, int &$offset = null): self
53
-    {
54
-        $idx = $offset ?? 0;
55
-        $datalen = strlen($data);
56
-        if ($idx >= $datalen) {
57
-            throw new DecodeException(
58
-                "Unexpected end of data while decoding length.");
59
-        }
60
-        $indefinite = false;
61
-        $byte = ord($data[$idx++]);
62
-        // bits 7 to 1
63
-        $length = (0x7f & $byte);
64
-        // long form
65
-        if (0x80 & $byte) {
66
-            if (!$length) {
67
-                $indefinite = true;
68
-            } else {
69
-                if ($idx + $length > $datalen) {
70
-                    throw new DecodeException(
71
-                        "Unexpected end of data while decoding long form length.");
72
-                }
73
-                $length = self::_decodeLongFormLength($length, $data, $idx);
74
-            }
75
-        }
76
-        if (isset($offset)) {
77
-            $offset = $idx;
78
-        }
79
-        return new self($length, $indefinite);
80
-    }
41
+	/**
42
+	 * Decode length component from DER data.
43
+	 *
44
+	 * @param string $data DER encoded data
45
+	 * @param int|null $offset Reference to the variable that contains offset
46
+	 *        into the data where to start parsing. Variable is updated to
47
+	 *        the offset next to the parsed length component. If null, start
48
+	 *        from offset 0.
49
+	 * @throws DecodeException If decoding fails
50
+	 * @return self
51
+	 */
52
+	public static function fromDER(string $data, int &$offset = null): self
53
+	{
54
+		$idx = $offset ?? 0;
55
+		$datalen = strlen($data);
56
+		if ($idx >= $datalen) {
57
+			throw new DecodeException(
58
+				"Unexpected end of data while decoding length.");
59
+		}
60
+		$indefinite = false;
61
+		$byte = ord($data[$idx++]);
62
+		// bits 7 to 1
63
+		$length = (0x7f & $byte);
64
+		// long form
65
+		if (0x80 & $byte) {
66
+			if (!$length) {
67
+				$indefinite = true;
68
+			} else {
69
+				if ($idx + $length > $datalen) {
70
+					throw new DecodeException(
71
+						"Unexpected end of data while decoding long form length.");
72
+				}
73
+				$length = self::_decodeLongFormLength($length, $data, $idx);
74
+			}
75
+		}
76
+		if (isset($offset)) {
77
+			$offset = $idx;
78
+		}
79
+		return new self($length, $indefinite);
80
+	}
81 81
     
82
-    /**
83
-     * Decode long form length.
84
-     *
85
-     * @param int $length Number of octets
86
-     * @param string $data Data
87
-     * @param int $offset Reference to the variable containing offset to the
88
-     *        data.
89
-     * @throws DecodeException If decoding fails
90
-     * @return string Integer as a string
91
-     */
92
-    private static function _decodeLongFormLength(int $length, string $data,
93
-        int &$offset): string
94
-    {
95
-        // first octet must not be 0xff (spec 8.1.3.5c)
96
-        if ($length == 127) {
97
-            throw new DecodeException("Invalid number of length octets.");
98
-        }
99
-        $num = gmp_init(0, 10);
100
-        while (--$length >= 0) {
101
-            $byte = ord($data[$offset++]);
102
-            $num <<= 8;
103
-            $num |= $byte;
104
-        }
105
-        return gmp_strval($num);
106
-    }
82
+	/**
83
+	 * Decode long form length.
84
+	 *
85
+	 * @param int $length Number of octets
86
+	 * @param string $data Data
87
+	 * @param int $offset Reference to the variable containing offset to the
88
+	 *        data.
89
+	 * @throws DecodeException If decoding fails
90
+	 * @return string Integer as a string
91
+	 */
92
+	private static function _decodeLongFormLength(int $length, string $data,
93
+		int &$offset): string
94
+	{
95
+		// first octet must not be 0xff (spec 8.1.3.5c)
96
+		if ($length == 127) {
97
+			throw new DecodeException("Invalid number of length octets.");
98
+		}
99
+		$num = gmp_init(0, 10);
100
+		while (--$length >= 0) {
101
+			$byte = ord($data[$offset++]);
102
+			$num <<= 8;
103
+			$num |= $byte;
104
+		}
105
+		return gmp_strval($num);
106
+	}
107 107
     
108
-    /**
109
-     * Decode length from DER.
110
-     *
111
-     * Throws an exception if length doesn't match with expected or if data
112
-     * doesn't contain enough bytes.
113
-     *
114
-     * Requirement of definite length is relaxed contrary to the specification
115
-     * (sect. 10.1).
116
-     *
117
-     * @see self::fromDER
118
-     * @param string $data DER data
119
-     * @param int $offset Reference to the offset variable
120
-     * @param int|null $expected Expected length, null to bypass checking
121
-     * @throws DecodeException If decoding or expectation fails
122
-     * @return self
123
-     */
124
-    public static function expectFromDER(string $data, int &$offset,
125
-        int $expected = null): self
126
-    {
127
-        $idx = $offset;
128
-        $length = self::fromDER($data, $idx);
129
-        // if certain length was expected
130
-        if (isset($expected)) {
131
-            if ($length->isIndefinite()) {
132
-                throw new DecodeException('Expected length %d, got indefinite.',
133
-                    $expected);
134
-            }
135
-            if ($expected != $length->intLength()) {
136
-                throw new DecodeException(
137
-                    sprintf("Expected length %d, got %d.", $expected,
138
-                        $length->intLength()));
139
-            }
140
-        }
141
-        // check that enough data is available
142
-        if (!$length->isIndefinite() &&
143
-            strlen($data) < $idx + $length->intLength()) {
144
-            throw new DecodeException(
145
-                sprintf("Length %d overflows data, %d bytes left.",
146
-                    $length->intLength(), strlen($data) - $idx));
147
-        }
148
-        $offset = $idx;
149
-        return $length;
150
-    }
108
+	/**
109
+	 * Decode length from DER.
110
+	 *
111
+	 * Throws an exception if length doesn't match with expected or if data
112
+	 * doesn't contain enough bytes.
113
+	 *
114
+	 * Requirement of definite length is relaxed contrary to the specification
115
+	 * (sect. 10.1).
116
+	 *
117
+	 * @see self::fromDER
118
+	 * @param string $data DER data
119
+	 * @param int $offset Reference to the offset variable
120
+	 * @param int|null $expected Expected length, null to bypass checking
121
+	 * @throws DecodeException If decoding or expectation fails
122
+	 * @return self
123
+	 */
124
+	public static function expectFromDER(string $data, int &$offset,
125
+		int $expected = null): self
126
+	{
127
+		$idx = $offset;
128
+		$length = self::fromDER($data, $idx);
129
+		// if certain length was expected
130
+		if (isset($expected)) {
131
+			if ($length->isIndefinite()) {
132
+				throw new DecodeException('Expected length %d, got indefinite.',
133
+					$expected);
134
+			}
135
+			if ($expected != $length->intLength()) {
136
+				throw new DecodeException(
137
+					sprintf("Expected length %d, got %d.", $expected,
138
+						$length->intLength()));
139
+			}
140
+		}
141
+		// check that enough data is available
142
+		if (!$length->isIndefinite() &&
143
+			strlen($data) < $idx + $length->intLength()) {
144
+			throw new DecodeException(
145
+				sprintf("Length %d overflows data, %d bytes left.",
146
+					$length->intLength(), strlen($data) - $idx));
147
+		}
148
+		$offset = $idx;
149
+		return $length;
150
+	}
151 151
     
152
-    /**
153
-     *
154
-     * @see Encodable::toDER()
155
-     * @throws \DomainException If length is too large to encode
156
-     * @return string
157
-     */
158
-    public function toDER(): string
159
-    {
160
-        $bytes = [];
161
-        if ($this->_indefinite) {
162
-            $bytes[] = 0x80;
163
-        } else {
164
-            $num = $this->_length->gmpObj();
165
-            // long form
166
-            if ($num > 127) {
167
-                $octets = [];
168
-                for (; $num > 0; $num >>= 8) {
169
-                    $octets[] = gmp_intval(0xff & $num);
170
-                }
171
-                $count = count($octets);
172
-                // first octet must not be 0xff
173
-                if ($count >= 127) {
174
-                    throw new \DomainException("Too many length octets.");
175
-                }
176
-                $bytes[] = 0x80 | $count;
177
-                foreach (array_reverse($octets) as $octet) {
178
-                    $bytes[] = $octet;
179
-                }
180
-            } else { // short form
181
-                $bytes[] = gmp_intval($num);
182
-            }
183
-        }
184
-        return pack("C*", ...$bytes);
185
-    }
152
+	/**
153
+	 *
154
+	 * @see Encodable::toDER()
155
+	 * @throws \DomainException If length is too large to encode
156
+	 * @return string
157
+	 */
158
+	public function toDER(): string
159
+	{
160
+		$bytes = [];
161
+		if ($this->_indefinite) {
162
+			$bytes[] = 0x80;
163
+		} else {
164
+			$num = $this->_length->gmpObj();
165
+			// long form
166
+			if ($num > 127) {
167
+				$octets = [];
168
+				for (; $num > 0; $num >>= 8) {
169
+					$octets[] = gmp_intval(0xff & $num);
170
+				}
171
+				$count = count($octets);
172
+				// first octet must not be 0xff
173
+				if ($count >= 127) {
174
+					throw new \DomainException("Too many length octets.");
175
+				}
176
+				$bytes[] = 0x80 | $count;
177
+				foreach (array_reverse($octets) as $octet) {
178
+					$bytes[] = $octet;
179
+				}
180
+			} else { // short form
181
+				$bytes[] = gmp_intval($num);
182
+			}
183
+		}
184
+		return pack("C*", ...$bytes);
185
+	}
186 186
     
187
-    /**
188
-     * Get the length.
189
-     *
190
-     * @throws \LogicException If length is indefinite
191
-     * @return string Length as an integer string
192
-     */
193
-    public function length(): string
194
-    {
195
-        if ($this->_indefinite) {
196
-            throw new \LogicException("Length is indefinite.");
197
-        }
198
-        return $this->_length->base10();
199
-    }
187
+	/**
188
+	 * Get the length.
189
+	 *
190
+	 * @throws \LogicException If length is indefinite
191
+	 * @return string Length as an integer string
192
+	 */
193
+	public function length(): string
194
+	{
195
+		if ($this->_indefinite) {
196
+			throw new \LogicException("Length is indefinite.");
197
+		}
198
+		return $this->_length->base10();
199
+	}
200 200
     
201
-    /**
202
-     * Get the length as an integer.
203
-     *
204
-     * @throws \LogicException If length is indefinite
205
-     * @throws \RuntimeException If length overflows integer size
206
-     * @return int
207
-     */
208
-    public function intLength(): int
209
-    {
210
-        if ($this->_indefinite) {
211
-            throw new \LogicException("Length is indefinite.");
212
-        }
213
-        return $this->_length->intVal();
214
-    }
201
+	/**
202
+	 * Get the length as an integer.
203
+	 *
204
+	 * @throws \LogicException If length is indefinite
205
+	 * @throws \RuntimeException If length overflows integer size
206
+	 * @return int
207
+	 */
208
+	public function intLength(): int
209
+	{
210
+		if ($this->_indefinite) {
211
+			throw new \LogicException("Length is indefinite.");
212
+		}
213
+		return $this->_length->intVal();
214
+	}
215 215
     
216
-    /**
217
-     * Whether length is indefinite.
218
-     *
219
-     * @return bool
220
-     */
221
-    public function isIndefinite(): bool
222
-    {
223
-        return $this->_indefinite;
224
-    }
216
+	/**
217
+	 * Whether length is indefinite.
218
+	 *
219
+	 * @return bool
220
+	 */
221
+	public function isIndefinite(): bool
222
+	{
223
+		return $this->_indefinite;
224
+	}
225 225
 }
Please login to merge, or discard this patch.
lib/ASN1/Type/Structure.php 1 patch
Indentation   +368 added lines, -368 removed lines patch added patch discarded remove patch
@@ -13,396 +13,396 @@
 block discarded – undo
13 13
  * Base class for the constructed types.
14 14
  */
15 15
 abstract class Structure extends Element implements 
16
-    \Countable,
17
-    \IteratorAggregate
16
+	\Countable,
17
+	\IteratorAggregate
18 18
 {
19
-    use UniversalClass;
19
+	use UniversalClass;
20 20
     
21
-    /**
22
-     * Array of elements in the structure.
23
-     *
24
-     * @var Element[] $_elements
25
-     */
26
-    protected $_elements;
21
+	/**
22
+	 * Array of elements in the structure.
23
+	 *
24
+	 * @var Element[] $_elements
25
+	 */
26
+	protected $_elements;
27 27
     
28
-    /**
29
-     * Lookup table for the tagged elements.
30
-     *
31
-     * @var TaggedType[]|null $_taggedMap
32
-     */
33
-    private $_taggedMap;
28
+	/**
29
+	 * Lookup table for the tagged elements.
30
+	 *
31
+	 * @var TaggedType[]|null $_taggedMap
32
+	 */
33
+	private $_taggedMap;
34 34
     
35
-    /**
36
-     * Cache variable of elements wrapped into UnspecifiedType objects.
37
-     *
38
-     * @var UnspecifiedType[]|null $_unspecifiedTypes
39
-     */
40
-    private $_unspecifiedTypes;
35
+	/**
36
+	 * Cache variable of elements wrapped into UnspecifiedType objects.
37
+	 *
38
+	 * @var UnspecifiedType[]|null $_unspecifiedTypes
39
+	 */
40
+	private $_unspecifiedTypes;
41 41
     
42
-    /**
43
-     * Constructor.
44
-     *
45
-     * @param ElementBase ...$elements Any number of elements
46
-     */
47
-    public function __construct(ElementBase ...$elements)
48
-    {
49
-        $this->_elements = array_map(
50
-            function (ElementBase $el) {
51
-                return $el->asElement();
52
-            }, $elements);
53
-    }
42
+	/**
43
+	 * Constructor.
44
+	 *
45
+	 * @param ElementBase ...$elements Any number of elements
46
+	 */
47
+	public function __construct(ElementBase ...$elements)
48
+	{
49
+		$this->_elements = array_map(
50
+			function (ElementBase $el) {
51
+				return $el->asElement();
52
+			}, $elements);
53
+	}
54 54
     
55
-    /**
56
-     * Clone magic method.
57
-     */
58
-    public function __clone()
59
-    {
60
-        // clear cache-variables
61
-        $this->_taggedMap = null;
62
-        $this->_unspecifiedTypes = null;
63
-    }
55
+	/**
56
+	 * Clone magic method.
57
+	 */
58
+	public function __clone()
59
+	{
60
+		// clear cache-variables
61
+		$this->_taggedMap = null;
62
+		$this->_unspecifiedTypes = null;
63
+	}
64 64
     
65
-    /**
66
-     *
67
-     * @see \ASN1\Element::isConstructed()
68
-     * @return bool
69
-     */
70
-    public function isConstructed(): bool
71
-    {
72
-        return true;
73
-    }
65
+	/**
66
+	 *
67
+	 * @see \ASN1\Element::isConstructed()
68
+	 * @return bool
69
+	 */
70
+	public function isConstructed(): bool
71
+	{
72
+		return true;
73
+	}
74 74
     
75
-    /**
76
-     *
77
-     * @see \ASN1\Element::_encodedContentDER()
78
-     * @return string
79
-     */
80
-    protected function _encodedContentDER(): string
81
-    {
82
-        $data = "";
83
-        foreach ($this->_elements as $element) {
84
-            $data .= $element->toDER();
85
-        }
86
-        return $data;
87
-    }
75
+	/**
76
+	 *
77
+	 * @see \ASN1\Element::_encodedContentDER()
78
+	 * @return string
79
+	 */
80
+	protected function _encodedContentDER(): string
81
+	{
82
+		$data = "";
83
+		foreach ($this->_elements as $element) {
84
+			$data .= $element->toDER();
85
+		}
86
+		return $data;
87
+	}
88 88
     
89
-    /**
90
-     *
91
-     * {@inheritdoc}
92
-     * @see \ASN1\Element::_decodeFromDER()
93
-     * @return self
94
-     */
95
-    protected static function _decodeFromDER(Identifier $identifier,
96
-        string $data, int &$offset): ElementBase
97
-    {
98
-        if (!$identifier->isConstructed()) {
99
-            throw new DecodeException(
100
-                "Structured element must have constructed bit set.");
101
-        }
102
-        $idx = $offset;
103
-        $length = Length::expectFromDER($data, $idx);
104
-        if ($length->isIndefinite()) {
105
-            $type = self::_decodeIndefiniteLength($data, $idx);
106
-        } else {
107
-            $type = self::_decodeDefiniteLength($data, $idx,
108
-                $length->intLength());
109
-        }
110
-        $offset = $idx;
111
-        return $type;
112
-    }
89
+	/**
90
+	 *
91
+	 * {@inheritdoc}
92
+	 * @see \ASN1\Element::_decodeFromDER()
93
+	 * @return self
94
+	 */
95
+	protected static function _decodeFromDER(Identifier $identifier,
96
+		string $data, int &$offset): ElementBase
97
+	{
98
+		if (!$identifier->isConstructed()) {
99
+			throw new DecodeException(
100
+				"Structured element must have constructed bit set.");
101
+		}
102
+		$idx = $offset;
103
+		$length = Length::expectFromDER($data, $idx);
104
+		if ($length->isIndefinite()) {
105
+			$type = self::_decodeIndefiniteLength($data, $idx);
106
+		} else {
107
+			$type = self::_decodeDefiniteLength($data, $idx,
108
+				$length->intLength());
109
+		}
110
+		$offset = $idx;
111
+		return $type;
112
+	}
113 113
     
114
-    /**
115
-     * Decode elements for a definite length.
116
-     *
117
-     * @param string $data DER data
118
-     * @param int $offset Offset to data
119
-     * @param int $length Number of bytes to decode
120
-     * @throws DecodeException
121
-     * @return ElementBase
122
-     */
123
-    private static function _decodeDefiniteLength(string $data, int &$offset,
124
-        int $length): ElementBase
125
-    {
126
-        $idx = $offset;
127
-        $end = $idx + $length;
128
-        $elements = [];
129
-        while ($idx < $end) {
130
-            $elements[] = Element::fromDER($data, $idx);
131
-            // check that element didn't overflow length
132
-            if ($idx > $end) {
133
-                throw new DecodeException(
134
-                    "Structure's content overflows length.");
135
-            }
136
-        }
137
-        $offset = $idx;
138
-        // return instance by static late binding
139
-        return new static(...$elements);
140
-    }
114
+	/**
115
+	 * Decode elements for a definite length.
116
+	 *
117
+	 * @param string $data DER data
118
+	 * @param int $offset Offset to data
119
+	 * @param int $length Number of bytes to decode
120
+	 * @throws DecodeException
121
+	 * @return ElementBase
122
+	 */
123
+	private static function _decodeDefiniteLength(string $data, int &$offset,
124
+		int $length): ElementBase
125
+	{
126
+		$idx = $offset;
127
+		$end = $idx + $length;
128
+		$elements = [];
129
+		while ($idx < $end) {
130
+			$elements[] = Element::fromDER($data, $idx);
131
+			// check that element didn't overflow length
132
+			if ($idx > $end) {
133
+				throw new DecodeException(
134
+					"Structure's content overflows length.");
135
+			}
136
+		}
137
+		$offset = $idx;
138
+		// return instance by static late binding
139
+		return new static(...$elements);
140
+	}
141 141
     
142
-    /**
143
-     * Decode elements for an indefinite length.
144
-     *
145
-     * @param string $data DER data
146
-     * @param int $offset Offset to data
147
-     * @throws DecodeException
148
-     * @return ElementBase
149
-     */
150
-    private static function _decodeIndefiniteLength(string $data, int &$offset): ElementBase
151
-    {
152
-        $idx = $offset;
153
-        $elements = [];
154
-        $end = strlen($data);
155
-        while (true) {
156
-            if ($idx >= $end) {
157
-                throw new DecodeException(
158
-                    'Unexpected end of data while decoding indefinite length structure.');
159
-            }
160
-            $el = Element::fromDER($data, $idx);
161
-            if ($el->isType(self::TYPE_EOC)) {
162
-                break;
163
-            }
164
-            $elements[] = $el;
165
-        }
166
-        $offset = $idx;
167
-        $type = new static(...$elements);
168
-        $type->_indefiniteLength = true;
169
-        return $type;
170
-    }
142
+	/**
143
+	 * Decode elements for an indefinite length.
144
+	 *
145
+	 * @param string $data DER data
146
+	 * @param int $offset Offset to data
147
+	 * @throws DecodeException
148
+	 * @return ElementBase
149
+	 */
150
+	private static function _decodeIndefiniteLength(string $data, int &$offset): ElementBase
151
+	{
152
+		$idx = $offset;
153
+		$elements = [];
154
+		$end = strlen($data);
155
+		while (true) {
156
+			if ($idx >= $end) {
157
+				throw new DecodeException(
158
+					'Unexpected end of data while decoding indefinite length structure.');
159
+			}
160
+			$el = Element::fromDER($data, $idx);
161
+			if ($el->isType(self::TYPE_EOC)) {
162
+				break;
163
+			}
164
+			$elements[] = $el;
165
+		}
166
+		$offset = $idx;
167
+		$type = new static(...$elements);
168
+		$type->_indefiniteLength = true;
169
+		return $type;
170
+	}
171 171
     
172
-    /**
173
-     * Explode DER structure to DER encoded components that it contains.
174
-     *
175
-     * @param string $data
176
-     * @throws DecodeException
177
-     * @return string[]
178
-     */
179
-    public static function explodeDER(string $data): array
180
-    {
181
-        $offset = 0;
182
-        $identifier = Identifier::fromDER($data, $offset);
183
-        if (!$identifier->isConstructed()) {
184
-            throw new DecodeException("Element is not constructed.");
185
-        }
186
-        $length = Length::expectFromDER($data, $offset);
187
-        if ($length->isIndefinite()) {
188
-            throw new DecodeException(
189
-                'Explode not implemented for indefinite length encoding.');
190
-        }
191
-        $end = $offset + $length->intLength();
192
-        $parts = [];
193
-        while ($offset < $end) {
194
-            // start of the element
195
-            $idx = $offset;
196
-            // skip identifier
197
-            Identifier::fromDER($data, $offset);
198
-            // decode element length
199
-            $length = Length::expectFromDER($data, $offset)->intLength();
200
-            // extract der encoding of the element
201
-            $parts[] = substr($data, $idx, $offset - $idx + $length);
202
-            // update offset over content
203
-            $offset += $length;
204
-        }
205
-        return $parts;
206
-    }
172
+	/**
173
+	 * Explode DER structure to DER encoded components that it contains.
174
+	 *
175
+	 * @param string $data
176
+	 * @throws DecodeException
177
+	 * @return string[]
178
+	 */
179
+	public static function explodeDER(string $data): array
180
+	{
181
+		$offset = 0;
182
+		$identifier = Identifier::fromDER($data, $offset);
183
+		if (!$identifier->isConstructed()) {
184
+			throw new DecodeException("Element is not constructed.");
185
+		}
186
+		$length = Length::expectFromDER($data, $offset);
187
+		if ($length->isIndefinite()) {
188
+			throw new DecodeException(
189
+				'Explode not implemented for indefinite length encoding.');
190
+		}
191
+		$end = $offset + $length->intLength();
192
+		$parts = [];
193
+		while ($offset < $end) {
194
+			// start of the element
195
+			$idx = $offset;
196
+			// skip identifier
197
+			Identifier::fromDER($data, $offset);
198
+			// decode element length
199
+			$length = Length::expectFromDER($data, $offset)->intLength();
200
+			// extract der encoding of the element
201
+			$parts[] = substr($data, $idx, $offset - $idx + $length);
202
+			// update offset over content
203
+			$offset += $length;
204
+		}
205
+		return $parts;
206
+	}
207 207
     
208
-    /**
209
-     * Get self with an element at the given index replaced by another.
210
-     *
211
-     * @param int $idx Element index
212
-     * @param Element $el New element to insert into the structure
213
-     * @throws \OutOfBoundsException
214
-     * @return self
215
-     */
216
-    public function withReplaced(int $idx, Element $el): self
217
-    {
218
-        if (!isset($this->_elements[$idx])) {
219
-            throw new \OutOfBoundsException(
220
-                "Structure doesn't have element at index $idx.");
221
-        }
222
-        $obj = clone $this;
223
-        $obj->_elements[$idx] = $el;
224
-        return $obj;
225
-    }
208
+	/**
209
+	 * Get self with an element at the given index replaced by another.
210
+	 *
211
+	 * @param int $idx Element index
212
+	 * @param Element $el New element to insert into the structure
213
+	 * @throws \OutOfBoundsException
214
+	 * @return self
215
+	 */
216
+	public function withReplaced(int $idx, Element $el): self
217
+	{
218
+		if (!isset($this->_elements[$idx])) {
219
+			throw new \OutOfBoundsException(
220
+				"Structure doesn't have element at index $idx.");
221
+		}
222
+		$obj = clone $this;
223
+		$obj->_elements[$idx] = $el;
224
+		return $obj;
225
+	}
226 226
     
227
-    /**
228
-     * Get self with an element inserted before the given index.
229
-     *
230
-     * @param int $idx Element index
231
-     * @param Element $el New element to insert into the structure
232
-     * @throws \OutOfBoundsException
233
-     * @return self
234
-     */
235
-    public function withInserted(int $idx, Element $el): self
236
-    {
237
-        if (count($this->_elements) < $idx || $idx < 0) {
238
-            throw new \OutOfBoundsException("Index $idx is out of bounds.");
239
-        }
240
-        $obj = clone $this;
241
-        array_splice($obj->_elements, $idx, 0, [$el]);
242
-        return $obj;
243
-    }
227
+	/**
228
+	 * Get self with an element inserted before the given index.
229
+	 *
230
+	 * @param int $idx Element index
231
+	 * @param Element $el New element to insert into the structure
232
+	 * @throws \OutOfBoundsException
233
+	 * @return self
234
+	 */
235
+	public function withInserted(int $idx, Element $el): self
236
+	{
237
+		if (count($this->_elements) < $idx || $idx < 0) {
238
+			throw new \OutOfBoundsException("Index $idx is out of bounds.");
239
+		}
240
+		$obj = clone $this;
241
+		array_splice($obj->_elements, $idx, 0, [$el]);
242
+		return $obj;
243
+	}
244 244
     
245
-    /**
246
-     * Get self with an element appended to the end.
247
-     *
248
-     * @param Element $el Element to insert into the structure
249
-     * @return self
250
-     */
251
-    public function withAppended(Element $el): self
252
-    {
253
-        $obj = clone $this;
254
-        array_push($obj->_elements, $el);
255
-        return $obj;
256
-    }
245
+	/**
246
+	 * Get self with an element appended to the end.
247
+	 *
248
+	 * @param Element $el Element to insert into the structure
249
+	 * @return self
250
+	 */
251
+	public function withAppended(Element $el): self
252
+	{
253
+		$obj = clone $this;
254
+		array_push($obj->_elements, $el);
255
+		return $obj;
256
+	}
257 257
     
258
-    /**
259
-     * Get self with an element prepended in the beginning.
260
-     *
261
-     * @param Element $el Element to insert into the structure
262
-     * @return self
263
-     */
264
-    public function withPrepended(Element $el): self
265
-    {
266
-        $obj = clone $this;
267
-        array_unshift($obj->_elements, $el);
268
-        return $obj;
269
-    }
258
+	/**
259
+	 * Get self with an element prepended in the beginning.
260
+	 *
261
+	 * @param Element $el Element to insert into the structure
262
+	 * @return self
263
+	 */
264
+	public function withPrepended(Element $el): self
265
+	{
266
+		$obj = clone $this;
267
+		array_unshift($obj->_elements, $el);
268
+		return $obj;
269
+	}
270 270
     
271
-    /**
272
-     * Get self with an element at the given index removed.
273
-     *
274
-     * @param int $idx Element index
275
-     * @throws \OutOfBoundsException
276
-     * @return self
277
-     */
278
-    public function withoutElement(int $idx): self
279
-    {
280
-        if (!isset($this->_elements[$idx])) {
281
-            throw new \OutOfBoundsException(
282
-                "Structure doesn't have element at index $idx.");
283
-        }
284
-        $obj = clone $this;
285
-        array_splice($obj->_elements, $idx, 1);
286
-        return $obj;
287
-    }
271
+	/**
272
+	 * Get self with an element at the given index removed.
273
+	 *
274
+	 * @param int $idx Element index
275
+	 * @throws \OutOfBoundsException
276
+	 * @return self
277
+	 */
278
+	public function withoutElement(int $idx): self
279
+	{
280
+		if (!isset($this->_elements[$idx])) {
281
+			throw new \OutOfBoundsException(
282
+				"Structure doesn't have element at index $idx.");
283
+		}
284
+		$obj = clone $this;
285
+		array_splice($obj->_elements, $idx, 1);
286
+		return $obj;
287
+	}
288 288
     
289
-    /**
290
-     * Get elements in the structure.
291
-     *
292
-     * @return UnspecifiedType[]
293
-     */
294
-    public function elements(): array
295
-    {
296
-        if (!isset($this->_unspecifiedTypes)) {
297
-            $this->_unspecifiedTypes = array_map(
298
-                function (Element $el) {
299
-                    return new UnspecifiedType($el);
300
-                }, $this->_elements);
301
-        }
302
-        return $this->_unspecifiedTypes;
303
-    }
289
+	/**
290
+	 * Get elements in the structure.
291
+	 *
292
+	 * @return UnspecifiedType[]
293
+	 */
294
+	public function elements(): array
295
+	{
296
+		if (!isset($this->_unspecifiedTypes)) {
297
+			$this->_unspecifiedTypes = array_map(
298
+				function (Element $el) {
299
+					return new UnspecifiedType($el);
300
+				}, $this->_elements);
301
+		}
302
+		return $this->_unspecifiedTypes;
303
+	}
304 304
     
305
-    /**
306
-     * Check whether the structure has an element at the given index, optionally
307
-     * satisfying given tag expectation.
308
-     *
309
-     * @param int $idx Index 0..n
310
-     * @param int|null $expectedTag Optional type tag expectation
311
-     * @return bool
312
-     */
313
-    public function has(int $idx, $expectedTag = null): bool
314
-    {
315
-        if (!isset($this->_elements[$idx])) {
316
-            return false;
317
-        }
318
-        if (isset($expectedTag)) {
319
-            if (!$this->_elements[$idx]->isType($expectedTag)) {
320
-                return false;
321
-            }
322
-        }
323
-        return true;
324
-    }
305
+	/**
306
+	 * Check whether the structure has an element at the given index, optionally
307
+	 * satisfying given tag expectation.
308
+	 *
309
+	 * @param int $idx Index 0..n
310
+	 * @param int|null $expectedTag Optional type tag expectation
311
+	 * @return bool
312
+	 */
313
+	public function has(int $idx, $expectedTag = null): bool
314
+	{
315
+		if (!isset($this->_elements[$idx])) {
316
+			return false;
317
+		}
318
+		if (isset($expectedTag)) {
319
+			if (!$this->_elements[$idx]->isType($expectedTag)) {
320
+				return false;
321
+			}
322
+		}
323
+		return true;
324
+	}
325 325
     
326
-    /**
327
-     * Get the element at the given index, optionally checking that the element
328
-     * has a given tag.
329
-     *
330
-     * <strong>NOTE!</strong> Expectation checking is deprecated and should be
331
-     * done with <code>UnspecifiedType</code>.
332
-     *
333
-     * @param int $idx Index 0..n
334
-     * @param int|null $expectedTag Optional type tag expectation
335
-     * @throws \OutOfBoundsException If element doesn't exists
336
-     * @throws \UnexpectedValueException If expectation fails
337
-     * @return UnspecifiedType
338
-     */
339
-    public function at(int $idx, $expectedTag = null): UnspecifiedType
340
-    {
341
-        if (!isset($this->_elements[$idx])) {
342
-            throw new \OutOfBoundsException(
343
-                "Structure doesn't have an element at index $idx.");
344
-        }
345
-        $element = $this->_elements[$idx];
346
-        if (isset($expectedTag)) {
347
-            $element->expectType($expectedTag);
348
-        }
349
-        return new UnspecifiedType($element);
350
-    }
326
+	/**
327
+	 * Get the element at the given index, optionally checking that the element
328
+	 * has a given tag.
329
+	 *
330
+	 * <strong>NOTE!</strong> Expectation checking is deprecated and should be
331
+	 * done with <code>UnspecifiedType</code>.
332
+	 *
333
+	 * @param int $idx Index 0..n
334
+	 * @param int|null $expectedTag Optional type tag expectation
335
+	 * @throws \OutOfBoundsException If element doesn't exists
336
+	 * @throws \UnexpectedValueException If expectation fails
337
+	 * @return UnspecifiedType
338
+	 */
339
+	public function at(int $idx, $expectedTag = null): UnspecifiedType
340
+	{
341
+		if (!isset($this->_elements[$idx])) {
342
+			throw new \OutOfBoundsException(
343
+				"Structure doesn't have an element at index $idx.");
344
+		}
345
+		$element = $this->_elements[$idx];
346
+		if (isset($expectedTag)) {
347
+			$element->expectType($expectedTag);
348
+		}
349
+		return new UnspecifiedType($element);
350
+	}
351 351
     
352
-    /**
353
-     * Check whether the structure contains a context specific element with a
354
-     * given tag.
355
-     *
356
-     * @param int $tag Tag number
357
-     * @return bool
358
-     */
359
-    public function hasTagged(int $tag): bool
360
-    {
361
-        // lazily build lookup map
362
-        if (!isset($this->_taggedMap)) {
363
-            $this->_taggedMap = [];
364
-            foreach ($this->_elements as $element) {
365
-                if ($element->isTagged()) {
366
-                    $this->_taggedMap[$element->tag()] = $element;
367
-                }
368
-            }
369
-        }
370
-        return isset($this->_taggedMap[$tag]);
371
-    }
352
+	/**
353
+	 * Check whether the structure contains a context specific element with a
354
+	 * given tag.
355
+	 *
356
+	 * @param int $tag Tag number
357
+	 * @return bool
358
+	 */
359
+	public function hasTagged(int $tag): bool
360
+	{
361
+		// lazily build lookup map
362
+		if (!isset($this->_taggedMap)) {
363
+			$this->_taggedMap = [];
364
+			foreach ($this->_elements as $element) {
365
+				if ($element->isTagged()) {
366
+					$this->_taggedMap[$element->tag()] = $element;
367
+				}
368
+			}
369
+		}
370
+		return isset($this->_taggedMap[$tag]);
371
+	}
372 372
     
373
-    /**
374
-     * Get a context specific element tagged with a given tag.
375
-     *
376
-     * @param int $tag
377
-     * @throws \LogicException If tag doesn't exists
378
-     * @return TaggedType
379
-     */
380
-    public function getTagged(int $tag): TaggedType
381
-    {
382
-        if (!$this->hasTagged($tag)) {
383
-            throw new \LogicException("No tagged element for tag $tag.");
384
-        }
385
-        return $this->_taggedMap[$tag];
386
-    }
373
+	/**
374
+	 * Get a context specific element tagged with a given tag.
375
+	 *
376
+	 * @param int $tag
377
+	 * @throws \LogicException If tag doesn't exists
378
+	 * @return TaggedType
379
+	 */
380
+	public function getTagged(int $tag): TaggedType
381
+	{
382
+		if (!$this->hasTagged($tag)) {
383
+			throw new \LogicException("No tagged element for tag $tag.");
384
+		}
385
+		return $this->_taggedMap[$tag];
386
+	}
387 387
     
388
-    /**
389
-     *
390
-     * @see \Countable::count()
391
-     * @return int
392
-     */
393
-    public function count(): int
394
-    {
395
-        return count($this->_elements);
396
-    }
388
+	/**
389
+	 *
390
+	 * @see \Countable::count()
391
+	 * @return int
392
+	 */
393
+	public function count(): int
394
+	{
395
+		return count($this->_elements);
396
+	}
397 397
     
398
-    /**
399
-     * Get an iterator for the UnspecifiedElement objects.
400
-     *
401
-     * @see \IteratorAggregate::getIterator()
402
-     * @return \ArrayIterator
403
-     */
404
-    public function getIterator(): \ArrayIterator
405
-    {
406
-        return new \ArrayIterator($this->elements());
407
-    }
398
+	/**
399
+	 * Get an iterator for the UnspecifiedElement objects.
400
+	 *
401
+	 * @see \IteratorAggregate::getIterator()
402
+	 * @return \ArrayIterator
403
+	 */
404
+	public function getIterator(): \ArrayIterator
405
+	{
406
+		return new \ArrayIterator($this->elements());
407
+	}
408 408
 }
Please login to merge, or discard this patch.
lib/ASN1/Type/Primitive/EOC.php 2 patches
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -16,41 +16,41 @@
 block discarded – undo
16 16
  */
17 17
 class EOC extends Element
18 18
 {
19
-    use UniversalClass;
20
-    use PrimitiveType;
19
+	use UniversalClass;
20
+	use PrimitiveType;
21 21
     
22
-    /**
23
-     * Constructor.
24
-     */
25
-    public function __construct()
26
-    {
27
-        $this->_typeTag = self::TYPE_EOC;
28
-    }
22
+	/**
23
+	 * Constructor.
24
+	 */
25
+	public function __construct()
26
+	{
27
+		$this->_typeTag = self::TYPE_EOC;
28
+	}
29 29
     
30
-    /**
31
-     *
32
-     * {@inheritdoc}
33
-     */
34
-    protected function _encodedContentDER(): string
35
-    {
36
-        return '';
37
-    }
30
+	/**
31
+	 *
32
+	 * {@inheritdoc}
33
+	 */
34
+	protected function _encodedContentDER(): string
35
+	{
36
+		return '';
37
+	}
38 38
     
39
-    /**
40
-     *
41
-     * {@inheritdoc}
42
-     * @return self
43
-     */
44
-    protected static function _decodeFromDER(Identifier $identifier,
45
-        string $data, int &$offset): ElementBase
46
-    {
47
-        $idx = $offset;
48
-        if (!$identifier->isPrimitive()) {
49
-            throw new DecodeException("EOC value must be primitive.");
50
-        }
51
-        // EOC type has always zero length
52
-        Length::expectFromDER($data, $idx, 0);
53
-        $offset = $idx;
54
-        return new self();
55
-    }
39
+	/**
40
+	 *
41
+	 * {@inheritdoc}
42
+	 * @return self
43
+	 */
44
+	protected static function _decodeFromDER(Identifier $identifier,
45
+		string $data, int &$offset): ElementBase
46
+	{
47
+		$idx = $offset;
48
+		if (!$identifier->isPrimitive()) {
49
+			throw new DecodeException("EOC value must be primitive.");
50
+		}
51
+		// EOC type has always zero length
52
+		Length::expectFromDER($data, $idx, 0);
53
+		$offset = $idx;
54
+		return new self();
55
+	}
56 56
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types = 1);
3
+declare(strict_types=1);
4 4
 
5 5
 namespace ASN1\Type\Primitive;
6 6
 
Please login to merge, or discard this patch.
lib/ASN1/Type/Tagged/DERTaggedType.php 1 patch
Indentation   +138 added lines, -138 removed lines patch added patch discarded remove patch
@@ -21,154 +21,154 @@
 block discarded – undo
21 21
  * May be encoded back to complete DER encoding.
22 22
  */
23 23
 class DERTaggedType extends TaggedType implements 
24
-    ExplicitTagging,
25
-    ImplicitTagging
24
+	ExplicitTagging,
25
+	ImplicitTagging
26 26
 {
27
-    /**
28
-     * Identifier.
29
-     *
30
-     * @var Identifier
31
-     */
32
-    private $_identifier;
27
+	/**
28
+	 * Identifier.
29
+	 *
30
+	 * @var Identifier
31
+	 */
32
+	private $_identifier;
33 33
     
34
-    /**
35
-     * DER data.
36
-     *
37
-     * @var string
38
-     */
39
-    private $_data;
34
+	/**
35
+	 * DER data.
36
+	 *
37
+	 * @var string
38
+	 */
39
+	private $_data;
40 40
     
41
-    /**
42
-     * Offset to next byte after identifier.
43
-     *
44
-     * @var int
45
-     */
46
-    private $_offset;
41
+	/**
42
+	 * Offset to next byte after identifier.
43
+	 *
44
+	 * @var int
45
+	 */
46
+	private $_offset;
47 47
     
48
-    /**
49
-     * Offset to content.
50
-     *
51
-     * @var int
52
-     */
53
-    private $_valueOffset;
48
+	/**
49
+	 * Offset to content.
50
+	 *
51
+	 * @var int
52
+	 */
53
+	private $_valueOffset;
54 54
     
55
-    /**
56
-     * Length of the content.
57
-     *
58
-     * @var int
59
-     */
60
-    private $_valueLength;
55
+	/**
56
+	 * Length of the content.
57
+	 *
58
+	 * @var int
59
+	 */
60
+	private $_valueLength;
61 61
     
62
-    /**
63
-     * Constructor.
64
-     *
65
-     * @param Identifier $identifier Pre-parsed identifier
66
-     * @param string $data DER data
67
-     * @param int $offset Offset to next byte after identifier
68
-     * @param int $value_offset Offset to content
69
-     * @param int $value_length Content length
70
-     */
71
-    public function __construct(Identifier $identifier, string $data,
72
-        int $offset, int $value_offset, int $value_length,
73
-        bool $indefinite_length)
74
-    {
75
-        $this->_identifier = $identifier;
76
-        $this->_data = $data;
77
-        $this->_offset = $offset;
78
-        $this->_valueOffset = $value_offset;
79
-        $this->_valueLength = $value_length;
80
-        $this->_indefiniteLength = $indefinite_length;
81
-        $this->_typeTag = $identifier->intTag();
82
-    }
62
+	/**
63
+	 * Constructor.
64
+	 *
65
+	 * @param Identifier $identifier Pre-parsed identifier
66
+	 * @param string $data DER data
67
+	 * @param int $offset Offset to next byte after identifier
68
+	 * @param int $value_offset Offset to content
69
+	 * @param int $value_length Content length
70
+	 */
71
+	public function __construct(Identifier $identifier, string $data,
72
+		int $offset, int $value_offset, int $value_length,
73
+		bool $indefinite_length)
74
+	{
75
+		$this->_identifier = $identifier;
76
+		$this->_data = $data;
77
+		$this->_offset = $offset;
78
+		$this->_valueOffset = $value_offset;
79
+		$this->_valueLength = $value_length;
80
+		$this->_indefiniteLength = $indefinite_length;
81
+		$this->_typeTag = $identifier->intTag();
82
+	}
83 83
     
84
-    /**
85
-     *
86
-     * {@inheritdoc}
87
-     */
88
-    protected static function _decodeFromDER(Identifier $identifier,
89
-        string $data, int &$offset): ElementBase
90
-    {
91
-        $idx = $offset;
92
-        $length = Length::expectFromDER($data, $idx);
93
-        // offset to inner value
94
-        $value_offset = $idx;
95
-        if ($length->isIndefinite()) {
96
-            if ($identifier->isPrimitive()) {
97
-                throw new DecodeException(
98
-                    'Primitive type with indefinite length is not supported.');
99
-            }
100
-            while (!Element::fromDER($data, $idx)->isType(self::TYPE_EOC));
101
-            // EOC consists of two octets.
102
-            $value_length = $idx - $value_offset - 2;
103
-        } else {
104
-            $value_length = $length->intLength();
105
-            $idx += $value_length;
106
-        }
107
-        // late static binding since ApplicationType and PrivateType extend this class
108
-        $type = new static($identifier, $data, $offset, $value_offset,
109
-            $value_length, $length->isIndefinite());
110
-        $offset = $idx;
111
-        return $type;
112
-    }
84
+	/**
85
+	 *
86
+	 * {@inheritdoc}
87
+	 */
88
+	protected static function _decodeFromDER(Identifier $identifier,
89
+		string $data, int &$offset): ElementBase
90
+	{
91
+		$idx = $offset;
92
+		$length = Length::expectFromDER($data, $idx);
93
+		// offset to inner value
94
+		$value_offset = $idx;
95
+		if ($length->isIndefinite()) {
96
+			if ($identifier->isPrimitive()) {
97
+				throw new DecodeException(
98
+					'Primitive type with indefinite length is not supported.');
99
+			}
100
+			while (!Element::fromDER($data, $idx)->isType(self::TYPE_EOC));
101
+			// EOC consists of two octets.
102
+			$value_length = $idx - $value_offset - 2;
103
+		} else {
104
+			$value_length = $length->intLength();
105
+			$idx += $value_length;
106
+		}
107
+		// late static binding since ApplicationType and PrivateType extend this class
108
+		$type = new static($identifier, $data, $offset, $value_offset,
109
+			$value_length, $length->isIndefinite());
110
+		$offset = $idx;
111
+		return $type;
112
+	}
113 113
     
114
-    /**
115
-     *
116
-     * @see \ASN1\Element::typeClass()
117
-     * @return int
118
-     */
119
-    public function typeClass(): int
120
-    {
121
-        return $this->_identifier->typeClass();
122
-    }
114
+	/**
115
+	 *
116
+	 * @see \ASN1\Element::typeClass()
117
+	 * @return int
118
+	 */
119
+	public function typeClass(): int
120
+	{
121
+		return $this->_identifier->typeClass();
122
+	}
123 123
     
124
-    /**
125
-     *
126
-     * @see \ASN1\Element::isConstructed()
127
-     * @return bool
128
-     */
129
-    public function isConstructed(): bool
130
-    {
131
-        return $this->_identifier->isConstructed();
132
-    }
124
+	/**
125
+	 *
126
+	 * @see \ASN1\Element::isConstructed()
127
+	 * @return bool
128
+	 */
129
+	public function isConstructed(): bool
130
+	{
131
+		return $this->_identifier->isConstructed();
132
+	}
133 133
     
134
-    /**
135
-     *
136
-     * @see \ASN1\Element::_encodedContentDER()
137
-     * @return string
138
-     */
139
-    protected function _encodedContentDER(): string
140
-    {
141
-        return substr($this->_data, $this->_valueOffset, $this->_valueLength);
142
-    }
134
+	/**
135
+	 *
136
+	 * @see \ASN1\Element::_encodedContentDER()
137
+	 * @return string
138
+	 */
139
+	protected function _encodedContentDER(): string
140
+	{
141
+		return substr($this->_data, $this->_valueOffset, $this->_valueLength);
142
+	}
143 143
     
144
-    /**
145
-     *
146
-     * {@inheritdoc}
147
-     * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
148
-     * @return UnspecifiedType
149
-     */
150
-    public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
151
-    {
152
-        $identifier = $this->_identifier->withClass($class)->withTag($tag);
153
-        $cls = self::_determineImplClass($identifier);
154
-        $idx = $this->_offset;
155
-        /** @var \ASN1\Feature\ElementBase $element */
156
-        $element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
157
-        return $element->asUnspecified();
158
-    }
144
+	/**
145
+	 *
146
+	 * {@inheritdoc}
147
+	 * @see \ASN1\Type\Tagged\ImplicitTagging::implicit()
148
+	 * @return UnspecifiedType
149
+	 */
150
+	public function implicit(int $tag, int $class = Identifier::CLASS_UNIVERSAL): UnspecifiedType
151
+	{
152
+		$identifier = $this->_identifier->withClass($class)->withTag($tag);
153
+		$cls = self::_determineImplClass($identifier);
154
+		$idx = $this->_offset;
155
+		/** @var \ASN1\Feature\ElementBase $element */
156
+		$element = $cls::_decodeFromDER($identifier, $this->_data, $idx);
157
+		return $element->asUnspecified();
158
+	}
159 159
     
160
-    /**
161
-     *
162
-     * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
163
-     * @return UnspecifiedType
164
-     */
165
-    public function explicit($expectedTag = null): UnspecifiedType
166
-    {
167
-        $idx = $this->_valueOffset;
168
-        $element = Element::fromDER($this->_data, $idx);
169
-        if (isset($expectedTag)) {
170
-            $element->expectType($expectedTag);
171
-        }
172
-        return $element->asUnspecified();
173
-    }
160
+	/**
161
+	 *
162
+	 * @see \ASN1\Type\Tagged\ExplicitTagging::explicit()
163
+	 * @return UnspecifiedType
164
+	 */
165
+	public function explicit($expectedTag = null): UnspecifiedType
166
+	{
167
+		$idx = $this->_valueOffset;
168
+		$element = Element::fromDER($this->_data, $idx);
169
+		if (isset($expectedTag)) {
170
+			$element->expectType($expectedTag);
171
+		}
172
+		return $element->asUnspecified();
173
+	}
174 174
 }
Please login to merge, or discard this patch.
lib/ASN1/Element.php 3 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-declare(strict_types = 1);
2
+declare(strict_types=1);
3 3
 
4 4
 namespace ASN1;
5 5
 
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
      *
60 60
      * @var array
61 61
      */
62
-    const MAP_TAG_TO_CLASS = [ /* @formatter:off */
62
+    const MAP_TAG_TO_CLASS = [/* @formatter:off */
63 63
         self::TYPE_EOC => Primitive\EOC::class,
64 64
         self::TYPE_BOOLEAN => Primitive\Boolean::class,
65 65
         self::TYPE_INTEGER => Primitive\Integer::class,
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
      *
116 116
      * @var array
117 117
      */
118
-    const MAP_TYPE_TO_NAME = [ /* @formatter:off */
118
+    const MAP_TYPE_TO_NAME = [/* @formatter:off */
119 119
         self::TYPE_EOC => "EOC",
120 120
         self::TYPE_BOOLEAN => "BOOLEAN",
121 121
         self::TYPE_INTEGER => "INTEGER",
Please login to merge, or discard this patch.
Indentation   +446 added lines, -446 removed lines patch added patch discarded remove patch
@@ -22,477 +22,477 @@
 block discarded – undo
22 22
  */
23 23
 abstract class Element implements ElementBase
24 24
 {
25
-    // Universal type tags
26
-    const TYPE_EOC = 0x00;
27
-    const TYPE_BOOLEAN = 0x01;
28
-    const TYPE_INTEGER = 0x02;
29
-    const TYPE_BIT_STRING = 0x03;
30
-    const TYPE_OCTET_STRING = 0x04;
31
-    const TYPE_NULL = 0x05;
32
-    const TYPE_OBJECT_IDENTIFIER = 0x06;
33
-    const TYPE_OBJECT_DESCRIPTOR = 0x07;
34
-    const TYPE_EXTERNAL = 0x08;
35
-    const TYPE_REAL = 0x09;
36
-    const TYPE_ENUMERATED = 0x0a;
37
-    const TYPE_EMBEDDED_PDV = 0x0b;
38
-    const TYPE_UTF8_STRING = 0x0c;
39
-    const TYPE_RELATIVE_OID = 0x0d;
40
-    const TYPE_SEQUENCE = 0x10;
41
-    const TYPE_SET = 0x11;
42
-    const TYPE_NUMERIC_STRING = 0x12;
43
-    const TYPE_PRINTABLE_STRING = 0x13;
44
-    const TYPE_T61_STRING = 0x14;
45
-    const TYPE_VIDEOTEX_STRING = 0x15;
46
-    const TYPE_IA5_STRING = 0x16;
47
-    const TYPE_UTC_TIME = 0x17;
48
-    const TYPE_GENERALIZED_TIME = 0x18;
49
-    const TYPE_GRAPHIC_STRING = 0x19;
50
-    const TYPE_VISIBLE_STRING = 0x1a;
51
-    const TYPE_GENERAL_STRING = 0x1b;
52
-    const TYPE_UNIVERSAL_STRING = 0x1c;
53
-    const TYPE_CHARACTER_STRING = 0x1d;
54
-    const TYPE_BMP_STRING = 0x1e;
25
+	// Universal type tags
26
+	const TYPE_EOC = 0x00;
27
+	const TYPE_BOOLEAN = 0x01;
28
+	const TYPE_INTEGER = 0x02;
29
+	const TYPE_BIT_STRING = 0x03;
30
+	const TYPE_OCTET_STRING = 0x04;
31
+	const TYPE_NULL = 0x05;
32
+	const TYPE_OBJECT_IDENTIFIER = 0x06;
33
+	const TYPE_OBJECT_DESCRIPTOR = 0x07;
34
+	const TYPE_EXTERNAL = 0x08;
35
+	const TYPE_REAL = 0x09;
36
+	const TYPE_ENUMERATED = 0x0a;
37
+	const TYPE_EMBEDDED_PDV = 0x0b;
38
+	const TYPE_UTF8_STRING = 0x0c;
39
+	const TYPE_RELATIVE_OID = 0x0d;
40
+	const TYPE_SEQUENCE = 0x10;
41
+	const TYPE_SET = 0x11;
42
+	const TYPE_NUMERIC_STRING = 0x12;
43
+	const TYPE_PRINTABLE_STRING = 0x13;
44
+	const TYPE_T61_STRING = 0x14;
45
+	const TYPE_VIDEOTEX_STRING = 0x15;
46
+	const TYPE_IA5_STRING = 0x16;
47
+	const TYPE_UTC_TIME = 0x17;
48
+	const TYPE_GENERALIZED_TIME = 0x18;
49
+	const TYPE_GRAPHIC_STRING = 0x19;
50
+	const TYPE_VISIBLE_STRING = 0x1a;
51
+	const TYPE_GENERAL_STRING = 0x1b;
52
+	const TYPE_UNIVERSAL_STRING = 0x1c;
53
+	const TYPE_CHARACTER_STRING = 0x1d;
54
+	const TYPE_BMP_STRING = 0x1e;
55 55
     
56
-    /**
57
-     * Mapping from universal type tag to implementation class name.
58
-     *
59
-     * @internal
60
-     *
61
-     * @var array
62
-     */
63
-    const MAP_TAG_TO_CLASS = [ /* @formatter:off */
64
-        self::TYPE_EOC => Primitive\EOC::class,
65
-        self::TYPE_BOOLEAN => Primitive\Boolean::class,
66
-        self::TYPE_INTEGER => Primitive\Integer::class,
67
-        self::TYPE_BIT_STRING => Primitive\BitString::class,
68
-        self::TYPE_OCTET_STRING => Primitive\OctetString::class,
69
-        self::TYPE_NULL => Primitive\NullType::class,
70
-        self::TYPE_OBJECT_IDENTIFIER => Primitive\ObjectIdentifier::class,
71
-        self::TYPE_OBJECT_DESCRIPTOR => Primitive\ObjectDescriptor::class,
72
-        self::TYPE_REAL => Primitive\Real::class,
73
-        self::TYPE_ENUMERATED => Primitive\Enumerated::class,
74
-        self::TYPE_UTF8_STRING => Primitive\UTF8String::class,
75
-        self::TYPE_RELATIVE_OID => Primitive\RelativeOID::class,
76
-        self::TYPE_SEQUENCE => Constructed\Sequence::class,
77
-        self::TYPE_SET => Constructed\Set::class,
78
-        self::TYPE_NUMERIC_STRING => Primitive\NumericString::class,
79
-        self::TYPE_PRINTABLE_STRING => Primitive\PrintableString::class,
80
-        self::TYPE_T61_STRING => Primitive\T61String::class,
81
-        self::TYPE_VIDEOTEX_STRING => Primitive\VideotexString::class,
82
-        self::TYPE_IA5_STRING => Primitive\IA5String::class,
83
-        self::TYPE_UTC_TIME => Primitive\UTCTime::class,
84
-        self::TYPE_GENERALIZED_TIME => Primitive\GeneralizedTime::class,
85
-        self::TYPE_GRAPHIC_STRING => Primitive\GraphicString::class,
86
-        self::TYPE_VISIBLE_STRING => Primitive\VisibleString::class,
87
-        self::TYPE_GENERAL_STRING => Primitive\GeneralString::class,
88
-        self::TYPE_UNIVERSAL_STRING => Primitive\UniversalString::class,
89
-        self::TYPE_CHARACTER_STRING => Primitive\CharacterString::class,
90
-        self::TYPE_BMP_STRING => Primitive\BMPString::class
91
-        /* @formatter:on */
92
-    ];
56
+	/**
57
+	 * Mapping from universal type tag to implementation class name.
58
+	 *
59
+	 * @internal
60
+	 *
61
+	 * @var array
62
+	 */
63
+	const MAP_TAG_TO_CLASS = [ /* @formatter:off */
64
+		self::TYPE_EOC => Primitive\EOC::class,
65
+		self::TYPE_BOOLEAN => Primitive\Boolean::class,
66
+		self::TYPE_INTEGER => Primitive\Integer::class,
67
+		self::TYPE_BIT_STRING => Primitive\BitString::class,
68
+		self::TYPE_OCTET_STRING => Primitive\OctetString::class,
69
+		self::TYPE_NULL => Primitive\NullType::class,
70
+		self::TYPE_OBJECT_IDENTIFIER => Primitive\ObjectIdentifier::class,
71
+		self::TYPE_OBJECT_DESCRIPTOR => Primitive\ObjectDescriptor::class,
72
+		self::TYPE_REAL => Primitive\Real::class,
73
+		self::TYPE_ENUMERATED => Primitive\Enumerated::class,
74
+		self::TYPE_UTF8_STRING => Primitive\UTF8String::class,
75
+		self::TYPE_RELATIVE_OID => Primitive\RelativeOID::class,
76
+		self::TYPE_SEQUENCE => Constructed\Sequence::class,
77
+		self::TYPE_SET => Constructed\Set::class,
78
+		self::TYPE_NUMERIC_STRING => Primitive\NumericString::class,
79
+		self::TYPE_PRINTABLE_STRING => Primitive\PrintableString::class,
80
+		self::TYPE_T61_STRING => Primitive\T61String::class,
81
+		self::TYPE_VIDEOTEX_STRING => Primitive\VideotexString::class,
82
+		self::TYPE_IA5_STRING => Primitive\IA5String::class,
83
+		self::TYPE_UTC_TIME => Primitive\UTCTime::class,
84
+		self::TYPE_GENERALIZED_TIME => Primitive\GeneralizedTime::class,
85
+		self::TYPE_GRAPHIC_STRING => Primitive\GraphicString::class,
86
+		self::TYPE_VISIBLE_STRING => Primitive\VisibleString::class,
87
+		self::TYPE_GENERAL_STRING => Primitive\GeneralString::class,
88
+		self::TYPE_UNIVERSAL_STRING => Primitive\UniversalString::class,
89
+		self::TYPE_CHARACTER_STRING => Primitive\CharacterString::class,
90
+		self::TYPE_BMP_STRING => Primitive\BMPString::class
91
+		/* @formatter:on */
92
+	];
93 93
     
94
-    /**
95
-     * Pseudotype for all string types.
96
-     *
97
-     * May be used as an expectation parameter.
98
-     *
99
-     * @var int
100
-     */
101
-    const TYPE_STRING = -1;
94
+	/**
95
+	 * Pseudotype for all string types.
96
+	 *
97
+	 * May be used as an expectation parameter.
98
+	 *
99
+	 * @var int
100
+	 */
101
+	const TYPE_STRING = -1;
102 102
     
103
-    /**
104
-     * Pseudotype for all time types.
105
-     *
106
-     * May be used as an expectation parameter.
107
-     *
108
-     * @var int
109
-     */
110
-    const TYPE_TIME = -2;
103
+	/**
104
+	 * Pseudotype for all time types.
105
+	 *
106
+	 * May be used as an expectation parameter.
107
+	 *
108
+	 * @var int
109
+	 */
110
+	const TYPE_TIME = -2;
111 111
     
112
-    /**
113
-     * Mapping from universal type tag to human readable name.
114
-     *
115
-     * @internal
116
-     *
117
-     * @var array
118
-     */
119
-    const MAP_TYPE_TO_NAME = [ /* @formatter:off */
120
-        self::TYPE_EOC => "EOC",
121
-        self::TYPE_BOOLEAN => "BOOLEAN",
122
-        self::TYPE_INTEGER => "INTEGER",
123
-        self::TYPE_BIT_STRING => "BIT STRING",
124
-        self::TYPE_OCTET_STRING => "OCTET STRING",
125
-        self::TYPE_NULL => "NULL",
126
-        self::TYPE_OBJECT_IDENTIFIER => "OBJECT IDENTIFIER",
127
-        self::TYPE_OBJECT_DESCRIPTOR => "ObjectDescriptor",
128
-        self::TYPE_EXTERNAL => "EXTERNAL",
129
-        self::TYPE_REAL => "REAL",
130
-        self::TYPE_ENUMERATED => "ENUMERATED",
131
-        self::TYPE_EMBEDDED_PDV => "EMBEDDED PDV",
132
-        self::TYPE_UTF8_STRING => "UTF8String",
133
-        self::TYPE_RELATIVE_OID => "RELATIVE-OID",
134
-        self::TYPE_SEQUENCE => "SEQUENCE",
135
-        self::TYPE_SET => "SET",
136
-        self::TYPE_NUMERIC_STRING => "NumericString",
137
-        self::TYPE_PRINTABLE_STRING => "PrintableString",
138
-        self::TYPE_T61_STRING => "T61String",
139
-        self::TYPE_VIDEOTEX_STRING => "VideotexString",
140
-        self::TYPE_IA5_STRING => "IA5String",
141
-        self::TYPE_UTC_TIME => "UTCTime",
142
-        self::TYPE_GENERALIZED_TIME => "GeneralizedTime",
143
-        self::TYPE_GRAPHIC_STRING => "GraphicString",
144
-        self::TYPE_VISIBLE_STRING => "VisibleString",
145
-        self::TYPE_GENERAL_STRING => "GeneralString",
146
-        self::TYPE_UNIVERSAL_STRING => "UniversalString",
147
-        self::TYPE_CHARACTER_STRING => "CHARACTER STRING",
148
-        self::TYPE_BMP_STRING => "BMPString",
149
-        self::TYPE_STRING => "Any String",
150
-        self::TYPE_TIME => "Any Time"
151
-        /* @formatter:on */
152
-    ];
112
+	/**
113
+	 * Mapping from universal type tag to human readable name.
114
+	 *
115
+	 * @internal
116
+	 *
117
+	 * @var array
118
+	 */
119
+	const MAP_TYPE_TO_NAME = [ /* @formatter:off */
120
+		self::TYPE_EOC => "EOC",
121
+		self::TYPE_BOOLEAN => "BOOLEAN",
122
+		self::TYPE_INTEGER => "INTEGER",
123
+		self::TYPE_BIT_STRING => "BIT STRING",
124
+		self::TYPE_OCTET_STRING => "OCTET STRING",
125
+		self::TYPE_NULL => "NULL",
126
+		self::TYPE_OBJECT_IDENTIFIER => "OBJECT IDENTIFIER",
127
+		self::TYPE_OBJECT_DESCRIPTOR => "ObjectDescriptor",
128
+		self::TYPE_EXTERNAL => "EXTERNAL",
129
+		self::TYPE_REAL => "REAL",
130
+		self::TYPE_ENUMERATED => "ENUMERATED",
131
+		self::TYPE_EMBEDDED_PDV => "EMBEDDED PDV",
132
+		self::TYPE_UTF8_STRING => "UTF8String",
133
+		self::TYPE_RELATIVE_OID => "RELATIVE-OID",
134
+		self::TYPE_SEQUENCE => "SEQUENCE",
135
+		self::TYPE_SET => "SET",
136
+		self::TYPE_NUMERIC_STRING => "NumericString",
137
+		self::TYPE_PRINTABLE_STRING => "PrintableString",
138
+		self::TYPE_T61_STRING => "T61String",
139
+		self::TYPE_VIDEOTEX_STRING => "VideotexString",
140
+		self::TYPE_IA5_STRING => "IA5String",
141
+		self::TYPE_UTC_TIME => "UTCTime",
142
+		self::TYPE_GENERALIZED_TIME => "GeneralizedTime",
143
+		self::TYPE_GRAPHIC_STRING => "GraphicString",
144
+		self::TYPE_VISIBLE_STRING => "VisibleString",
145
+		self::TYPE_GENERAL_STRING => "GeneralString",
146
+		self::TYPE_UNIVERSAL_STRING => "UniversalString",
147
+		self::TYPE_CHARACTER_STRING => "CHARACTER STRING",
148
+		self::TYPE_BMP_STRING => "BMPString",
149
+		self::TYPE_STRING => "Any String",
150
+		self::TYPE_TIME => "Any Time"
151
+		/* @formatter:on */
152
+	];
153 153
     
154
-    /**
155
-     * Element's type tag.
156
-     *
157
-     * @var int
158
-     */
159
-    protected $_typeTag;
154
+	/**
155
+	 * Element's type tag.
156
+	 *
157
+	 * @var int
158
+	 */
159
+	protected $_typeTag;
160 160
     
161
-    /**
162
-     * Whether type shall be encoded with indefinite length.
163
-     *
164
-     * @var bool
165
-     */
166
-    protected $_indefiniteLength = false;
161
+	/**
162
+	 * Whether type shall be encoded with indefinite length.
163
+	 *
164
+	 * @var bool
165
+	 */
166
+	protected $_indefiniteLength = false;
167 167
     
168
-    /**
169
-     *
170
-     * @see \ASN1\Feature\ElementBase::typeClass()
171
-     * @return int
172
-     */
173
-    abstract public function typeClass(): int;
168
+	/**
169
+	 *
170
+	 * @see \ASN1\Feature\ElementBase::typeClass()
171
+	 * @return int
172
+	 */
173
+	abstract public function typeClass(): int;
174 174
     
175
-    /**
176
-     *
177
-     * @see \ASN1\Feature\ElementBase::isConstructed()
178
-     * @return bool
179
-     */
180
-    abstract public function isConstructed(): bool;
175
+	/**
176
+	 *
177
+	 * @see \ASN1\Feature\ElementBase::isConstructed()
178
+	 * @return bool
179
+	 */
180
+	abstract public function isConstructed(): bool;
181 181
     
182
-    /**
183
-     * Get the content encoded in DER.
184
-     *
185
-     * Returns the DER encoded content without identifier and length header
186
-     * octets.
187
-     *
188
-     * @return string
189
-     */
190
-    abstract protected function _encodedContentDER(): string;
182
+	/**
183
+	 * Get the content encoded in DER.
184
+	 *
185
+	 * Returns the DER encoded content without identifier and length header
186
+	 * octets.
187
+	 *
188
+	 * @return string
189
+	 */
190
+	abstract protected function _encodedContentDER(): string;
191 191
     
192
-    /**
193
-     * Decode type-specific element from DER.
194
-     *
195
-     * @param Identifier $identifier Pre-parsed identifier
196
-     * @param string $data DER data
197
-     * @param int $offset Offset in data to the next byte after identifier
198
-     * @throws DecodeException If decoding fails
199
-     * @return ElementBase
200
-     */
201
-    protected static function _decodeFromDER(Identifier $identifier,
202
-        string $data, int &$offset): ElementBase
203
-    {
204
-        throw new \BadMethodCallException(
205
-            __METHOD__ . " must be implemented in derived class.");
206
-    }
192
+	/**
193
+	 * Decode type-specific element from DER.
194
+	 *
195
+	 * @param Identifier $identifier Pre-parsed identifier
196
+	 * @param string $data DER data
197
+	 * @param int $offset Offset in data to the next byte after identifier
198
+	 * @throws DecodeException If decoding fails
199
+	 * @return ElementBase
200
+	 */
201
+	protected static function _decodeFromDER(Identifier $identifier,
202
+		string $data, int &$offset): ElementBase
203
+	{
204
+		throw new \BadMethodCallException(
205
+			__METHOD__ . " must be implemented in derived class.");
206
+	}
207 207
     
208
-    /**
209
-     * Decode element from DER data.
210
-     *
211
-     * @param string $data DER encoded data
212
-     * @param int|null $offset Reference to the variable that contains offset
213
-     *        into the data where to start parsing. Variable is updated to
214
-     *        the offset next to the parsed element. If null, start from offset
215
-     *        0.
216
-     * @throws DecodeException If decoding fails
217
-     * @throws \UnexpectedValueException If called in the context of an expected
218
-     *         type, but decoding yields another type
219
-     * @return ElementBase
220
-     */
221
-    public static function fromDER(string $data, int &$offset = null): ElementBase
222
-    {
223
-        $idx = $offset ?? 0;
224
-        // decode identifier
225
-        $identifier = Identifier::fromDER($data, $idx);
226
-        // determine class that implements type specific decoding
227
-        $cls = self::_determineImplClass($identifier);
228
-        try {
229
-            // decode remaining element
230
-            $element = $cls::_decodeFromDER($identifier, $data, $idx);
231
-        } catch (\LogicException $e) {
232
-            // rethrow as a RuntimeException for unified exception handling
233
-            throw new DecodeException(
234
-                sprintf("Error while decoding %s.",
235
-                    self::tagToName($identifier->intTag())), 0, $e);
236
-        }
237
-        // if called in the context of a concrete class, check
238
-        // that decoded type matches the type of a calling class
239
-        $called_class = get_called_class();
240
-        if (self::class != $called_class) {
241
-            if (!$element instanceof $called_class) {
242
-                throw new \UnexpectedValueException(
243
-                    sprintf("%s expected, got %s.", $called_class,
244
-                        get_class($element)));
245
-            }
246
-        }
247
-        // update offset for the caller
248
-        if (isset($offset)) {
249
-            $offset = $idx;
250
-        }
251
-        return $element;
252
-    }
208
+	/**
209
+	 * Decode element from DER data.
210
+	 *
211
+	 * @param string $data DER encoded data
212
+	 * @param int|null $offset Reference to the variable that contains offset
213
+	 *        into the data where to start parsing. Variable is updated to
214
+	 *        the offset next to the parsed element. If null, start from offset
215
+	 *        0.
216
+	 * @throws DecodeException If decoding fails
217
+	 * @throws \UnexpectedValueException If called in the context of an expected
218
+	 *         type, but decoding yields another type
219
+	 * @return ElementBase
220
+	 */
221
+	public static function fromDER(string $data, int &$offset = null): ElementBase
222
+	{
223
+		$idx = $offset ?? 0;
224
+		// decode identifier
225
+		$identifier = Identifier::fromDER($data, $idx);
226
+		// determine class that implements type specific decoding
227
+		$cls = self::_determineImplClass($identifier);
228
+		try {
229
+			// decode remaining element
230
+			$element = $cls::_decodeFromDER($identifier, $data, $idx);
231
+		} catch (\LogicException $e) {
232
+			// rethrow as a RuntimeException for unified exception handling
233
+			throw new DecodeException(
234
+				sprintf("Error while decoding %s.",
235
+					self::tagToName($identifier->intTag())), 0, $e);
236
+		}
237
+		// if called in the context of a concrete class, check
238
+		// that decoded type matches the type of a calling class
239
+		$called_class = get_called_class();
240
+		if (self::class != $called_class) {
241
+			if (!$element instanceof $called_class) {
242
+				throw new \UnexpectedValueException(
243
+					sprintf("%s expected, got %s.", $called_class,
244
+						get_class($element)));
245
+			}
246
+		}
247
+		// update offset for the caller
248
+		if (isset($offset)) {
249
+			$offset = $idx;
250
+		}
251
+		return $element;
252
+	}
253 253
     
254
-    /**
255
-     *
256
-     * @see \ASN1\Feature\Encodable::toDER()
257
-     * @return string
258
-     */
259
-    public function toDER(): string
260
-    {
261
-        $identifier = new Identifier($this->typeClass(),
262
-            $this->isConstructed() ? Identifier::CONSTRUCTED : Identifier::PRIMITIVE,
263
-            $this->_typeTag);
264
-        $content = $this->_encodedContentDER();
265
-        if ($this->_indefiniteLength) {
266
-            $length = new Length(0, true);
267
-            $eoc = new Primitive\EOC();
268
-            return $identifier->toDER() . $length->toDER() . $content .
269
-                $eoc->toDER();
270
-        } else {
271
-            $length = new Length(strlen($content));
272
-            return $identifier->toDER() . $length->toDER() . $content;
273
-        }
274
-    }
254
+	/**
255
+	 *
256
+	 * @see \ASN1\Feature\Encodable::toDER()
257
+	 * @return string
258
+	 */
259
+	public function toDER(): string
260
+	{
261
+		$identifier = new Identifier($this->typeClass(),
262
+			$this->isConstructed() ? Identifier::CONSTRUCTED : Identifier::PRIMITIVE,
263
+			$this->_typeTag);
264
+		$content = $this->_encodedContentDER();
265
+		if ($this->_indefiniteLength) {
266
+			$length = new Length(0, true);
267
+			$eoc = new Primitive\EOC();
268
+			return $identifier->toDER() . $length->toDER() . $content .
269
+				$eoc->toDER();
270
+		} else {
271
+			$length = new Length(strlen($content));
272
+			return $identifier->toDER() . $length->toDER() . $content;
273
+		}
274
+	}
275 275
     
276
-    /**
277
-     *
278
-     * @see \ASN1\Feature\ElementBase::tag()
279
-     * @return int
280
-     */
281
-    public function tag(): int
282
-    {
283
-        return $this->_typeTag;
284
-    }
276
+	/**
277
+	 *
278
+	 * @see \ASN1\Feature\ElementBase::tag()
279
+	 * @return int
280
+	 */
281
+	public function tag(): int
282
+	{
283
+		return $this->_typeTag;
284
+	}
285 285
     
286
-    /**
287
-     *
288
-     * @see \ASN1\Feature\ElementBase::isType()
289
-     * @return bool
290
-     */
291
-    public function isType(int $tag): bool
292
-    {
293
-        // if element is context specific
294
-        if ($this->typeClass() == Identifier::CLASS_CONTEXT_SPECIFIC) {
295
-            return false;
296
-        }
297
-        // negative tags identify an abstract pseudotype
298
-        if ($tag < 0) {
299
-            return $this->_isPseudoType($tag);
300
-        }
301
-        return $this->_isConcreteType($tag);
302
-    }
286
+	/**
287
+	 *
288
+	 * @see \ASN1\Feature\ElementBase::isType()
289
+	 * @return bool
290
+	 */
291
+	public function isType(int $tag): bool
292
+	{
293
+		// if element is context specific
294
+		if ($this->typeClass() == Identifier::CLASS_CONTEXT_SPECIFIC) {
295
+			return false;
296
+		}
297
+		// negative tags identify an abstract pseudotype
298
+		if ($tag < 0) {
299
+			return $this->_isPseudoType($tag);
300
+		}
301
+		return $this->_isConcreteType($tag);
302
+	}
303 303
     
304
-    /**
305
-     *
306
-     * @see \ASN1\Feature\ElementBase::expectType()
307
-     * @return ElementBase
308
-     */
309
-    public function expectType(int $tag): ElementBase
310
-    {
311
-        if (!$this->isType($tag)) {
312
-            throw new \UnexpectedValueException(
313
-                sprintf("%s expected, got %s.", self::tagToName($tag),
314
-                    $this->_typeDescriptorString()));
315
-        }
316
-        return $this;
317
-    }
304
+	/**
305
+	 *
306
+	 * @see \ASN1\Feature\ElementBase::expectType()
307
+	 * @return ElementBase
308
+	 */
309
+	public function expectType(int $tag): ElementBase
310
+	{
311
+		if (!$this->isType($tag)) {
312
+			throw new \UnexpectedValueException(
313
+				sprintf("%s expected, got %s.", self::tagToName($tag),
314
+					$this->_typeDescriptorString()));
315
+		}
316
+		return $this;
317
+	}
318 318
     
319
-    /**
320
-     * Check whether the element is a concrete type of a given tag.
321
-     *
322
-     * @param int $tag
323
-     * @return bool
324
-     */
325
-    private function _isConcreteType(int $tag): bool
326
-    {
327
-        // if tag doesn't match
328
-        if ($this->tag() != $tag) {
329
-            return false;
330
-        }
331
-        // if type is universal check that instance is of a correct class
332
-        if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
333
-            $cls = self::_determineUniversalImplClass($tag);
334
-            if (!$this instanceof $cls) {
335
-                return false;
336
-            }
337
-        }
338
-        return true;
339
-    }
319
+	/**
320
+	 * Check whether the element is a concrete type of a given tag.
321
+	 *
322
+	 * @param int $tag
323
+	 * @return bool
324
+	 */
325
+	private function _isConcreteType(int $tag): bool
326
+	{
327
+		// if tag doesn't match
328
+		if ($this->tag() != $tag) {
329
+			return false;
330
+		}
331
+		// if type is universal check that instance is of a correct class
332
+		if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
333
+			$cls = self::_determineUniversalImplClass($tag);
334
+			if (!$this instanceof $cls) {
335
+				return false;
336
+			}
337
+		}
338
+		return true;
339
+	}
340 340
     
341
-    /**
342
-     * Check whether the element is a pseudotype.
343
-     *
344
-     * @param int $tag
345
-     * @return bool
346
-     */
347
-    private function _isPseudoType(int $tag): bool
348
-    {
349
-        switch ($tag) {
350
-            case self::TYPE_STRING:
351
-                return $this instanceof StringType;
352
-            case self::TYPE_TIME:
353
-                return $this instanceof TimeType;
354
-        }
355
-        return false;
356
-    }
341
+	/**
342
+	 * Check whether the element is a pseudotype.
343
+	 *
344
+	 * @param int $tag
345
+	 * @return bool
346
+	 */
347
+	private function _isPseudoType(int $tag): bool
348
+	{
349
+		switch ($tag) {
350
+			case self::TYPE_STRING:
351
+				return $this instanceof StringType;
352
+			case self::TYPE_TIME:
353
+				return $this instanceof TimeType;
354
+		}
355
+		return false;
356
+	}
357 357
     
358
-    /**
359
-     *
360
-     * @see \ASN1\Feature\ElementBase::isTagged()
361
-     * @return bool
362
-     */
363
-    public function isTagged(): bool
364
-    {
365
-        return $this instanceof TaggedType;
366
-    }
358
+	/**
359
+	 *
360
+	 * @see \ASN1\Feature\ElementBase::isTagged()
361
+	 * @return bool
362
+	 */
363
+	public function isTagged(): bool
364
+	{
365
+		return $this instanceof TaggedType;
366
+	}
367 367
     
368
-    /**
369
-     *
370
-     * @see \ASN1\Feature\ElementBase::expectTagged()
371
-     * @return TaggedType
372
-     */
373
-    public function expectTagged($tag = null): TaggedType
374
-    {
375
-        if (!$this->isTagged()) {
376
-            throw new \UnexpectedValueException(
377
-                sprintf("Context specific element expected, got %s.",
378
-                    Identifier::classToName($this->typeClass())));
379
-        }
380
-        if (isset($tag) && $this->tag() != $tag) {
381
-            throw new \UnexpectedValueException(
382
-                sprintf("Tag %d expected, got %d.", $tag, $this->tag()));
383
-        }
384
-        return $this;
385
-    }
368
+	/**
369
+	 *
370
+	 * @see \ASN1\Feature\ElementBase::expectTagged()
371
+	 * @return TaggedType
372
+	 */
373
+	public function expectTagged($tag = null): TaggedType
374
+	{
375
+		if (!$this->isTagged()) {
376
+			throw new \UnexpectedValueException(
377
+				sprintf("Context specific element expected, got %s.",
378
+					Identifier::classToName($this->typeClass())));
379
+		}
380
+		if (isset($tag) && $this->tag() != $tag) {
381
+			throw new \UnexpectedValueException(
382
+				sprintf("Tag %d expected, got %d.", $tag, $this->tag()));
383
+		}
384
+		return $this;
385
+	}
386 386
     
387
-    /**
388
-     * Whether element has indefinite length.
389
-     *
390
-     * @return bool
391
-     */
392
-    public function hasIndefiniteLength(): bool
393
-    {
394
-        return $this->_indefiniteLength;
395
-    }
387
+	/**
388
+	 * Whether element has indefinite length.
389
+	 *
390
+	 * @return bool
391
+	 */
392
+	public function hasIndefiniteLength(): bool
393
+	{
394
+		return $this->_indefiniteLength;
395
+	}
396 396
     
397
-    /**
398
-     * Get self with indefinite length encoding set.
399
-     *
400
-     * @param bool $indefinite True for indefinite length, false for definite
401
-     *        length
402
-     * @return self
403
-     */
404
-    public function withIndefiniteLength(bool $indefinite = true): self
405
-    {
406
-        $obj = clone $this;
407
-        $obj->_indefiniteLength = $indefinite;
408
-        return $obj;
409
-    }
397
+	/**
398
+	 * Get self with indefinite length encoding set.
399
+	 *
400
+	 * @param bool $indefinite True for indefinite length, false for definite
401
+	 *        length
402
+	 * @return self
403
+	 */
404
+	public function withIndefiniteLength(bool $indefinite = true): self
405
+	{
406
+		$obj = clone $this;
407
+		$obj->_indefiniteLength = $indefinite;
408
+		return $obj;
409
+	}
410 410
     
411
-    /**
412
-     *
413
-     * @see \ASN1\Feature\ElementBase::asElement()
414
-     * @return Element
415
-     */
416
-    final public function asElement(): Element
417
-    {
418
-        return $this;
419
-    }
411
+	/**
412
+	 *
413
+	 * @see \ASN1\Feature\ElementBase::asElement()
414
+	 * @return Element
415
+	 */
416
+	final public function asElement(): Element
417
+	{
418
+		return $this;
419
+	}
420 420
     
421
-    /**
422
-     * Get element decorated with UnspecifiedType object.
423
-     *
424
-     * @return UnspecifiedType
425
-     */
426
-    public function asUnspecified(): UnspecifiedType
427
-    {
428
-        return new UnspecifiedType($this);
429
-    }
421
+	/**
422
+	 * Get element decorated with UnspecifiedType object.
423
+	 *
424
+	 * @return UnspecifiedType
425
+	 */
426
+	public function asUnspecified(): UnspecifiedType
427
+	{
428
+		return new UnspecifiedType($this);
429
+	}
430 430
     
431
-    /**
432
-     * Determine the class that implements the type.
433
-     *
434
-     * @param Identifier $identifier
435
-     * @return string Class name
436
-     */
437
-    protected static function _determineImplClass(Identifier $identifier): string
438
-    {
439
-        switch ($identifier->typeClass()) {
440
-            case Identifier::CLASS_UNIVERSAL:
441
-                return self::_determineUniversalImplClass($identifier->intTag());
442
-            case Identifier::CLASS_CONTEXT_SPECIFIC:
443
-                return ContextSpecificType::class;
444
-            case Identifier::CLASS_APPLICATION:
445
-                return ApplicationType::class;
446
-            case Identifier::CLASS_PRIVATE:
447
-                return PrivateType::class;
448
-        }
449
-        throw new \UnexpectedValueException(
450
-            sprintf("%s %d not implemented.",
451
-                Identifier::classToName($identifier->typeClass()),
452
-                $identifier->tag()));
453
-    }
431
+	/**
432
+	 * Determine the class that implements the type.
433
+	 *
434
+	 * @param Identifier $identifier
435
+	 * @return string Class name
436
+	 */
437
+	protected static function _determineImplClass(Identifier $identifier): string
438
+	{
439
+		switch ($identifier->typeClass()) {
440
+			case Identifier::CLASS_UNIVERSAL:
441
+				return self::_determineUniversalImplClass($identifier->intTag());
442
+			case Identifier::CLASS_CONTEXT_SPECIFIC:
443
+				return ContextSpecificType::class;
444
+			case Identifier::CLASS_APPLICATION:
445
+				return ApplicationType::class;
446
+			case Identifier::CLASS_PRIVATE:
447
+				return PrivateType::class;
448
+		}
449
+		throw new \UnexpectedValueException(
450
+			sprintf("%s %d not implemented.",
451
+				Identifier::classToName($identifier->typeClass()),
452
+				$identifier->tag()));
453
+	}
454 454
     
455
-    /**
456
-     * Determine the class that implements an universal type of the given tag.
457
-     *
458
-     * @param int $tag
459
-     * @throws \UnexpectedValueException
460
-     * @return string Class name
461
-     */
462
-    protected static function _determineUniversalImplClass(int $tag): string
463
-    {
464
-        if (!array_key_exists($tag, self::MAP_TAG_TO_CLASS)) {
465
-            throw new \UnexpectedValueException(
466
-                "Universal tag $tag not implemented.");
467
-        }
468
-        return self::MAP_TAG_TO_CLASS[$tag];
469
-    }
455
+	/**
456
+	 * Determine the class that implements an universal type of the given tag.
457
+	 *
458
+	 * @param int $tag
459
+	 * @throws \UnexpectedValueException
460
+	 * @return string Class name
461
+	 */
462
+	protected static function _determineUniversalImplClass(int $tag): string
463
+	{
464
+		if (!array_key_exists($tag, self::MAP_TAG_TO_CLASS)) {
465
+			throw new \UnexpectedValueException(
466
+				"Universal tag $tag not implemented.");
467
+		}
468
+		return self::MAP_TAG_TO_CLASS[$tag];
469
+	}
470 470
     
471
-    /**
472
-     * Get textual description of the type for debugging purposes.
473
-     *
474
-     * @return string
475
-     */
476
-    protected function _typeDescriptorString(): string
477
-    {
478
-        if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
479
-            return self::tagToName($this->_typeTag);
480
-        }
481
-        return sprintf("%s TAG %d", Identifier::classToName($this->typeClass()),
482
-            $this->_typeTag);
483
-    }
471
+	/**
472
+	 * Get textual description of the type for debugging purposes.
473
+	 *
474
+	 * @return string
475
+	 */
476
+	protected function _typeDescriptorString(): string
477
+	{
478
+		if ($this->typeClass() == Identifier::CLASS_UNIVERSAL) {
479
+			return self::tagToName($this->_typeTag);
480
+		}
481
+		return sprintf("%s TAG %d", Identifier::classToName($this->typeClass()),
482
+			$this->_typeTag);
483
+	}
484 484
     
485
-    /**
486
-     * Get human readable name for an universal tag.
487
-     *
488
-     * @param int $tag
489
-     * @return string
490
-     */
491
-    public static function tagToName(int $tag): string
492
-    {
493
-        if (!array_key_exists($tag, self::MAP_TYPE_TO_NAME)) {
494
-            return "TAG $tag";
495
-        }
496
-        return self::MAP_TYPE_TO_NAME[$tag];
497
-    }
485
+	/**
486
+	 * Get human readable name for an universal tag.
487
+	 *
488
+	 * @param int $tag
489
+	 * @return string
490
+	 */
491
+	public static function tagToName(int $tag): string
492
+	{
493
+		if (!array_key_exists($tag, self::MAP_TYPE_TO_NAME)) {
494
+			return "TAG $tag";
495
+		}
496
+		return self::MAP_TYPE_TO_NAME[$tag];
497
+	}
498 498
 }
Please login to merge, or discard this patch.
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -347,10 +347,10 @@  discard block
 block discarded – undo
347 347
     private function _isPseudoType(int $tag): bool
348 348
     {
349 349
         switch ($tag) {
350
-            case self::TYPE_STRING:
351
-                return $this instanceof StringType;
352
-            case self::TYPE_TIME:
353
-                return $this instanceof TimeType;
350
+        case self::TYPE_STRING:
351
+            return $this instanceof StringType;
352
+        case self::TYPE_TIME:
353
+            return $this instanceof TimeType;
354 354
         }
355 355
         return false;
356 356
     }
@@ -437,14 +437,14 @@  discard block
 block discarded – undo
437 437
     protected static function _determineImplClass(Identifier $identifier): string
438 438
     {
439 439
         switch ($identifier->typeClass()) {
440
-            case Identifier::CLASS_UNIVERSAL:
441
-                return self::_determineUniversalImplClass($identifier->intTag());
442
-            case Identifier::CLASS_CONTEXT_SPECIFIC:
443
-                return ContextSpecificType::class;
444
-            case Identifier::CLASS_APPLICATION:
445
-                return ApplicationType::class;
446
-            case Identifier::CLASS_PRIVATE:
447
-                return PrivateType::class;
440
+        case Identifier::CLASS_UNIVERSAL:
441
+            return self::_determineUniversalImplClass($identifier->intTag());
442
+        case Identifier::CLASS_CONTEXT_SPECIFIC:
443
+            return ContextSpecificType::class;
444
+        case Identifier::CLASS_APPLICATION:
445
+            return ApplicationType::class;
446
+        case Identifier::CLASS_PRIVATE:
447
+            return PrivateType::class;
448 448
         }
449 449
         throw new \UnexpectedValueException(
450 450
             sprintf("%s %d not implemented.",
Please login to merge, or discard this patch.
lib/ASN1/Type/TaggedType.php 1 patch
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -13,71 +13,71 @@
 block discarded – undo
13 13
  */
14 14
 abstract class TaggedType extends Element
15 15
 {
16
-    /**
17
-     * Check whether element supports explicit tagging.
18
-     *
19
-     * @param int|null $expectedTag Optional outer tag expectation
20
-     * @throws \UnexpectedValueException If expectation fails
21
-     * @return ExplicitTagging
22
-     */
23
-    public function expectExplicit($expectedTag = null): ExplicitTagging
24
-    {
25
-        $el = $this;
26
-        if (!$el instanceof ExplicitTagging) {
27
-            throw new \UnexpectedValueException(
28
-                "Element doesn't implement explicit tagging.");
29
-        }
30
-        if (isset($expectedTag)) {
31
-            $el->expectTagged($expectedTag);
32
-        }
33
-        return $el;
34
-    }
16
+	/**
17
+	 * Check whether element supports explicit tagging.
18
+	 *
19
+	 * @param int|null $expectedTag Optional outer tag expectation
20
+	 * @throws \UnexpectedValueException If expectation fails
21
+	 * @return ExplicitTagging
22
+	 */
23
+	public function expectExplicit($expectedTag = null): ExplicitTagging
24
+	{
25
+		$el = $this;
26
+		if (!$el instanceof ExplicitTagging) {
27
+			throw new \UnexpectedValueException(
28
+				"Element doesn't implement explicit tagging.");
29
+		}
30
+		if (isset($expectedTag)) {
31
+			$el->expectTagged($expectedTag);
32
+		}
33
+		return $el;
34
+	}
35 35
     
36
-    /**
37
-     * Get the wrapped inner element employing explicit tagging.
38
-     *
39
-     * @param int|null $expectedTag Optional outer tag expectation
40
-     * @throws \UnexpectedValueException If expectation fails
41
-     * @return UnspecifiedType
42
-     */
43
-    public function asExplicit($expectedTag = null): UnspecifiedType
44
-    {
45
-        return $this->expectExplicit($expectedTag)->explicit();
46
-    }
36
+	/**
37
+	 * Get the wrapped inner element employing explicit tagging.
38
+	 *
39
+	 * @param int|null $expectedTag Optional outer tag expectation
40
+	 * @throws \UnexpectedValueException If expectation fails
41
+	 * @return UnspecifiedType
42
+	 */
43
+	public function asExplicit($expectedTag = null): UnspecifiedType
44
+	{
45
+		return $this->expectExplicit($expectedTag)->explicit();
46
+	}
47 47
     
48
-    /**
49
-     * Check whether element supports implicit tagging.
50
-     *
51
-     * @param int|null $expectedTag Optional outer tag expectation
52
-     * @throws \UnexpectedValueException If expectation fails
53
-     * @return ImplicitTagging
54
-     */
55
-    public function expectImplicit($expectedTag = null): ImplicitTagging
56
-    {
57
-        $el = $this;
58
-        if (!$el instanceof ImplicitTagging) {
59
-            throw new \UnexpectedValueException(
60
-                "Element doesn't implement implicit tagging.");
61
-        }
62
-        if (isset($expectedTag)) {
63
-            $el->expectTagged($expectedTag);
64
-        }
65
-        return $el;
66
-    }
48
+	/**
49
+	 * Check whether element supports implicit tagging.
50
+	 *
51
+	 * @param int|null $expectedTag Optional outer tag expectation
52
+	 * @throws \UnexpectedValueException If expectation fails
53
+	 * @return ImplicitTagging
54
+	 */
55
+	public function expectImplicit($expectedTag = null): ImplicitTagging
56
+	{
57
+		$el = $this;
58
+		if (!$el instanceof ImplicitTagging) {
59
+			throw new \UnexpectedValueException(
60
+				"Element doesn't implement implicit tagging.");
61
+		}
62
+		if (isset($expectedTag)) {
63
+			$el->expectTagged($expectedTag);
64
+		}
65
+		return $el;
66
+	}
67 67
     
68
-    /**
69
-     * Get the wrapped inner element employing implicit tagging.
70
-     *
71
-     * @param int $tag Type tag of the inner element
72
-     * @param int|null $expectedTag Optional outer tag expectation
73
-     * @param int $expectedClass Optional inner type class expectation
74
-     * @throws \UnexpectedValueException If expectation fails
75
-     * @return UnspecifiedType
76
-     */
77
-    public function asImplicit(int $tag, $expectedTag = null,
78
-        int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
79
-    {
80
-        return $this->expectImplicit($expectedTag)->implicit($tag,
81
-            $expectedClass);
82
-    }
68
+	/**
69
+	 * Get the wrapped inner element employing implicit tagging.
70
+	 *
71
+	 * @param int $tag Type tag of the inner element
72
+	 * @param int|null $expectedTag Optional outer tag expectation
73
+	 * @param int $expectedClass Optional inner type class expectation
74
+	 * @throws \UnexpectedValueException If expectation fails
75
+	 * @return UnspecifiedType
76
+	 */
77
+	public function asImplicit(int $tag, $expectedTag = null,
78
+		int $expectedClass = Identifier::CLASS_UNIVERSAL): UnspecifiedType
79
+	{
80
+		return $this->expectImplicit($expectedTag)->implicit($tag,
81
+			$expectedClass);
82
+	}
83 83
 }
Please login to merge, or discard this patch.