Fix tests

#Why do i need to define the class infront of its usage in ZE2?

5 files changed, 59 insertions, 50 deletions

diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
index ba241f3b09..b7c678eade 100644
--- a/ext/xml/tests/xml001.phpt
+++ b/ext/xml/tests/xml001.phpt
@@ -2,6 +2,8 @@
 XML parser test, function callbacks
 --SKIPIF--
 <?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
 --FILE--
 <?php
 chdir(dirname(__FILE__));
diff --git a/ext/xml/tests/xml002.phpt b/ext/xml/tests/xml002.phpt
index 11715eab66..7954c7918e 100644
--- a/ext/xml/tests/xml002.phpt
+++ b/ext/xml/tests/xml002.phpt
@@ -2,35 +2,12 @@
 XML parser test, object tuple callbacks
 --SKIPIF--
 <?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
 --FILE--
 <?php
 chdir(dirname(__FILE__));
 
-$xml_parser = xml_parser_create();
-$obj = new myclass;
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, array($obj,"startElement"),
-array($obj, "endElement"));
-xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
-xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
-xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
-xml_set_external_entity_ref_handler($xml_parser,
-array($obj, "externalEntityRefHandler"));
-
-if (!($fp = @fopen("xmltest.xml", "r"))) {
-	die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
-	if (!xml_parse($xml_parser, $data, feof($fp))) {
-		die(sprintf("XML error: %s at line %d\n",
-		xml_error_string(xml_get_error_code($xml_parser)),
-		xml_get_current_line_number($xml_parser)));
-	}
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-
 class myclass
 {
 	function startElement($parser, $name, $attribs)
@@ -69,6 +46,32 @@ class myclass
 		return true;
 	}
 }
+
+$xml_parser = xml_parser_create();
+$obj = new myclass;
+xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
+xml_set_element_handler($xml_parser, array($obj,"startElement"),
+array($obj, "endElement"));
+xml_set_character_data_handler($xml_parser, array($obj, "characterData"));
+xml_set_processing_instruction_handler($xml_parser, array($obj, "PIHandler"));
+xml_set_default_handler($xml_parser, array($obj, "defaultHandler"));
+xml_set_external_entity_ref_handler($xml_parser,
+array($obj, "externalEntityRefHandler"));
+
+if (!($fp = @fopen("xmltest.xml", "r"))) {
+	die("could not open XML input");
+}
+
+while ($data = fread($fp, 4096)) {
+	if (!xml_parse($xml_parser, $data, feof($fp))) {
+		die(sprintf("XML error: %s at line %d\n",
+		xml_error_string(xml_get_error_code($xml_parser)),
+		xml_get_current_line_number($xml_parser)));
+	}
+}
+print "parse complete\n";
+xml_parser_free($xml_parser);
+
 ?>
 --EXPECT--
 {?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
index ab9aa6254f..bae4dad5f5 100644
--- a/ext/xml/tests/xml003.phpt
+++ b/ext/xml/tests/xml003.phpt
@@ -2,34 +2,12 @@
 XML parser test, xml_set_object callbacks
 --SKIPIF--
 <?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
 --FILE--
 <?php
 chdir(dirname(__FILE__));
 
-$xml_parser = xml_parser_create();
-$obj = new myclass;
-xml_set_object($xml_parser, $obj);
-xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
-xml_set_element_handler($xml_parser, "startElement", "endElement");
-xml_set_character_data_handler($xml_parser, "characterData");
-xml_set_processing_instruction_handler($xml_parser, "PIHandler");
-xml_set_default_handler($xml_parser, "defaultHandler");
-xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
-
-if (!($fp = @fopen("xmltest.xml", "r"))) {
-	die("could not open XML input");
-}
-
-while ($data = fread($fp, 4096)) {
-	if (!xml_parse($xml_parser, $data, feof($fp))) {
-		die(sprintf("XML error: %s at line %d\n",
-		xml_error_string(xml_get_error_code($xml_parser)),
-		xml_get_current_line_number($xml_parser)));
-	}
-}
-print "parse complete\n";
-xml_parser_free($xml_parser);
-
 class myclass
 {
 	function startElement($parser, $name, $attribs) 
@@ -68,6 +46,30 @@ class myclass
 		return true;
 	}
 }
+
+$xml_parser = xml_parser_create();
+$obj = new myclass;
+xml_set_object($xml_parser, $obj);
+xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, 1);
+xml_set_element_handler($xml_parser, "startElement", "endElement");
+xml_set_character_data_handler($xml_parser, "characterData");
+xml_set_processing_instruction_handler($xml_parser, "PIHandler");
+xml_set_default_handler($xml_parser, "defaultHandler");
+xml_set_external_entity_ref_handler($xml_parser, "externalEntityRefHandler");
+
+if (!($fp = @fopen("xmltest.xml", "r"))) {
+	die("could not open XML input");
+}
+
+while ($data = fread($fp, 4096)) {
+	if (!xml_parse($xml_parser, $data, feof($fp))) {
+		die(sprintf("XML error: %s at line %d\n",
+		xml_error_string(xml_get_error_code($xml_parser)),
+		xml_get_current_line_number($xml_parser)));
+	}
+}
+print "parse complete\n";
+xml_parser_free($xml_parser);
 ?>
 --EXPECT--
 {?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
diff --git a/ext/xml/tests/xml004.phpt b/ext/xml/tests/xml004.phpt
index 245a93fc10..78840ee122 100644
--- a/ext/xml/tests/xml004.phpt
+++ b/ext/xml/tests/xml004.phpt
@@ -2,6 +2,8 @@
 XML parser case folding test
 --SKIPIF--
 <?php include("skipif.inc"); ?>
+--INI--
+magic_quotes_runtime=0
 --FILE--
 <?php
 chdir(dirname(__FILE__));
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
index 994bbe473e..377475bb1c 100644
--- a/ext/xml/tests/xml007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -3,7 +3,7 @@ xml_parse_into_struct/umlauts in tags
 --SKIPIF--
 <?php // vim600: syn=php
 include("skipif.inc");
-if(strtoupper("äöü") == "äöü")
+if(strtoupper("äöüß") != "ÄÖÜß")
 {
 	die("skip strtoupper on non-ascii not supported on this platform");
 }