This commit was manufactured by cvs2svn to create branch 'PHP_5'.PHP-5

9 files changed, 0 insertions, 448 deletions

diff --git a/ext/xml/tests/inc.ent b/ext/xml/tests/inc.ent
deleted file mode 100644
index 8f86465c2a..0000000000
--- a/ext/xml/tests/inc.ent
+++ /dev/null
@@ -1 +0,0 @@
-<!ENTITY included-entity "This is text included from an entity">
diff --git a/ext/xml/tests/skipif.inc b/ext/xml/tests/skipif.inc
deleted file mode 100644
index 44898f3da6..0000000000
--- a/ext/xml/tests/skipif.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-// DO NOT dl load extension
-//if (!extension_loaded("xml")) {
-//  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-//  @dl("xml$dlext");
-//}
-if (!extension_loaded("xml")) {
-  die('skip xml extension not available');
-}
-?>
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
deleted file mode 100644
index b7c678eade..0000000000
--- a/ext/xml/tests/xml001.phpt
+++ /dev/null
@@ -1,96 +0,0 @@
---TEST--
-XML parser test, function callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
---INI--
-magic_quotes_runtime=0
---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
deleted file mode 100644
index 7954c7918e..0000000000
--- a/ext/xml/tests/xml002.phpt
+++ /dev/null
@@ -1,97 +0,0 @@
---TEST--
-XML parser test, object tuple callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
---INI--
-magic_quotes_runtime=0
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-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;
-	}
-}
-
-$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"?>]}{?[
-]}{?[<!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
deleted file mode 100644
index bae4dad5f5..0000000000
--- a/ext/xml/tests/xml003.phpt
+++ /dev/null
@@ -1,95 +0,0 @@
---TEST--
-XML parser test, xml_set_object callbacks
---SKIPIF--
-<?php include("skipif.inc"); ?>
---INI--
-magic_quotes_runtime=0
---FILE--
-<?php
-chdir(dirname(__FILE__));
-
-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;
-	}
-}
-
-$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"?>]}{?[
-]}{?[<!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
deleted file mode 100644
index 78840ee122..0000000000
--- a/ext/xml/tests/xml004.phpt
+++ /dev/null
@@ -1,64 +0,0 @@
---TEST--
-XML parser case folding test
---SKIPIF--
-<?php include("skipif.inc"); ?>
---INI--
-magic_quotes_runtime=0
---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
deleted file mode 100644
index c714e85913..0000000000
--- a/ext/xml/tests/xml006.phpt
+++ /dev/null
@@ -1,12 +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");
-?>
---EXPECT--
-%E6 -> %C3%A6
-%E6 <- %C3%A6
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
deleted file mode 100644
index 377475bb1c..0000000000
--- a/ext/xml/tests/xml007.phpt
+++ /dev/null
@@ -1,53 +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);
-?>
---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/xmltest.xml b/ext/xml/tests/xmltest.xml
deleted file mode 100644
index c15d6ea1ab..0000000000
--- a/ext/xml/tests/xmltest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE phptest SYSTEM "notfound.dtd" [
-<!ENTITY % incent SYSTEM "inc.ent">
-%incent;
-]>
-<root id="elem1">
- Plain text.
- <elem1>
-  <!-- comment -->
-  <elem2>
-   <![CDATA[CDATA block]]>
-   <elem3>
-    &included-entity;
-    <elem4>
-     <?test processing instruction ?>
-    </elem4>
-   </elem3>
-  </elem2>
- </elem1>
-</root>