Skip to content

Commit d0c535d

Browse files
helly25helly25
committed
Fix tests
#Why do i need to define the class infront of its usage in ZE2?
1 parent c9f7fb8 commit d0c535d

5 files changed

Lines changed: 59 additions & 50 deletions

File tree

‎ext/xml/tests/xml001.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
XML parser test, function callbacks
33
--SKIPIF--
44
<?php include("skipif.inc"); ?>
5+
--INI--
6+
magic_quotes_runtime=0
57
--FILE--
68
<?php
79
chdir(dirname(__FILE__));

‎ext/xml/tests/xml002.phpt‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,12 @@
22
XML parser test, object tuple callbacks
33
--SKIPIF--
44
<?php include("skipif.inc"); ?>
5+
--INI--
6+
magic_quotes_runtime=0
57
--FILE--
68
<?php
79
chdir(dirname(__FILE__));
810

9-
$xml_parser = xml_parser_create();
10-
$obj = new myclass;
11-
xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
12-
xml_set_element_handler($xml_parser, array($obj,"startElement"),
13-
array($obj, "endElement"));
14-
xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
15-
xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
16-
xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
17-
xml_set_external_entity_ref_handler($xml_parser,
18-
array($obj, "externalEntityRefHandler"));
19-
20-
if (!($fp = @fopen("xmltest.xml", "r"))) {
21-
die("could not open XML input");
22-
}
23-
24-
while ($data = fread($fp, 4096)) {
25-
if (!xml_parse($xml_parser, $data, feof($fp))) {
26-
die(sprintf("XML error: %s at line %d\n",
27-
xml_error_string(xml_get_error_code($xml_parser)),
28-
xml_get_current_line_number($xml_parser)));
29-
}
30-
}
31-
print "parse complete\n";
32-
xml_parser_free($xml_parser);
33-
3411
class myclass
3512
{
3613
function startElement($parser, $name, $attribs)
@@ -69,6 +46,32 @@ class myclass
6946
return true;
7047
}
7148
}
49+
50+
$xml_parser = xml_parser_create();
51+
$obj = new myclass;
52+
xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
53+
xml_set_element_handler($xml_parser, array($obj,"startElement"),
54+
array($obj, "endElement"));
55+
xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
56+
xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
57+
xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
58+
xml_set_external_entity_ref_handler($xml_parser,
59+
array($obj, "externalEntityRefHandler"));
60+
61+
if (!($fp = @fopen("xmltest.xml", "r"))) {
62+
die("could not open XML input");
63+
}
64+
65+
while ($data = fread($fp, 4096)) {
66+
if (!xml_parse($xml_parser, $data, feof($fp))) {
67+
die(sprintf("XML error: %s at line %d\n",
68+
xml_error_string(xml_get_error_code($xml_parser)),
69+
xml_get_current_line_number($xml_parser)));
70+
}
71+
}
72+
print "parse complete\n";
73+
xml_parser_free($xml_parser);
74+
7275
?>
7376
--EXPECT--
7477
{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[

‎ext/xml/tests/xml003.phpt‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,12 @@
22
XML parser test, xml_set_object callbacks
33
--SKIPIF--
44
<?php include("skipif.inc"); ?>
5+
--INI--
6+
magic_quotes_runtime=0
57
--FILE--
68
<?php
79
chdir(dirname(__FILE__));
810

9-
$xml_parser = xml_parser_create();
10-
$obj = new myclass;
11-
xml_set_object($xml_parser, $obj);
12-
xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
13-
xml_set_element_handler($xml_parser, "startElement", "endElement");
14-
xml_set_character_data_handler($xml_parser, "characterData");
15-
xml_set_processing_instruction_handler($xml_parser, "PIHandler");
16-
xml_set_default_handler($xml_parser, "defaultHandler");
17-
xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
18-
19-
if (!($fp = @fopen("xmltest.xml", "r"))) {
20-
die("could not open XML input");
21-
}
22-
23-
while ($data = fread($fp, 4096)) {
24-
if (!xml_parse($xml_parser, $data, feof($fp))) {
25-
die(sprintf("XML error: %s at line %d\n",
26-
xml_error_string(xml_get_error_code($xml_parser)),
27-
xml_get_current_line_number($xml_parser)));
28-
}
29-
}
30-
print "parse complete\n";
31-
xml_parser_free($xml_parser);
32-
3311
class myclass
3412
{
3513
function startElement($parser, $name, $attribs)
@@ -68,6 +46,30 @@ class myclass
6846
return true;
6947
}
7048
}
49+
50+
$xml_parser = xml_parser_create();
51+
$obj = new myclass;
52+
xml_set_object($xml_parser, $obj);
53+
xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
54+
xml_set_element_handler($xml_parser, "startElement", "endElement");
55+
xml_set_character_data_handler($xml_parser, "characterData");
56+
xml_set_processing_instruction_handler($xml_parser, "PIHandler");
57+
xml_set_default_handler($xml_parser, "defaultHandler");
58+
xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
59+
60+
if (!($fp = @fopen("xmltest.xml", "r"))) {
61+
die("could not open XML input");
62+
}
63+
64+
while ($data = fread($fp, 4096)) {
65+
if (!xml_parse($xml_parser, $data, feof($fp))) {
66+
die(sprintf("XML error: %s at line %d\n",
67+
xml_error_string(xml_get_error_code($xml_parser)),
68+
xml_get_current_line_number($xml_parser)));
69+
}
70+
}
71+
print "parse complete\n";
72+
xml_parser_free($xml_parser);
7173
?>
7274
--EXPECT--
7375
{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[

‎ext/xml/tests/xml004.phpt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
XML parser case folding test
33
--SKIPIF--
44
<?php include("skipif.inc"); ?>
5+
--INI--
6+
magic_quotes_runtime=0
57
--FILE--
68
<?php
79
chdir(dirname(__FILE__));

‎ext/xml/tests/xml007.phpt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ xml_parse_into_struct/umlauts in tags
33
--SKIPIF--
44
<?php // vim600: syn=php
55
include("skipif.inc");
6-
if(strtoupper("äöü") == "äöü")
6+
if(strtoupper("äöüß") != "ÄÖÜß")
77
{
88
die("skip strtoupper on non-ascii not supported on this platform");
99
}

0 commit comments

Comments
 (0)