@@ -1,53 +1,53 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | array ( |
4 | - 'person' => |
|
5 | - array ( |
|
4 | + 'person' => |
|
5 | + array ( |
|
6 | 6 | 0 => |
7 | 7 | array ( |
8 | - 'name' => 'Alex', |
|
9 | - 'age' => 34, |
|
10 | - 'cars' => |
|
11 | - array ( |
|
8 | + 'name' => 'Alex', |
|
9 | + 'age' => 34, |
|
10 | + 'cars' => |
|
11 | + array ( |
|
12 | 12 | 0 => |
13 | 13 | array ( |
14 | - '@attributes' => |
|
15 | - array ( |
|
14 | + '@attributes' => |
|
15 | + array ( |
|
16 | 16 | 'drive' => 'test', |
17 | - ), |
|
18 | - '@value' => 'Volvo', |
|
17 | + ), |
|
18 | + '@value' => 'Volvo', |
|
19 | 19 | ), |
20 | 20 | 1 => 'BMW', |
21 | 21 | 2 => 'Toyota', |
22 | 22 | 3 => 'Honda', |
23 | 23 | 4 => 'Mercedes', |
24 | 24 | 5 => 'Opel', |
25 | - ), |
|
25 | + ), |
|
26 | 26 | ), |
27 | 27 | 1 => |
28 | 28 | array ( |
29 | - 'name' => |
|
30 | - array ( |
|
29 | + 'name' => |
|
30 | + array ( |
|
31 | 31 | '@attributes' => |
32 | 32 | array ( |
33 | - 'age' => 44, |
|
33 | + 'age' => 44, |
|
34 | 34 | ), |
35 | 35 | '@value' => 'Ivan', |
36 | - ), |
|
37 | - 'cars' => 'Opel', |
|
36 | + ), |
|
37 | + 'cars' => 'Opel', |
|
38 | 38 | ), |
39 | 39 | 2 => |
40 | 40 | array ( |
41 | - '@attributes' => |
|
42 | - array ( |
|
41 | + '@attributes' => |
|
42 | + array ( |
|
43 | 43 | 'name' => 'Anton', |
44 | - ), |
|
45 | - 'age' => 22, |
|
46 | - 'cars' => |
|
47 | - array ( |
|
44 | + ), |
|
45 | + 'age' => 22, |
|
46 | + 'cars' => |
|
47 | + array ( |
|
48 | 48 | 0 => 'Volvo', |
49 | 49 | 1 => 'BMW', |
50 | - ), |
|
50 | + ), |
|
51 | + ), |
|
51 | 52 | ), |
52 | - ), |
|
53 | 53 | ); |
54 | 54 | \ No newline at end of file |
@@ -1,18 +1,18 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -array ( |
|
3 | +array( |
|
4 | 4 | 'person' => |
5 | - array ( |
|
5 | + array( |
|
6 | 6 | 0 => |
7 | - array ( |
|
7 | + array( |
|
8 | 8 | 'name' => 'Alex', |
9 | 9 | 'age' => 34, |
10 | 10 | 'cars' => |
11 | - array ( |
|
11 | + array( |
|
12 | 12 | 0 => |
13 | - array ( |
|
13 | + array( |
|
14 | 14 | '@attributes' => |
15 | - array ( |
|
15 | + array( |
|
16 | 16 | 'drive' => 'test', |
17 | 17 | ), |
18 | 18 | '@value' => 'Volvo', |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | ), |
26 | 26 | ), |
27 | 27 | 1 => |
28 | - array ( |
|
28 | + array( |
|
29 | 29 | 'name' => |
30 | - array ( |
|
30 | + array( |
|
31 | 31 | '@attributes' => |
32 | - array ( |
|
32 | + array( |
|
33 | 33 | 'age' => 44, |
34 | 34 | ), |
35 | 35 | '@value' => 'Ivan', |
@@ -37,14 +37,14 @@ discard block |
||
37 | 37 | 'cars' => 'Opel', |
38 | 38 | ), |
39 | 39 | 2 => |
40 | - array ( |
|
40 | + array( |
|
41 | 41 | '@attributes' => |
42 | - array ( |
|
42 | + array( |
|
43 | 43 | 'name' => 'Anton', |
44 | 44 | ), |
45 | 45 | 'age' => 22, |
46 | 46 | 'cars' => |
47 | - array ( |
|
47 | + array( |
|
48 | 48 | 0 => 'Volvo', |
49 | 49 | 1 => 'BMW', |
50 | 50 | ), |
@@ -68,8 +68,7 @@ discard block |
||
68 | 68 | if ($properties) |
69 | 69 | { |
70 | 70 | $output['@' . $property] = is_array($properties) ? |
71 | - $properties : |
|
72 | - $this->_asArray($properties); |
|
71 | + $properties : $this->_asArray($properties); |
|
73 | 72 | |
74 | 73 | if (empty($output['@' . $property])) |
75 | 74 | { |
@@ -178,8 +177,7 @@ discard block |
||
178 | 177 | $data = $this->_simpleXml($mixed); |
179 | 178 | |
180 | 179 | return $data ? |
181 | - $this->_asArray($data) : |
|
182 | - null; |
|
180 | + $this->_asArray($data) : null; |
|
183 | 181 | } |
184 | 182 | |
185 | 183 | /** |
@@ -270,12 +270,10 @@ |
||
270 | 270 | if ($key === '@attributes') |
271 | 271 | { |
272 | 272 | $this->addAttributes($element, $storage); |
273 | - } |
|
274 | - else if ($key === '@value' && \is_string($storage)) |
|
273 | + } else if ($key === '@value' && \is_string($storage)) |
|
275 | 274 | { |
276 | 275 | $element->nodeValue = \htmlspecialchars($storage); |
277 | - } |
|
278 | - else |
|
276 | + } else |
|
279 | 277 | { |
280 | 278 | $this->addNode($element, $key, $storage); |
281 | 279 | } |
@@ -1,53 +1,53 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | array ( |
4 | - 'person' => |
|
5 | - array ( |
|
4 | + 'person' => |
|
5 | + array ( |
|
6 | 6 | 0 => |
7 | 7 | array ( |
8 | - 'name' => 'Alex', |
|
9 | - 'age' => '34', |
|
10 | - 'cars' => |
|
11 | - array ( |
|
8 | + 'name' => 'Alex', |
|
9 | + 'age' => '34', |
|
10 | + 'cars' => |
|
11 | + array ( |
|
12 | 12 | 0 => |
13 | 13 | array ( |
14 | - '@attributes' => |
|
15 | - array ( |
|
14 | + '@attributes' => |
|
15 | + array ( |
|
16 | 16 | 'drive' => 'test', |
17 | - ), |
|
18 | - '@value' => 'Volvo', |
|
17 | + ), |
|
18 | + '@value' => 'Volvo', |
|
19 | 19 | ), |
20 | 20 | 1 => 'BMW', |
21 | 21 | 2 => 'Toyota', |
22 | 22 | 3 => 'Honda', |
23 | 23 | 4 => 'Mercedes', |
24 | 24 | 5 => 'Opel', |
25 | - ), |
|
25 | + ), |
|
26 | 26 | ), |
27 | 27 | 1 => |
28 | 28 | array ( |
29 | - 'name' => |
|
30 | - array ( |
|
29 | + 'name' => |
|
30 | + array ( |
|
31 | 31 | '@attributes' => |
32 | 32 | array ( |
33 | - 'age' => '44', |
|
33 | + 'age' => '44', |
|
34 | 34 | ), |
35 | 35 | '@value' => 'Ivan', |
36 | - ), |
|
37 | - 'cars' => 'Opel', |
|
36 | + ), |
|
37 | + 'cars' => 'Opel', |
|
38 | 38 | ), |
39 | 39 | 2 => |
40 | 40 | array ( |
41 | - '@attributes' => |
|
42 | - array ( |
|
41 | + '@attributes' => |
|
42 | + array ( |
|
43 | 43 | 'name' => 'Anton', |
44 | - ), |
|
45 | - 'age' => '22', |
|
46 | - 'cars' => |
|
47 | - array ( |
|
44 | + ), |
|
45 | + 'age' => '22', |
|
46 | + 'cars' => |
|
47 | + array ( |
|
48 | 48 | 0 => 'Volvo', |
49 | 49 | 1 => 'BMW', |
50 | - ), |
|
50 | + ), |
|
51 | + ), |
|
51 | 52 | ), |
52 | - ), |
|
53 | 53 | ); |
54 | 54 | \ No newline at end of file |
@@ -1,18 +1,18 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -array ( |
|
3 | +array( |
|
4 | 4 | 'person' => |
5 | - array ( |
|
5 | + array( |
|
6 | 6 | 0 => |
7 | - array ( |
|
7 | + array( |
|
8 | 8 | 'name' => 'Alex', |
9 | 9 | 'age' => '34', |
10 | 10 | 'cars' => |
11 | - array ( |
|
11 | + array( |
|
12 | 12 | 0 => |
13 | - array ( |
|
13 | + array( |
|
14 | 14 | '@attributes' => |
15 | - array ( |
|
15 | + array( |
|
16 | 16 | 'drive' => 'test', |
17 | 17 | ), |
18 | 18 | '@value' => 'Volvo', |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | ), |
26 | 26 | ), |
27 | 27 | 1 => |
28 | - array ( |
|
28 | + array( |
|
29 | 29 | 'name' => |
30 | - array ( |
|
30 | + array( |
|
31 | 31 | '@attributes' => |
32 | - array ( |
|
32 | + array( |
|
33 | 33 | 'age' => '44', |
34 | 34 | ), |
35 | 35 | '@value' => 'Ivan', |
@@ -37,14 +37,14 @@ discard block |
||
37 | 37 | 'cars' => 'Opel', |
38 | 38 | ), |
39 | 39 | 2 => |
40 | - array ( |
|
40 | + array( |
|
41 | 41 | '@attributes' => |
42 | - array ( |
|
42 | + array( |
|
43 | 43 | 'name' => 'Anton', |
44 | 44 | ), |
45 | 45 | 'age' => '22', |
46 | 46 | 'cars' => |
47 | - array ( |
|
47 | + array( |
|
48 | 48 | 0 => 'Volvo', |
49 | 49 | 1 => 'BMW', |
50 | 50 | ), |