Trim trailing whitespace in tests

63 files changed, 277 insertions, 277 deletions

diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt
index 40a1c53c9b..96da841004 100644
--- a/ext/xml/tests/bug26528.phpt
+++ b/ext/xml/tests/bug26528.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Bug #26528 (HTML entities are not being decoded)
 --SKIPIF--
-<?php 
+<?php
 require_once("skipif.inc");
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt
index e1df1bbfde..2d94bbfad3 100644
--- a/ext/xml/tests/bug26614.phpt
+++ b/ext/xml/tests/bug26614.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #26614 (CDATA sections skipped on line count)
 --SKIPIF--
-<?php 
+<?php
 require_once("skipif.inc");
-if (defined("LIBXML_VERSION")) die('skip expat test'); 
+if (defined("LIBXML_VERSION")) die('skip expat test');
 ?>
 --FILE--
 <?php
@@ -76,7 +76,7 @@ foreach ($xmls as $desc => $xml) {
 	$xml_parser = xml_parser_create();
 	xml_set_element_handler($xml_parser, "startElement", "endElement");
 	xml_set_character_data_handler($xml_parser, "characterData");
-	if (!xml_parse($xml_parser, $xml, true)) 
+	if (!xml_parse($xml_parser, $xml, true))
 		echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
 	xml_parser_free($xml_parser);
 }
diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt
index 782bdb1936..c88b154f65 100644
--- a/ext/xml/tests/bug26614_libxml.phpt
+++ b/ext/xml/tests/bug26614_libxml.phpt
@@ -1,9 +1,9 @@
 --TEST--
 Bug #26614 (CDATA sections skipped on line count)
 --SKIPIF--
-<?php 
+<?php
 require_once("skipif.inc");
-if (!defined("LIBXML_VERSION")) die('skip libxml2 test'); 
+if (!defined("LIBXML_VERSION")) die('skip libxml2 test');
 ?>
 --FILE--
 <?php
@@ -76,7 +76,7 @@ foreach ($xmls as $desc => $xml) {
 	$xml_parser = xml_parser_create();
 	xml_set_element_handler($xml_parser, "startElement", "endElement");
 	xml_set_character_data_handler($xml_parser, "characterData");
-	if (!xml_parse($xml_parser, $xml, true)) 
+	if (!xml_parse($xml_parser, $xml, true))
 		echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
 	xml_parser_free($xml_parser);
 }
diff --git a/ext/xml/tests/bug27908.phpt b/ext/xml/tests/bug27908.phpt
index e60466fa19..b1e583efa1 100644
--- a/ext/xml/tests/bug27908.phpt
+++ b/ext/xml/tests/bug27908.phpt
@@ -7,14 +7,14 @@ require_once("skipif.inc");
 --FILE--
 <?php
 
-function x_default_handler($xp,$data) 
-{ 
-    echo "x_default_handler $data\n"; 
-} 
-$xp = xml_parser_create(); 
-xml_set_default_handler($xp,'x_default_handler'); 
-xml_parse($xp, '<root></root>',TRUE); 
-xml_parser_free($xp); 
+function x_default_handler($xp,$data)
+{
+    echo "x_default_handler $data\n";
+}
+$xp = xml_parser_create();
+xml_set_default_handler($xp,'x_default_handler');
+xml_parse($xp, '<root></root>',TRUE);
+xml_parser_free($xp);
 echo "Done\n";
 ?>
 --EXPECT--
diff --git a/ext/xml/tests/bug30266.phpt b/ext/xml/tests/bug30266.phpt
index 0a3a5ca46b..2cf0a68cde 100644
--- a/ext/xml/tests/bug30266.phpt
+++ b/ext/xml/tests/bug30266.phpt
@@ -43,7 +43,7 @@ class XML_Parser
 
 $p1 = new Xml_Parser();
 try {
-    $p1->parse('<tag1><tag2></tag2></tag1>'); 
+    $p1->parse('<tag1><tag2></tag2></tag1>');
 } catch (Exception $e) {
 	echo "OK\n";
 }
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 2e9e67d4ca..ff27038a8d 100644
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -122,7 +122,7 @@ HERE;
 		echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size byte(s)\n": "all data at once\n");
 		echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n";
 
-		if ($success) { 
+		if ($success) {
 			var_dump($this->tags);
 		} else {
 			echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
@@ -155,7 +155,7 @@ $suite = array(
 if (XML_SAX_IMPL == 'libxml') {
   echo "libxml2 Version => " . LIBXML_DOTTED_VERSION. "\n";
 } else {
-  echo "libxml2 Version => NONE\n";  
+  echo "libxml2 Version => NONE\n";
 }
 
 foreach ($suite as $testcase) {
diff --git a/ext/xml/tests/bug32001b.phpt b/ext/xml/tests/bug32001b.phpt
index ddf26ce3cb..21c20e40de 100644
--- a/ext/xml/tests/bug32001b.phpt
+++ b/ext/xml/tests/bug32001b.phpt
@@ -78,7 +78,7 @@ HERE;
 		echo "Chunk size: ".($this->chunk_size ? "$this->chunk_size byte(s)\n": "all data at once\n");
 		echo "BOM: ".($this->bom ? 'prepended': 'not prepended'), "\n";
 
-		if ($success) { 
+		if ($success) {
 			var_dump($this->tags);
 		} else {
 			echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
@@ -97,7 +97,7 @@ $suite = array(
 if (XML_SAX_IMPL == 'libxml') {
   echo "libxml2 Version => " . LIBXML_DOTTED_VERSION. "\n";
 } else {
-  echo "libxml2 Version => NONE\n";  
+  echo "libxml2 Version => NONE\n";
 }
 
 foreach ($suite as $testcase) {
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
index 987991e8a8..6d22e5526f 100644
--- a/ext/xml/tests/xml001.phpt
+++ b/ext/xml/tests/xml001.phpt
@@ -16,7 +16,7 @@ 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");
 }
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
index 973431104b..dd5d8d1e44 100644
--- a/ext/xml/tests/xml003.phpt
+++ b/ext/xml/tests/xml003.phpt
@@ -11,7 +11,7 @@ chdir(dirname(__FILE__));
 
 class myclass
 {
-	function startElement($parser, $name, $attribs) 
+	function startElement($parser, $name, $attribs)
 	{
 		print '{'.$name;
 		if (sizeof($attribs)) {
diff --git a/ext/xml/tests/xml010.phpt b/ext/xml/tests/xml010.phpt
index e968442123..511129c699 100644
--- a/ext/xml/tests/xml010.phpt
+++ b/ext/xml/tests/xml010.phpt
@@ -9,7 +9,7 @@ if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is n
 <?php
 function start_elem($parser,$name,$attribs) {
 	print "$name ";
-    
+
     foreach($attribs as $key => $value) {
         print "$key = $value ";
     }
diff --git a/ext/xml/tests/xml_error_string_error.phpt b/ext/xml/tests/xml_error_string_error.phpt
index 866346fdd2..0aa847c5cf 100644
--- a/ext/xml/tests/xml_error_string_error.phpt
+++ b/ext/xml/tests/xml_error_string_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_error_string() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto string xml_error_string(int code)
  * Description: Get XML parser error string 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_error_string() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_error_string_variation1.phpt b/ext/xml/tests/xml_error_string_variation1.phpt
index ff152f8238..39b63e3e35 100644
--- a/ext/xml/tests/xml_error_string_variation1.phpt
+++ b/ext/xml/tests/xml_error_string_variation1.phpt
@@ -3,15 +3,15 @@ Test xml_error_string() function : usage variations  - test different types for
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto string xml_error_string(int code)
  * Description: Get XML parser error string 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_error_string() : usage variations ***\n";
diff --git a/ext/xml/tests/xml_get_current_byte_index_error.phpt b/ext/xml/tests/xml_get_current_byte_index_error.phpt
index 74fa2e7dd1..08a8f1069e 100644
--- a/ext/xml/tests/xml_get_current_byte_index_error.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_byte_index() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_byte_index(resource parser)
  * Description: Get current byte index for an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_byte_index() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
index 9f5393bcae..149eeebe42 100644
--- a/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_byte_index_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_byte_index() function : usage variations  - <type here specifics of this variation>
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_byte_index(resource parser)
  * Description: Get current byte index for an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_byte_index() : usage variations ***\n";
@@ -73,7 +73,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_get_current_column_number_error.phpt b/ext/xml/tests/xml_get_current_column_number_error.phpt
index 1fd28cc0b2..568b6493be 100644
--- a/ext/xml/tests/xml_get_current_column_number_error.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_column_number() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_column_number(resource parser)
  * Description: Get current column number for an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_column_number() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_current_column_number_variation1.phpt b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
index 7431e10843..f421a70c3e 100644
--- a/ext/xml/tests/xml_get_current_column_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_column_number_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_column_number() function : usage variations 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_column_number(resource parser)
  * Description: Get current column number for an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 
@@ -74,7 +74,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_get_current_line_number_error.phpt b/ext/xml/tests/xml_get_current_line_number_error.phpt
index 282c120f0f..1b79a2a704 100644
--- a/ext/xml/tests/xml_get_current_line_number_error.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_line_number() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_line_number(resource parser)
  * Description: Get current line number for an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_line_number() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_current_line_number_variation1.phpt b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
index 4c85f0a13d..4b19de57c9 100644
--- a/ext/xml/tests/xml_get_current_line_number_variation1.phpt
+++ b/ext/xml/tests/xml_get_current_line_number_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_current_line_number() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?>  
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_current_line_number(resource parser)
  * Description: Get current line number for an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_current_line_number() : usage variations ***\n";
@@ -73,7 +73,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_get_error_code_error.phpt b/ext/xml/tests/xml_get_error_code_error.phpt
index 683734ae34..1b58a24ccd 100644
--- a/ext/xml/tests/xml_get_error_code_error.phpt
+++ b/ext/xml/tests/xml_get_error_code_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_error_code() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_error_code(resource parser)
  * Description: Get XML parser error code 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_error_code() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_get_error_code_variation1.phpt b/ext/xml/tests/xml_get_error_code_variation1.phpt
index 58247ac01e..6824870159 100644
--- a/ext/xml/tests/xml_get_error_code_variation1.phpt
+++ b/ext/xml/tests/xml_get_error_code_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_get_error_code() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_get_error_code(resource parser)
  * Description: Get XML parser error code 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_get_error_code() : usage variations ***\n";
@@ -73,7 +73,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parse_error.phpt b/ext/xml/tests/xml_parse_error.phpt
index d8d8fffa80..aa1debdb5a 100644
--- a/ext/xml/tests/xml_parse_error.phpt
+++ b/ext/xml/tests/xml_parse_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse(resource parser, string data [, int isFinal])
  * Description: Start parsing an XML document 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parse_into_struct_error.phpt b/ext/xml/tests/xml_parse_into_struct_error.phpt
index 82a26ad05e..311486f3bb 100644
--- a/ext/xml/tests/xml_parse_into_struct_error.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse_into_struct() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index)
  * Description: Parsing a XML document 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse_into_struct() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parse_into_struct_variation.phpt b/ext/xml/tests/xml_parse_into_struct_variation.phpt
index a353e51419..e78a00ab9e 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse_into_struct() function : variation 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index)
  * Description: Parsing a XML document 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse_into_struct() : variation ***\n";
diff --git a/ext/xml/tests/xml_parse_into_struct_variation1.phpt b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
index e9c41e8f24..bc7c817516 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation1.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse_into_struct() function : usage variations  - different types for parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse_into_struct(resource parser, string data, array &struct, array &index)
  * Description: Parsing a XML document 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse_into_struct() : usage variations ***\n";
@@ -74,7 +74,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parse_variation1.phpt b/ext/xml/tests/xml_parse_variation1.phpt
index 35a3810ad1..69aae7403b 100644
--- a/ext/xml/tests/xml_parse_variation1.phpt
+++ b/ext/xml/tests/xml_parse_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parse() function : usage variations  - different types of parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parse(resource parser, string data [, int isFinal])
  * Description: Start parsing an XML document 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parse() : usage variations ***\n";
@@ -75,7 +75,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parser_create_error.phpt b/ext/xml/tests/xml_parser_create_error.phpt
index 571350e873..820a3c1b1b 100644
--- a/ext/xml/tests/xml_parser_create_error.phpt
+++ b/ext/xml/tests/xml_parser_create_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_create() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create([string encoding])
  * Description: Create an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_create_ns_error.phpt b/ext/xml/tests/xml_parser_create_ns_error.phpt
index fd50f29488..2349e0df3c 100644
--- a/ext/xml/tests/xml_parser_create_ns_error.phpt
+++ b/ext/xml/tests/xml_parser_create_ns_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_create_ns() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create_ns([string encoding [, string sep]])
  * Description: Create an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create_ns() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_create_ns_variation1.phpt b/ext/xml/tests/xml_parser_create_ns_variation1.phpt
index 2818b82fe8..098df877a1 100644
--- a/ext/xml/tests/xml_parser_create_ns_variation1.phpt
+++ b/ext/xml/tests/xml_parser_create_ns_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_create_ns() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create_ns([string encoding [, string sep]])
  * Description: Create an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create_ns() : usage variations ***\n";
@@ -77,7 +77,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
@@ -92,7 +92,7 @@ $values = array(
 
 foreach($values as $value) {
       echo @"\nArg value $value \n";
-      $res = xml_parser_create_ns($value); 
+      $res = xml_parser_create_ns($value);
       var_dump($res);
       if ($res !== false) {
          xml_parser_free($res);
diff --git a/ext/xml/tests/xml_parser_create_variation1.phpt b/ext/xml/tests/xml_parser_create_variation1.phpt
index c5d588fec3..641dbf4578 100644
--- a/ext/xml/tests/xml_parser_create_variation1.phpt
+++ b/ext/xml/tests/xml_parser_create_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_create() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto resource xml_parser_create([string encoding])
  * Description: Create an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_create() : usage variations ***\n";
@@ -77,7 +77,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parser_free_error.phpt b/ext/xml/tests/xml_parser_free_error.phpt
index 13afb95a71..602fa900b1 100644
--- a/ext/xml/tests/xml_parser_free_error.phpt
+++ b/ext/xml/tests/xml_parser_free_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_free() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_free(resource parser)
  * Description: Free an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_free() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_free_variation1.phpt b/ext/xml/tests/xml_parser_free_variation1.phpt
index b488b481b6..5db31f902c 100644
--- a/ext/xml/tests/xml_parser_free_variation1.phpt
+++ b/ext/xml/tests/xml_parser_free_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_free() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_free(resource parser)
  * Description: Free an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_free() : usage variations ***\n";
@@ -73,7 +73,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parser_get_option_error.phpt b/ext/xml/tests/xml_parser_get_option_error.phpt
index a35536934c..ff289e9635 100644
--- a/ext/xml/tests/xml_parser_get_option_error.phpt
+++ b/ext/xml/tests/xml_parser_get_option_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_get_option() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_get_option(resource parser, int option)
  * Description: Get options from an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_get_option() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_get_option_variation1.phpt b/ext/xml/tests/xml_parser_get_option_variation1.phpt
index fd08670d9e..8983c428f2 100644
--- a/ext/xml/tests/xml_parser_get_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_get_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_get_option(resource parser, int option)
  * Description: Get options from an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_get_option() : usage variations ***\n";
@@ -74,7 +74,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parser_get_option_variation2.phpt b/ext/xml/tests/xml_parser_get_option_variation2.phpt
index 367128727c..c792a0a130 100644
--- a/ext/xml/tests/xml_parser_get_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_get_option_variation2.phpt
@@ -3,15 +3,15 @@ Test xml_parser_get_option() function : usage variations
 --SKIPIF--
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_get_option(resource parser, int option)
  * Description: Get options from an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_get_option() : usage variations ***\n";
diff --git a/ext/xml/tests/xml_parser_set_option_basic.phpt b/ext/xml/tests/xml_parser_set_option_basic.phpt
index 61316a4b0f..d51309d022 100644
--- a/ext/xml/tests/xml_parser_set_option_basic.phpt
+++ b/ext/xml/tests/xml_parser_set_option_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_notation_decl_handler function : basic 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool xml_set_notation_decl_handler  ( resource $parser  , callback $handler  )
  * Description: Sets the notation declaration handler function for the XML parser.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "Simple testcase for xml_parser_get_option() function\n";
diff --git a/ext/xml/tests/xml_parser_set_option_error.phpt b/ext/xml/tests/xml_parser_set_option_error.phpt
index 28829bcfa5..9f6498e961 100644
--- a/ext/xml/tests/xml_parser_set_option_error.phpt
+++ b/ext/xml/tests/xml_parser_set_option_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_set_option() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
  * Description: Set options in an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_parser_set_option_variation1.phpt b/ext/xml/tests/xml_parser_set_option_variation1.phpt
index 528fcf8bde..6843fda3f2 100644
--- a/ext/xml/tests/xml_parser_set_option_variation1.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_set_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
  * Description: Set options in an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : usage variations ***\n";
@@ -74,7 +74,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_parser_set_option_variation2.phpt b/ext/xml/tests/xml_parser_set_option_variation2.phpt
index 3432e11d73..40f6edf8c8 100644
--- a/ext/xml/tests/xml_parser_set_option_variation2.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation2.phpt
@@ -1,18 +1,18 @@
 --TEST--
 Test xml_parser_set_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only");
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
  * Description: Set options in an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : usage variations ***\n";
diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt
index c215ef5fde..262a820ce3 100644
--- a/ext/xml/tests/xml_parser_set_option_variation3.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_parser_set_option() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_parser_set_option(resource parser, int option, mixed value)
  * Description: Set options in an XML parser 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_parser_set_option() : usage variations ***\n";
diff --git a/ext/xml/tests/xml_set_character_data_handler_error.phpt b/ext/xml/tests/xml_set_character_data_handler_error.phpt
index 16faaa4f67..d4e91ac2d5 100644
--- a/ext/xml/tests/xml_set_character_data_handler_error.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_character_data_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_character_data_handler(resource parser, string hdl)
  * Description: Set up character data handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_character_data_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
index 2270ded5ea..c06f0a96b5 100644
--- a/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_character_data_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_character_data_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_character_data_handler(resource parser, string hdl)
  * Description: Set up character data handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_character_data_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_default_handler_error.phpt b/ext/xml/tests/xml_set_default_handler_error.phpt
index a4b1b7cbee..9ca7819580 100644
--- a/ext/xml/tests/xml_set_default_handler_error.phpt
+++ b/ext/xml/tests/xml_set_default_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_default_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_default_handler(resource parser, string hdl)
  * Description: Set up default handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_default_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_default_handler_variation1.phpt b/ext/xml/tests/xml_set_default_handler_variation1.phpt
index f4d3175ced..2f9a3d5777 100644
--- a/ext/xml/tests/xml_set_default_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_default_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_default_handler() function : usage variations  - test different types for parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_default_handler(resource parser, string hdl)
  * Description: Set up default handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_default_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_element_handler_error.phpt b/ext/xml/tests/xml_set_element_handler_error.phpt
index 6ccaea1552..00a64163ff 100644
--- a/ext/xml/tests/xml_set_element_handler_error.phpt
+++ b/ext/xml/tests/xml_set_element_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_element_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_element_handler(resource parser, string shdl, string ehdl)
  * Description: Set up start and end element handlers 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_element_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_element_handler_variation1.phpt b/ext/xml/tests/xml_set_element_handler_variation1.phpt
index 4bfd18fa4b..461b8fab6e 100644
--- a/ext/xml/tests/xml_set_element_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_element_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_element_handler() function : usage variations  - test different types for parser
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_element_handler(resource parser, string shdl, string ehdl)
  * Description: Set up start and end element handlers 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_element_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
index 81bb3f6233..4e69c29563 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_end_namespace_decl_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl)
  * Description: Set up character data handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_end_namespace_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
index f8333c236b..c9c9fa862d 100644
--- a/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_end_namespace_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_end_namespace_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_end_namespace_decl_handler(resource parser, string hdl)
  * Description: Set up character data handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_end_namespace_decl_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
index 6dd400ac84..75cfcaabd4 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_external_entity_ref_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_external_entity_ref_handler(resource parser, string hdl)
  * Description: Set up external entity reference handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_external_entity_ref_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
index cd03b5b8b1..f1cef86bf6 100644
--- a/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_external_entity_ref_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_external_entity_ref_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_external_entity_ref_handler(resource parser, string hdl)
  * Description: Set up external entity reference handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_external_entity_ref_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
index 6616681ff8..9414216beb 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_notation_decl_handler function : basic 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool xml_set_notation_decl_handler  ( resource $parser  , callback $handler  )
  * Description: Sets the notation declaration handler function for the XML parser.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class XML_Parser
@@ -26,16 +26,16 @@ class XML_Parser
  		echo "...Public ID=" . $public_ID . "\n";
  		echo "...Notation name=" . $notation_name . "\n";
   	}
-  	
+
   	function notation_decl_handler($parser, $name, $base, $system_ID,$public_ID)
   	{
-  		echo "notation_decl_handler called\n"; 
+  		echo "notation_decl_handler called\n";
  		echo "...Name=" . $name . "\n";
  		echo "...Base=" . $base . "\n";
  		echo "...System ID=" . $system_ID . "\n";
  		echo "...Public ID=" . $public_ID . "\n";
   	}
-    
+
     function parse($data)
     {
         $parser = xml_parser_create();
@@ -59,10 +59,10 @@ $xml = <<<HERE
 ]>
 HERE;
 
-echo "Simple test of xml_set_notation_decl_handler(() function\n"; 
+echo "Simple test of xml_set_notation_decl_handler(() function\n";
 $p1 = new Xml_Parser();
-$p1->parse($xml); 
-echo "Done\n"; 
+$p1->parse($xml);
+echo "Done\n";
 ?>
 --EXPECT--
 Simple test of xml_set_notation_decl_handler(() function
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
index fccc135f76..e3aff7d4f3 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_notation_decl_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_notation_decl_handler(resource parser, string hdl)
  * Description: Set up notation declaration handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_notation_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
index 10910f6530..b7668dd4b0 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_notation_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_notation_decl_handler(resource parser, string hdl)
  * Description: Set up notation declaration handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_notation_decl_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_object_error.phpt b/ext/xml/tests/xml_set_object_error.phpt
index db3266ea13..f9f056ba92 100644
--- a/ext/xml/tests/xml_set_object_error.phpt
+++ b/ext/xml/tests/xml_set_object_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_object() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_object(resource parser, object &obj)
  * Description: Set up object which should be used for callbacks 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_object() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_object_variation1.phpt b/ext/xml/tests/xml_set_object_variation1.phpt
index 92c3d875f0..2c90b8cc38 100644
--- a/ext/xml/tests/xml_set_object_variation1.phpt
+++ b/ext/xml/tests/xml_set_object_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_object() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_object(resource parser, object &obj)
  * Description: Set up object which should be used for callbacks 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_object() : usage variations ***\n";
@@ -74,7 +74,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_object_variation2.phpt b/ext/xml/tests/xml_set_object_variation2.phpt
index 739c091241..fe428ec8a1 100644
--- a/ext/xml/tests/xml_set_object_variation2.phpt
+++ b/ext/xml/tests/xml_set_object_variation2.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_object() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_object(resource parser, object &obj)
  * Description: Set up object which should be used for callbacks 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_object() : usage variations ***\n";
@@ -66,7 +66,7 @@ $values = array(
       // string data
       "string",
       'string',
-      
+
       // resource data
       $fp,       
 
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
index e5589cee29..61193c079f 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
@@ -1,28 +1,28 @@
 --TEST--
 Test xml_set_processing_instruction_handler function : basic 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto bool xml_set_processing_instruction_handler  ( resource $parser  , callback $handler  )
  * Description: Sets the processing instruction (PI) handler function for the XML parser.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 class XML_Parser
 {
-    
+
     function PIHandler($parser, $target, $data)
 	{
 		echo "Target: " . $target. "\n";
 		echo "Data: " . $data . "\n";
 	}
-    
+
     function parse($data)
     {
         $parser = xml_parser_create();
@@ -32,7 +32,7 @@ class XML_Parser
         xml_parser_free($parser);
     }
 
- 
+
 }
 
 $xml = <<<HERE
@@ -40,10 +40,10 @@ $xml = <<<HERE
 <?xml-stylesheet href="default.xsl" type="text/xml"?>
 HERE;
 
-echo "Simple test of xml_set_processing_instruction_handler() function\n"; 
+echo "Simple test of xml_set_processing_instruction_handler() function\n";
 $p1 = new Xml_Parser();
-$p1->parse($xml); 
-echo "Done\n"; 
+$p1->parse($xml);
+echo "Done\n";
 ?>
 --EXPECT--
 Simple test of xml_set_processing_instruction_handler() function
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
index f2a8494d54..0d6deb9fd8 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_processing_instruction_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_processing_instruction_handler(resource parser, string hdl)
  * Description: Set up processing instruction (PI) handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_processing_instruction_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
index a05d0e60e7..227337b338 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_processing_instruction_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_processing_instruction_handler(resource parser, string hdl)
  * Description: Set up processing instruction (PI) handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_processing_instruction_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
index 79b8cb88fc..9fa02f66ab 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_basic.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_start_namespace_decl_handler function: basic 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : bool xml_set_start_namespace_decl_handler  ( resource $parser  , callback $handler  )
  * Description: Set up start namespace declaration handler.
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 $xml = <<<HERE
@@ -34,13 +34,13 @@ xml_parser_free( $parser );
 echo "Done\n";
 
 function Namespace_Start_Handler( $parser, $prefix, $uri ) {
-	echo "Namespace_Start_Handler called\n"; 
+	echo "Namespace_Start_Handler called\n";
  	echo "...Prefix: ". $prefix . "\n";
  	echo "...Uri: ". $uri . "\n";
 }
 
 function Namespace_End_Handler($parser, $prefix) {
-	echo "Namespace_End_Handler called\n"; 
+	echo "Namespace_End_Handler called\n";
  	echo "...Prefix: ". $prefix . "\n\n";
 }
 
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
index 221b005dfd..3b4163e1ef 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_start_namespace_decl_handler() function : error conditions 
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl)
  * Description: Set up character data handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_start_namespace_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
index 5139499f1d..90faa2caf2 100644
--- a/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_start_namespace_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_start_namespace_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_start_namespace_decl_handler(resource parser, string hdl)
  * Description: Set up character data handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_start_namespace_decl_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp, 
 
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
index 952a6984b4..a8119ca344 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_error.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_unparsed_entity_decl_handler() function : error conditions
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
-?> 
+	print "skip - XML extension not loaded";
+}
+?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl)
  * Description: Set up unparsed entity declaration handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_unparsed_entity_decl_handler() : error conditions ***\n";
diff --git a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
index b5d822ed89..1f9fe4bfd3 100644
--- a/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
+++ b/ext/xml/tests/xml_set_unparsed_entity_decl_handler_variation1.phpt
@@ -1,17 +1,17 @@
 --TEST--
 Test xml_set_unparsed_entity_decl_handler() function : usage variations
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded"; 
-}	 
+	print "skip - XML extension not loaded";
+}
 ?>
 --FILE--
 <?php
 /* Prototype  : proto int xml_set_unparsed_entity_decl_handler(resource parser, string hdl)
  * Description: Set up unparsed entity declaration handler 
  * Source code: ext/xml/xml.c
- * Alias to functions: 
+ * Alias to functions:
  */
 
 echo "*** Testing xml_set_unparsed_entity_decl_handler() : usage variations ***\n";
@@ -78,7 +78,7 @@ $values = array(
 
       // object data
       new aClass(),
-      
+
       // resource data
       $fp,