Skip to content

Commit 88ad6ff

Browse files
committed
[skip ci] [W.I.P.] ext/xml: Refactor extension to use FCC instead of handlers
To get proper errors and sensible behaviour, as the current behaviour is somewhat insane and part of it should be axed ASAP
1 parent 9aa4b2b commit 88ad6ff

File tree

5 files changed

+398
-254
lines changed

5 files changed

+398
-254
lines changed

ext/xml/tests/bug30266.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class XML_Parser
4242
$p1 = new Xml_Parser();
4343
try {
4444
$p1->parse('<tag1><tag2></tag2></tag1>');
45+
echo "Exception swallowed\n";
4546
} catch (Exception $e) {
4647
echo "OK\n";
4748
}

ext/xml/tests/bug32001.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ HERE;
100100

101101
$parser = xml_parser_create(NULL);
102102
xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
103-
xml_set_element_handler($parser, "start_element", "end_element");
104103
xml_set_object($parser, $this);
104+
xml_set_element_handler($parser, "start_element", "end_element");
105105

106106
if ($this->chunk_size == 0) {
107107
$success = @xml_parse($parser, $data, true);

ext/xml/tests/bug72085.phpt

Lines changed: 0 additions & 16 deletions
This file was deleted.

ext/xml/tests/bug73135.phpt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ xml
66
edgarsandi - <[email protected]>
77
--FILE--
88
<?php
9-
function start_elem($parser, $xml) {
10-
xml_parse($parser, $xml);
11-
}
9+
function start_elem($parser, $xml) {
10+
xml_parse($parser, $xml);
11+
}
12+
13+
function dummy() {}
1214

13-
$xml = <<<HERE
14-
<a xmlns="ahihi">
15-
<bar foo="ahihi"/>
16-
</a>
15+
$xml = <<<HERE
16+
<a xmlns="ahihi">
17+
<bar foo="ahihi"/>
18+
</a>
1719
HERE;
1820

1921
$parser = xml_parser_create_ns();
20-
xml_set_element_handler($parser, 'start_elem', 'ahihi');
22+
xml_set_element_handler($parser, 'start_elem', 'dummy');
2123
xml_parse($parser, $xml);
2224
?>
2325
--EXPECTF--

0 commit comments

Comments
 (0)