From c9f7fb8b4edbcc10f2bcc92a0f387d7b2d8bb18f Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Tue, 29 Oct 2002 11:59:24 +0000
Subject: rename and WS fixes

---
 ext/xml/tests/001.phpt    | 97 -----------------------------------------------
 ext/xml/tests/002.phpt    | 91 --------------------------------------------
 ext/xml/tests/003.phpt    | 90 -------------------------------------------
 ext/xml/tests/004.phpt    | 60 -----------------------------
 ext/xml/tests/006.phpt    | 14 -------
 ext/xml/tests/007.phpt    | 48 -----------------------
 ext/xml/tests/xml001.phpt | 94 +++++++++++++++++++++++++++++++++++++++++++++
 ext/xml/tests/xml002.phpt | 94 +++++++++++++++++++++++++++++++++++++++++++++
 ext/xml/tests/xml003.phpt | 93 +++++++++++++++++++++++++++++++++++++++++++++
 ext/xml/tests/xml004.phpt | 62 ++++++++++++++++++++++++++++++
 ext/xml/tests/xml006.phpt | 12 ++++++
 ext/xml/tests/xml007.phpt | 53 ++++++++++++++++++++++++++
 12 files changed, 408 insertions(+), 400 deletions(-)
 delete mode 100644 ext/xml/tests/001.phpt
 delete mode 100644 ext/xml/tests/002.phpt
 delete mode 100644 ext/xml/tests/003.phpt
 delete mode 100644 ext/xml/tests/004.phpt
 delete mode 100644 ext/xml/tests/006.phpt
 delete mode 100644 ext/xml/tests/007.phpt
 create mode 100644 ext/xml/tests/xml001.phpt
 create mode 100644 ext/xml/tests/xml002.phpt
 create mode 100644 ext/xml/tests/xml003.phpt
 create mode 100644 ext/xml/tests/xml004.phpt
 create mode 100644 ext/xml/tests/xml006.phpt
 create mode 100644 ext/xml/tests/xml007.phpt

(limited to 'ext')

diff --git a/ext/xml/tests/001.phpt b/ext/xml/tests/001.phpt
deleted file mode 100644
index 156be8cc66..0000000000
--- a/ext/xml/tests/001.phpt
+++ /dev/null
@@ -1,97 +0,0 @@
---TEST--
-XML parser test, function callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-$xml_parser = xml_parser_create();
-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);
-
-function startElement($parser, $name, $attribs)
-{
-    print "\{$name";
-    if (sizeof($attribs)) {
-	while (list($k, $v) = each($attribs)) {
-	    print " $k=\"$v\"";
-	}
-    }
-    print "}";
-}
-
-function endElement($parser, $name)
-{
-    print "\{/$name}";
-}
-
-function characterData($parser, $data)
-{
-    print "\{CDATA[$data]}";
-}
-
-function PIHandler($parser, $target, $data)
-{
-    print "\{PI[$target,$data]}";
-}
-
-function defaultHandler($parser, $data)
-{
-    if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
-	print "\{ENTREF[$data]}";
-    } else {
-	print "\{?[$data]}";
-    }
-}
-
-function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId,
-				  $publicId)
-{
-    print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-    return true;
-}
-
-?>
---GET--
---POST--
---EXPECT--
-{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
-]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
-]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
-]}{?[%incent;]}{?[
-]}{?[]]}{?[>]}{?[
-]}{ROOT ID="elem1"}{CDATA[
-]}{CDATA[ Plain text.]}{CDATA[
-]}{CDATA[ ]}{ELEM1}{CDATA[
-]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
-]}{CDATA[  ]}{ELEM2}{CDATA[
-]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
-]}{CDATA[   ]}{ELEM3}{CDATA[
-]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
-]}{CDATA[    ]}{ELEM4}{CDATA[
-]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
-]}{CDATA[    ]}{/ELEM4}{CDATA[
-]}{CDATA[   ]}{/ELEM3}{CDATA[
-]}{CDATA[  ]}{/ELEM2}{CDATA[
-]}{CDATA[ ]}{/ELEM1}{CDATA[
-]}{/ROOT}{?[
-]}parse complete
diff --git a/ext/xml/tests/002.phpt b/ext/xml/tests/002.phpt
deleted file mode 100644
index 3d1ac4cec9..0000000000
--- a/ext/xml/tests/002.phpt
+++ /dev/null
@@ -1,91 +0,0 @@
---TEST--
-XML parser test, object tuple callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
---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) {
-	print "\{$name";
-	if (sizeof($attribs)) {
-	    while (list($k, $v) = each($attribs)) {
-		print " $k=\"$v\"";
-	    }
-	}
-	print "}";
-    }
-    function endElement($parser, $name) {
-	print "\{/$name}";
-    }
-    function characterData($parser, $data) {
-	print "\{CDATA[$data]}";
-    }
-    function PIHandler($parser, $target, $data) {
-	print "\{PI[$target,$data]}";
-    }
-    function defaultHandler($parser, $data) {
-	if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
-	    print "\{ENTREF[$data]}";
-	} else {
-	    print "\{?[$data]}";
-	}
-    }
-    function externalEntityRefHandler($parser, $openEntityNames, $base,
-				      $systemId, $publicId) {
-	print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-	return true;
-    }
-}
-
-?>
---GET--
---POST--
---EXPECT--
-{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
-]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
-]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
-]}{?[%incent;]}{?[
-]}{?[]]}{?[>]}{?[
-]}{ROOT ID="elem1"}{CDATA[
-]}{CDATA[ Plain text.]}{CDATA[
-]}{CDATA[ ]}{ELEM1}{CDATA[
-]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
-]}{CDATA[  ]}{ELEM2}{CDATA[
-]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
-]}{CDATA[   ]}{ELEM3}{CDATA[
-]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
-]}{CDATA[    ]}{ELEM4}{CDATA[
-]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
-]}{CDATA[    ]}{/ELEM4}{CDATA[
-]}{CDATA[   ]}{/ELEM3}{CDATA[
-]}{CDATA[  ]}{/ELEM2}{CDATA[
-]}{CDATA[ ]}{/ELEM1}{CDATA[
-]}{/ROOT}{?[
-]}parse complete
diff --git a/ext/xml/tests/003.phpt b/ext/xml/tests/003.phpt
deleted file mode 100644
index 9dab6b5ddc..0000000000
--- a/ext/xml/tests/003.phpt
+++ /dev/null
@@ -1,90 +0,0 @@
---TEST--
-XML parser test, xml_set_object callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
---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) {
-	print "\{$name";
-	if (sizeof($attribs)) {
-	    while (list($k, $v) = each($attribs)) {
-		print " $k=\"$v\"";
-	    }
-	}
-	print "}";
-    }
-    function endElement($parser, $name) {
-	print "\{/$name}";
-    }
-    function characterData($parser, $data) {
-	print "\{CDATA[$data]}";
-    }
-    function PIHandler($parser, $target, $data) {
-	print "\{PI[$target,$data]}";
-    }
-    function defaultHandler($parser, $data) {
-	if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
-	    print "\{ENTREF[$data]}";
-	} else {
-	    print "\{?[$data]}";
-	}
-    }
-    function externalEntityRefHandler($parser, $openEntityNames, $base,
-				      $systemId, $publicId) {
-	print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-	return true;
-    }
-}
-
-?>
---GET--
---POST--
---EXPECT--
-{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
-]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
-]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
-]}{?[%incent;]}{?[
-]}{?[]]}{?[>]}{?[
-]}{ROOT ID="elem1"}{CDATA[
-]}{CDATA[ Plain text.]}{CDATA[
-]}{CDATA[ ]}{ELEM1}{CDATA[
-]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
-]}{CDATA[  ]}{ELEM2}{CDATA[
-]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
-]}{CDATA[   ]}{ELEM3}{CDATA[
-]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
-]}{CDATA[    ]}{ELEM4}{CDATA[
-]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
-]}{CDATA[    ]}{/ELEM4}{CDATA[
-]}{CDATA[   ]}{/ELEM3}{CDATA[
-]}{CDATA[  ]}{/ELEM2}{CDATA[
-]}{CDATA[ ]}{/ELEM1}{CDATA[
-]}{/ROOT}{?[
-]}parse complete
diff --git a/ext/xml/tests/004.phpt b/ext/xml/tests/004.phpt
deleted file mode 100644
index 564c197939..0000000000
--- a/ext/xml/tests/004.phpt
+++ /dev/null
@@ -1,60 +0,0 @@
---TEST--
-XML parser case folding test
---SKIPIF--
-<?php include("skipif.inc"); ?>
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-$xp = xml_parser_create();
-xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
-xml_set_element_handler($xp, "start_element", "end_element");
-$fp = fopen("xmltest.xml", "r");
-while ($data = fread($fp, 4096)) {
-    xml_parse($xp, $data, feof($fp));
-}
-xml_parser_free($xp);
-$xp = xml_parser_create();
-xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, true);
-xml_set_element_handler($xp, "start_element", "end_element");
-$fp = fopen("xmltest.xml", "r");
-while ($data = fread($fp, 4096)) {
-    xml_parse($xp, $data, feof($fp));
-}
-xml_parser_free($xp);
-function start_element($xp, $elem, $attribs) {
-    print "<$elem";
-    if (sizeof($attribs)) {
-	while (list($k, $v) = each($attribs)) {
-	    print " $k=\"$v\"";
-	}
-    }
-    print ">\n";
-}
-function end_element($xp, $elem) {
-    print "</$elem>\n";
-}
-?>
---GET--
---POST--
---EXPECT--
-<root id="elem1">
-<elem1>
-<elem2>
-<elem3>
-<elem4>
-</elem4>
-</elem3>
-</elem2>
-</elem1>
-</root>
-<ROOT ID="elem1">
-<ELEM1>
-<ELEM2>
-<ELEM3>
-<ELEM4>
-</ELEM4>
-</ELEM3>
-</ELEM2>
-</ELEM1>
-</ROOT>
diff --git a/ext/xml/tests/006.phpt b/ext/xml/tests/006.phpt
deleted file mode 100644
index a1b339f0e0..0000000000
--- a/ext/xml/tests/006.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-UTF-8<->ISO Latin 1 encoding/decoding test
---SKIPIF--
-<?php include("skipif.inc"); ?>
---FILE--
-<?php
-printf("%s -> %s\n", urlencode("æ"), urlencode(utf8_encode("æ")));
-printf("%s <- %s\n", urlencode(utf8_decode(urldecode("%C3%A6"))), "%C3%A6");
-?>
---GET--
---POST--
---EXPECT--
-%E6 -> %C3%A6
-%E6 <- %C3%A6
diff --git a/ext/xml/tests/007.phpt b/ext/xml/tests/007.phpt
deleted file mode 100644
index c0863d8afe..0000000000
--- a/ext/xml/tests/007.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-xml_parse_into_struct/umlauts in tags
---SKIPIF--
-<?php // vim600: syn=php
-include("skipif.inc");
-if(strtoupper("äöü") == "äöü")
-{
-	die("skip strtoupper on non-ascii not supported on this platform");
-}
-?>
---FILE--
-<?php
-function startHandler($parser,$tag,$attr) { var_dump($tag,$attr); }
-function endHandler($parser,$tag) { var_dump($tag); }
-
-$xmldata = '<?xml version="1.0" encoding="ISO-8859-1"?><äöü üäß="Üäß">ÄÖÜ</äöü>';
-$parser = xml_parser_create('ISO-8859-1');
-xml_set_element_handler($parser, "startHandler", "endHandler");
-xml_parse_into_struct($parser, $xmldata, $struct, $index);
-var_dump($struct);
-?>
---GET--
---POST--
---EXPECT--
-string(3) "ÄÖÜ"
-array(1) {
-  ["ÜÄß"]=>
-  string(3) "Üäß"
-}
-string(3) "ÄÖÜ"
-array(1) {
-  [0]=>
-  array(5) {
-    ["tag"]=>
-    string(3) "ÄÖÜ"
-    ["type"]=>
-    string(8) "complete"
-    ["level"]=>
-    int(1)
-    ["attributes"]=>
-    array(1) {
-      ["ÜÄß"]=>
-      string(3) "Üäß"
-    }
-    ["value"]=>
-    string(3) "ÄÖÜ"
-  }
-}
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
new file mode 100644
index 0000000000..ba241f3b09
--- /dev/null
+++ b/ext/xml/tests/xml001.phpt
@@ -0,0 +1,94 @@
+--TEST--
+XML parser test, function callbacks
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+chdir(dirname(__FILE__));
+
+$xml_parser = xml_parser_create();
+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);
+
+function startElement($parser, $name, $attribs)
+{
+	print "\{$name";
+	if (sizeof($attribs)) {
+		while (list($k, $v) = each($attribs)) {
+			print " $k=\"$v\"";
+		}
+	}
+	print "}";
+}
+
+function endElement($parser, $name)
+{
+	print "\{/$name}";
+}
+
+function characterData($parser, $data)
+{
+	print "\{CDATA[$data]}";
+}
+
+function PIHandler($parser, $target, $data)
+{
+	print "\{PI[$target,$data]}";
+}
+
+function defaultHandler($parser, $data)
+{
+	if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
+		print "\{ENTREF[$data]}";
+	} else {
+		print "\{?[$data]}";
+	}
+}
+
+function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId, $publicId)
+{
+	print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
+	return true;
+}
+
+?>
+--EXPECT--
+{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
+]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
+]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
+]}{?[%incent;]}{?[
+]}{?[]]}{?[>]}{?[
+]}{ROOT ID="elem1"}{CDATA[
+]}{CDATA[ Plain text.]}{CDATA[
+]}{CDATA[ ]}{ELEM1}{CDATA[
+]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
+]}{CDATA[  ]}{ELEM2}{CDATA[
+]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
+]}{CDATA[   ]}{ELEM3}{CDATA[
+]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
+]}{CDATA[    ]}{ELEM4}{CDATA[
+]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
+]}{CDATA[    ]}{/ELEM4}{CDATA[
+]}{CDATA[   ]}{/ELEM3}{CDATA[
+]}{CDATA[  ]}{/ELEM2}{CDATA[
+]}{CDATA[ ]}{/ELEM1}{CDATA[
+]}{/ROOT}{?[
+]}parse complete
diff --git a/ext/xml/tests/xml002.phpt b/ext/xml/tests/xml002.phpt
new file mode 100644
index 0000000000..11715eab66
--- /dev/null
+++ b/ext/xml/tests/xml002.phpt
@@ -0,0 +1,94 @@
+--TEST--
+XML parser test, object tuple callbacks
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--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)
+	{
+		print "\{$name";
+		if (sizeof($attribs)) {
+			while (list($k, $v) = each($attribs)) {
+				print " $k=\"$v\"";
+			}
+		}
+		print "}";
+	}
+	function endElement($parser, $name)
+	{
+		print "\{/$name}";
+	}
+	function characterData($parser, $data)
+	{
+		print "\{CDATA[$data]}";
+	}
+	function PIHandler($parser, $target, $data)
+	{
+		print "\{PI[$target,$data]}";
+	}
+	function defaultHandler($parser, $data)
+	{
+		if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
+			print "\{ENTREF[$data]}";
+		} else {
+			print "\{?[$data]}";
+		}
+	}
+	function externalEntityRefHandler($parser, $openEntityNames, $base,	$systemId, $publicId)
+	{
+		print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
+		return true;
+	}
+}
+?>
+--EXPECT--
+{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
+]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
+]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
+]}{?[%incent;]}{?[
+]}{?[]]}{?[>]}{?[
+]}{ROOT ID="elem1"}{CDATA[
+]}{CDATA[ Plain text.]}{CDATA[
+]}{CDATA[ ]}{ELEM1}{CDATA[
+]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
+]}{CDATA[  ]}{ELEM2}{CDATA[
+]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
+]}{CDATA[   ]}{ELEM3}{CDATA[
+]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
+]}{CDATA[    ]}{ELEM4}{CDATA[
+]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
+]}{CDATA[    ]}{/ELEM4}{CDATA[
+]}{CDATA[   ]}{/ELEM3}{CDATA[
+]}{CDATA[  ]}{/ELEM2}{CDATA[
+]}{CDATA[ ]}{/ELEM1}{CDATA[
+]}{/ROOT}{?[
+]}parse complete
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
new file mode 100644
index 0000000000..ab9aa6254f
--- /dev/null
+++ b/ext/xml/tests/xml003.phpt
@@ -0,0 +1,93 @@
+--TEST--
+XML parser test, xml_set_object callbacks
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--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) 
+	{
+		print "\{$name";
+		if (sizeof($attribs)) {
+			while (list($k, $v) = each($attribs)) {
+				print " $k=\"$v\"";
+			}
+		}
+		print "}";
+	}
+	function endElement($parser, $name)
+	{
+		print "\{/$name}";
+	}
+	function characterData($parser, $data)
+	{
+		print "\{CDATA[$data]}";
+	}
+	function PIHandler($parser, $target, $data)
+	{
+		print "\{PI[$target,$data]}";
+	}
+	function defaultHandler($parser, $data)
+	{
+		if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
+			print "\{ENTREF[$data]}";
+		} else {
+			print "\{?[$data]}";
+		}
+	}
+	function externalEntityRefHandler($parser, $openEntityNames, $base,	$systemId, $publicId)
+	{
+		print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
+		return true;
+	}
+}
+?>
+--EXPECT--
+{?[<?xml version="1.0" encoding="ISO-8859-1"?>]}{?[
+]}{?[<!DOCTYPE]}{?[ ]}{?[phptest]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["notfound.dtd"]}{?[ ]}{?[[]}{?[
+]}{?[<!ENTITY]}{?[ ]}{?[%]}{?[ ]}{?[incent]}{?[ ]}{?[SYSTEM]}{?[ ]}{?["inc.ent"]}{?[>]}{?[
+]}{?[%incent;]}{?[
+]}{?[]]}{?[>]}{?[
+]}{ROOT ID="elem1"}{CDATA[
+]}{CDATA[ Plain text.]}{CDATA[
+]}{CDATA[ ]}{ELEM1}{CDATA[
+]}{CDATA[  ]}{?[<!-- comment -->]}{CDATA[
+]}{CDATA[  ]}{ELEM2}{CDATA[
+]}{CDATA[   ]}{?[<![CDATA[]}{CDATA[CDATA block]}{?[]]>]}{CDATA[
+]}{CDATA[   ]}{ELEM3}{CDATA[
+]}{CDATA[    ]}{ENTREF[&included-entity;]}{CDATA[
+]}{CDATA[    ]}{ELEM4}{CDATA[
+]}{CDATA[     ]}{PI[test,processing instruction ]}{CDATA[
+]}{CDATA[    ]}{/ELEM4}{CDATA[
+]}{CDATA[   ]}{/ELEM3}{CDATA[
+]}{CDATA[  ]}{/ELEM2}{CDATA[
+]}{CDATA[ ]}{/ELEM1}{CDATA[
+]}{/ROOT}{?[
+]}parse complete
diff --git a/ext/xml/tests/xml004.phpt b/ext/xml/tests/xml004.phpt
new file mode 100644
index 0000000000..245a93fc10
--- /dev/null
+++ b/ext/xml/tests/xml004.phpt
@@ -0,0 +1,62 @@
+--TEST--
+XML parser case folding test
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+chdir(dirname(__FILE__));
+
+$xp = xml_parser_create();
+xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, false);
+xml_set_element_handler($xp, "start_element", "end_element");
+$fp = fopen("xmltest.xml", "r");
+while ($data = fread($fp, 4096)) {
+	xml_parse($xp, $data, feof($fp));
+}
+xml_parser_free($xp);
+$xp = xml_parser_create();
+xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, true);
+xml_set_element_handler($xp, "start_element", "end_element");
+$fp = fopen("xmltest.xml", "r");
+while ($data = fread($fp, 4096)) {
+	xml_parse($xp, $data, feof($fp));
+}
+xml_parser_free($xp);
+
+function start_element($xp, $elem, $attribs)
+{
+	print "<$elem";
+	if (sizeof($attribs)) {
+		while (list($k, $v) = each($attribs)) {
+			print " $k=\"$v\"";
+		}
+	}
+	print ">\n";
+}
+
+function end_element($xp, $elem)
+{
+	print "</$elem>\n";
+}
+?>
+--EXPECT--
+<root id="elem1">
+<elem1>
+<elem2>
+<elem3>
+<elem4>
+</elem4>
+</elem3>
+</elem2>
+</elem1>
+</root>
+<ROOT ID="elem1">
+<ELEM1>
+<ELEM2>
+<ELEM3>
+<ELEM4>
+</ELEM4>
+</ELEM3>
+</ELEM2>
+</ELEM1>
+</ROOT>
diff --git a/ext/xml/tests/xml006.phpt b/ext/xml/tests/xml006.phpt
new file mode 100644
index 0000000000..c714e85913
--- /dev/null
+++ b/ext/xml/tests/xml006.phpt
@@ -0,0 +1,12 @@
+--TEST--
+UTF-8<->ISO Latin 1 encoding/decoding test
+--SKIPIF--
+<?php include("skipif.inc"); ?>
+--FILE--
+<?php
+printf("%s -> %s\n", urlencode("æ"), urlencode(utf8_encode("æ")));
+printf("%s <- %s\n", urlencode(utf8_decode(urldecode("%C3%A6"))), "%C3%A6");
+?>
+--EXPECT--
+%E6 -> %C3%A6
+%E6 <- %C3%A6
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
new file mode 100644
index 0000000000..994bbe473e
--- /dev/null
+++ b/ext/xml/tests/xml007.phpt
@@ -0,0 +1,53 @@
+--TEST--
+xml_parse_into_struct/umlauts in tags
+--SKIPIF--
+<?php // vim600: syn=php
+include("skipif.inc");
+if(strtoupper("äöü") == "äöü")
+{
+	die("skip strtoupper on non-ascii not supported on this platform");
+}
+?>
+--FILE--
+<?php
+function startHandler($parser,$tag,$attr)
+{
+	var_dump($tag,$attr);
+}
+
+function endHandler($parser,$tag)
+{ 
+	var_dump($tag); 
+}
+
+$xmldata = '<?xml version="1.0" encoding="ISO-8859-1"?><äöü üäß="Üäß">ÄÖÜ</äöü>';
+$parser = xml_parser_create('ISO-8859-1');
+xml_set_element_handler($parser, "startHandler", "endHandler");
+xml_parse_into_struct($parser, $xmldata, $struct, $index);
+var_dump($struct);
+?>
+--EXPECT--
+string(3) "ÄÖÜ"
+array(1) {
+  ["ÜÄß"]=>
+  string(3) "Üäß"
+}
+string(3) "ÄÖÜ"
+array(1) {
+  [0]=>
+  array(5) {
+    ["tag"]=>
+    string(3) "ÄÖÜ"
+    ["type"]=>
+    string(8) "complete"
+    ["level"]=>
+    int(1)
+    ["attributes"]=>
+    array(1) {
+      ["ÜÄß"]=>
+      string(3) "Üäß"
+    }
+    ["value"]=>
+    string(3) "ÄÖÜ"
+  }
+}
-- 
cgit v1.2.1