rename and WS fixes

diff --git a/ext/xml/tests/001.phpt b/ext/xml/tests/xml001.phpt
similarity index 72%
rename from ext/xml/tests/001.phpt
rename to ext/xml/tests/xml001.phpt
index 156be8cc662c777eca6c53de58f9a3ed068f3066..ba241f3b097634e6e4db7b01134386ac217d4305 100644 (file)
--- a/ext/xml/tests/001.phpt
+++ b/ext/xml/tests/xml001.phpt
@@ -19,60 +19,57 @@ if (!($fp = @fopen("xmltest.xml", "r"))) {
 }
 
 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)));
-    }
+       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 "\{$name";
+       if (sizeof($attribs)) {
+               while (list($k, $v) = each($attribs)) {
+                       print " $k=\"$v\"";
+               }
        }
-    }
-    print "}";
+       print "}";
 }
 
 function endElement($parser, $name)
 {
-    print "\{/$name}";
+       print "\{/$name}";
 }
 
 function characterData($parser, $data)
 {
-    print "\{CDATA[$data]}";
+       print "\{CDATA[$data]}";
 }
 
 function PIHandler($parser, $target, $data)
 {
-    print "\{PI[$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]}";
-    }
+       if (substr($data, 0, 1) == "&" && substr($data, -1, 1) == ";") {
+               print "\{ENTREF[$data]}";
+       } else {
+               print "\{?[$data]}";
+       }
 }
 
-function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId,
-                                 $publicId)
+function externalEntityRefHandler($parser, $openEntityNames, $base, $systemId, $publicId)
 {
-    print "\{EXTENTREF[$openEntityNames,$base,$systemId,$publicId]}\n";
-    return true;
+       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"]}{?[ ]}{?[[]}{?[

diff --git a/ext/xml/tests/002.phpt b/ext/xml/tests/xml002.phpt
similarity index 57%
rename from ext/xml/tests/002.phpt
rename to ext/xml/tests/xml002.phpt
index 3d1ac4cec91ccdfff926bcdad3f1f2d7492924bf..11715eab66767261151183d458354163075e51c3 100644 (file)
--- a/ext/xml/tests/002.phpt
+++ b/ext/xml/tests/xml002.phpt
@@ -10,63 +10,66 @@ $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"));
+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"));
-    
+array($obj, "externalEntityRefHandler"));
+
 if (!($fp = @fopen("xmltest.xml", "r"))) {
-    die("could not open XML input");
+       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)));
-    }
+       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\"";
-           }
+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]}";
        }
-       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 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;
        }
-    }
-    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"]}{?[ ]}{?[[]}{?[

diff --git a/ext/xml/tests/003.phpt b/ext/xml/tests/xml003.phpt
similarity index 59%
rename from ext/xml/tests/003.phpt
rename to ext/xml/tests/xml003.phpt
index 9dab6b5ddcf491f98cfa406039531084e3bfeab2..ab9aa6254fdbc4456fc72c7d1bd918965373dc82 100644 (file)
--- a/ext/xml/tests/003.phpt
+++ b/ext/xml/tests/xml003.phpt
@@ -15,57 +15,60 @@ 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");
+       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)));
-    }
+       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\"";
-           }
+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]}";
        }
-       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 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;
        }
-    }
-    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"]}{?[ ]}{?[[]}{?[

diff --git a/ext/xml/tests/004.phpt b/ext/xml/tests/xml004.phpt
similarity index 70%
rename from ext/xml/tests/004.phpt
rename to ext/xml/tests/xml004.phpt
index 564c197939518b2ad565c827dacef1e36dbd05ac..245a93fc10af9987faf7e9fa0892c19527373b1c 100644 (file)
--- a/ext/xml/tests/004.phpt
+++ b/ext/xml/tests/xml004.phpt
@@ -11,7 +11,7 @@ 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_parse($xp, $data, feof($fp));
 }
 xml_parser_free($xp);
 $xp = xml_parser_create();
@@ -19,24 +19,26 @@ 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_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\"";
+
+function start_element($xp, $elem, $attribs)
+{
+       print "<$elem";
+       if (sizeof($attribs)) {
+               while (list($k, $v) = each($attribs)) {
+                       print " $k=\"$v\"";
+               }
        }
-    }
-    print ">\n";
+       print ">\n";
 }
-function end_element($xp, $elem) {
-    print "</$elem>\n";
+
+function end_element($xp, $elem)
+{
+       print "</$elem>\n";
 }
 ?>
---GET--
---POST--
 --EXPECT--
 <root id="elem1">
 <elem1>

diff --git a/ext/xml/tests/006.phpt b/ext/xml/tests/xml006.phpt
similarity index 94%
rename from ext/xml/tests/006.phpt
rename to ext/xml/tests/xml006.phpt
index a1b339f0e0250059d2a3294db873378ecb857d8b..c714e85913979a2623b1440671aba22621cfee0c 100644 (file)
--- a/ext/xml/tests/006.phpt
+++ b/ext/xml/tests/xml006.phpt
@@ -7,8 +7,6 @@ UTF-8<->ISO Latin 1 encoding/decoding test
 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/xml007.phpt
similarity index 85%
rename from ext/xml/tests/007.phpt
rename to ext/xml/tests/xml007.phpt
index c0863d8afea56235c95a390e69620aab3a20dc14..994bbe473e1c5e1b857c52c68e96e00eca2c8837 100644 (file)
--- a/ext/xml/tests/007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -10,8 +10,15 @@ if(strtoupper("
 ?>
 --FILE--
 <?php
-function startHandler($parser,$tag,$attr) { var_dump($tag,$attr); }
-function endHandler($parser,$tag) { var_dump($tag); }
+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');
@@ -19,8 +26,6 @@ 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) {