Reindent phpt files

19 files changed, 379 insertions, 379 deletions

diff --git a/ext/xml/tests/bug25666.phpt b/ext/xml/tests/bug25666.phpt
index e162d5a2bd..ca4b15f405 100644
--- a/ext/xml/tests/bug25666.phpt
+++ b/ext/xml/tests/bug25666.phpt
@@ -8,7 +8,7 @@ if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is n
 --FILE--
 <?php
 function start_elem($parser,$name,$attribs) {
-	var_dump($name);
+    var_dump($name);
 }
 function end_elem()
 {
@@ -17,7 +17,7 @@ function end_elem()
 $xml = <<<HERE
 <foo:a xmlns:foo="http://example.com/foo"
        xmlns:bar="http://example.com/bar"
-	   xmlns:baz="http://example.com/baz">
+       xmlns:baz="http://example.com/baz">
   <bar:b />
   <baz:c />
 </foo>
diff --git a/ext/xml/tests/bug26528.phpt b/ext/xml/tests/bug26528.phpt
index 96da841004..152a18540d 100644
--- a/ext/xml/tests/bug26528.phpt
+++ b/ext/xml/tests/bug26528.phpt
@@ -6,11 +6,11 @@ require_once("skipif.inc");
 ?>
 --FILE--
 <?php
-	$sample = "<?xml version=\"1.0\"?><test attr=\"angle&lt;bracket\"/>";
-	$parser = xml_parser_create();
-	$res = xml_parse_into_struct($parser,$sample,$vals,$index);
-	xml_parser_free($parser);
-	var_dump($vals);
+    $sample = "<?xml version=\"1.0\"?><test attr=\"angle&lt;bracket\"/>";
+    $parser = xml_parser_create();
+    $res = xml_parse_into_struct($parser,$sample,$vals,$index);
+    xml_parser_free($parser);
+    var_dump($vals);
 ?>
 --EXPECT--
 array(1) {
diff --git a/ext/xml/tests/bug26614.phpt b/ext/xml/tests/bug26614.phpt
index c95997a8a6..ed42bc1fbf 100644
--- a/ext/xml/tests/bug26614.phpt
+++ b/ext/xml/tests/bug26614.phpt
@@ -25,7 +25,7 @@ $xmls["CDATA"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 <![CDATA[
 multi
-line 
+line
 CDATA
 block
 ]]>
@@ -36,7 +36,7 @@ $xmls["Comment"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 <!-- ATA[
 multi
-line 
+line
 CDATA
 block
 -->
@@ -47,7 +47,7 @@ $xmls["Text"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 -!-- ATA[
 multi
-line 
+line
 CDATA
 block
 ---
@@ -55,16 +55,16 @@ block
 
 function startElement($parser, $name, $attrs) {
     printf("<$name> at line %d, col %d (byte %d)\n",
-		       xml_get_current_line_number($parser),
-		       xml_get_current_column_number($parser),
-		       xml_get_current_byte_index($parser));
+               xml_get_current_line_number($parser),
+               xml_get_current_column_number($parser),
+               xml_get_current_byte_index($parser));
 }
 
 function endElement($parser, $name) {
     printf("</$name> at line %d, col %d (byte %d)\n",
-		       xml_get_current_line_number($parser),
-		       xml_get_current_column_number($parser),
-		       xml_get_current_byte_index($parser));
+               xml_get_current_line_number($parser),
+               xml_get_current_column_number($parser),
+               xml_get_current_byte_index($parser));
 }
 
 function characterData($parser, $data) {
@@ -73,12 +73,12 @@ function characterData($parser, $data) {
 
 foreach ($xmls as $desc => $xml) {
   echo "$desc\n";
-	$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))
-		echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
-	xml_parser_free($xml_parser);
+    $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))
+        echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
+    xml_parser_free($xml_parser);
 }
 ?>
 --EXPECT--
diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt
index e479699a8f..b6c0b87581 100644
--- a/ext/xml/tests/bug26614_libxml.phpt
+++ b/ext/xml/tests/bug26614_libxml.phpt
@@ -55,16 +55,16 @@ block
 
 function startElement($parser, $name, $attrs) {
     printf("<$name> at line %d, col %d (byte %d)\n",
-		       xml_get_current_line_number($parser),
-		       xml_get_current_column_number($parser),
-		       xml_get_current_byte_index($parser));
+               xml_get_current_line_number($parser),
+               xml_get_current_column_number($parser),
+               xml_get_current_byte_index($parser));
 }
 
 function endElement($parser, $name) {
     printf("</$name> at line %d, col %d (byte %d)\n",
-		       xml_get_current_line_number($parser),
-		       xml_get_current_column_number($parser),
-		       xml_get_current_byte_index($parser));
+               xml_get_current_line_number($parser),
+               xml_get_current_column_number($parser),
+               xml_get_current_byte_index($parser));
 }
 
 function characterData($parser, $data) {
@@ -73,12 +73,12 @@ function characterData($parser, $data) {
 
 foreach ($xmls as $desc => $xml) {
   echo "$desc\n";
-	$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))
-		echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
-	xml_parser_free($xml_parser);
+    $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))
+        echo "Error: ".xml_error_string(xml_get_error_code($xml_parser))."\n";
+    xml_parser_free($xml_parser);
 }
 ?>
 --EXPECTF--
diff --git a/ext/xml/tests/bug30266.phpt b/ext/xml/tests/bug30266.phpt
index 2cf0a68cde..a7fe7592fe 100644
--- a/ext/xml/tests/bug30266.phpt
+++ b/ext/xml/tests/bug30266.phpt
@@ -33,7 +33,7 @@ class XML_Parser
     function startHandler($XmlParser, $tag, $attr)
     {
             $this->dummy = "b";
-		    throw new Exception("ex");
+            throw new Exception("ex");
     }
 
     function endHandler($XmlParser, $tag)
@@ -45,7 +45,7 @@ $p1 = new Xml_Parser();
 try {
     $p1->parse('<tag1><tag2></tag2></tag1>');
 } catch (Exception $e) {
-	echo "OK\n";
+    echo "OK\n";
 }
 ?>
 --EXPECT--
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 2e2f4643d5..5ced128940 100644
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -10,146 +10,146 @@ if (ICONV_IMPL == 'glibc' && version_compare(ICONV_VERSION, '2.12', '<='))
 --FILE--
 <?php
 class testcase {
-	private $encoding;
-	private $bom;
-	private $prologue;
-	private $tags;
-	private $chunk_size;
+    private $encoding;
+    private $bom;
+    private $prologue;
+    private $tags;
+    private $chunk_size;
 
-	function __construct($enc, $chunk_size = 0, $bom = 0, $omit_prologue = 0) {
-		$this->encoding = $enc;
-		$this->chunk_size = $chunk_size;
-		$this->bom = $bom;
-		$this->prologue = !$omit_prologue;
-		$this->tags = array();
-	}
+    function __construct($enc, $chunk_size = 0, $bom = 0, $omit_prologue = 0) {
+        $this->encoding = $enc;
+        $this->chunk_size = $chunk_size;
+        $this->bom = $bom;
+        $this->prologue = !$omit_prologue;
+        $this->tags = array();
+    }
 
-	function start_element($parser, $name, $attrs) {
-		$attrs = array_map('bin2hex', $attrs);
-		$this->tags[] = bin2hex($name).": ".implode(', ', $attrs);
-	}
+    function start_element($parser, $name, $attrs) {
+        $attrs = array_map('bin2hex', $attrs);
+        $this->tags[] = bin2hex($name).": ".implode(', ', $attrs);
+    }
 
-	function end_element($parser, $name) {
-	}
+    function end_element($parser, $name) {
+    }
 
-	function run() {
-		$data = '';
+    function run() {
+        $data = '';
 
-		if ($this->prologue) {
-			$canonical_name = preg_replace('/BE|LE/i', '', $this->encoding);
-			$data .= "<?xml version=\"1.0\" encoding=\"$canonical_name\" ?>\n";
-		}
+        if ($this->prologue) {
+            $canonical_name = preg_replace('/BE|LE/i', '', $this->encoding);
+            $data .= "<?xml version=\"1.0\" encoding=\"$canonical_name\" ?>\n";
+        }
 
-		$data .= <<<HERE
+        $data .= <<<HERE
 <テスト:テスト1 xmlns:テスト="http://www.example.com/テスト/" テスト="テスト">
   <テスト:テスト2 テスト="テスト">
-	<テスト:テスト3>
-	  test! 
-	</テスト:テスト3>
+    <テスト:テスト3>
+      test!
+    </テスト:テスト3>
   </テスト:テスト2>
 </テスト:テスト1>
 HERE;
 
-		$data = iconv("UTF-8", $this->encoding, $data);
+        $data = iconv("UTF-8", $this->encoding, $data);
 
-		if ($this->bom) {
-			switch (strtoupper($this->encoding)) {
-				case 'UTF-8':
-				case 'UTF8':
-					$data = "\xef\xbb\xbf".$data;
-					break;
+        if ($this->bom) {
+            switch (strtoupper($this->encoding)) {
+                case 'UTF-8':
+                case 'UTF8':
+                    $data = "\xef\xbb\xbf".$data;
+                    break;
 
-				case 'UTF-16':
-				case 'UTF16':
-				case 'UTF-16BE':
-				case 'UTF16BE':
-				case 'UCS-2':
-				case 'UCS2':
-				case 'UCS-2BE':
-				case 'UCS2BE':
-					$data = "\xfe\xff".$data;
-					break;
+                case 'UTF-16':
+                case 'UTF16':
+                case 'UTF-16BE':
+                case 'UTF16BE':
+                case 'UCS-2':
+                case 'UCS2':
+                case 'UCS-2BE':
+                case 'UCS2BE':
+                    $data = "\xfe\xff".$data;
+                    break;
 
-				case 'UTF-16LE':
-				case 'UTF16LE':
-				case 'UCS-2LE':
-				case 'UCS2LE':
-					$data = "\xff\xfe".$data;
-					break;
+                case 'UTF-16LE':
+                case 'UTF16LE':
+                case 'UCS-2LE':
+                case 'UCS2LE':
+                    $data = "\xff\xfe".$data;
+                    break;
 
-				case 'UTF-32':
-				case 'UTF32':
-				case 'UTF-32BE':
-				case 'UTF32BE':
-				case 'UCS-4':
-				case 'UCS4':
-				case 'UCS-4BE':
-				case 'UCS4BE':
-					$data = "\x00\x00\xfe\xff".$data;
-					break;
+                case 'UTF-32':
+                case 'UTF32':
+                case 'UTF-32BE':
+                case 'UTF32BE':
+                case 'UCS-4':
+                case 'UCS4':
+                case 'UCS-4BE':
+                case 'UCS4BE':
+                    $data = "\x00\x00\xfe\xff".$data;
+                    break;
 
-				case 'UTF-32LE':
-				case 'UTF32LE':
-				case 'UCS-4LE':
-				case 'UCS4LE':
-					$data = "\xff\xfe\x00\x00".$data;
-					break;
-			}
-		}
+                case 'UTF-32LE':
+                case 'UTF32LE':
+                case 'UCS-4LE':
+                case 'UCS4LE':
+                    $data = "\xff\xfe\x00\x00".$data;
+                    break;
+            }
+        }
 
-		$parser = xml_parser_create(NULL);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_set_element_handler($parser, "start_element", "end_element");
-		xml_set_object($parser, $this);
+        $parser = xml_parser_create(NULL);
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_set_element_handler($parser, "start_element", "end_element");
+        xml_set_object($parser, $this);
 
-		if ($this->chunk_size == 0) {
-			$success = @xml_parse($parser, $data, true);
-		} else {
-			for ($offset = 0; $offset < strlen($data);
-					$offset += $this->chunk_size) {
-				$success = @xml_parse($parser, substr($data, $offset, $this->chunk_size), false);
-				if (!$success) {
-					break;
-				}
-			}
-			if ($success) {
-				$success = @xml_parse($parser, "", true);
-			}
-		}
+        if ($this->chunk_size == 0) {
+            $success = @xml_parse($parser, $data, true);
+        } else {
+            for ($offset = 0; $offset < strlen($data);
+                    $offset += $this->chunk_size) {
+                $success = @xml_parse($parser, substr($data, $offset, $this->chunk_size), false);
+                if (!$success) {
+                    break;
+                }
+            }
+            if ($success) {
+                $success = @xml_parse($parser, "", true);
+            }
+        }
 
-		echo "Encoding: $this->encoding\n";
-		echo "XML Prologue: ".($this->prologue ? 'present': 'not present'), "\n";
-		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";
+        echo "Encoding: $this->encoding\n";
+        echo "XML Prologue: ".($this->prologue ? 'present': 'not present'), "\n";
+        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) {
-			var_dump($this->tags);
-		} else {
-			echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
-		}
-	}
+        if ($success) {
+            var_dump($this->tags);
+        } else {
+            echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
+        }
+    }
 }
 $suite = array(
-	new testcase("UTF-8",     0, 0, 0),
-	new testcase("UTF-8",     0, 0, 1),
-	new testcase("UTF-8",     0, 1, 0),
-	new testcase("UTF-8",     0, 1, 1),
-	new testcase("UTF-16BE",  0, 0, 0),
-	new testcase("UTF-16BE",  0, 1, 0),
-	new testcase("UTF-16BE",  0, 1, 1),
-	new testcase("UTF-16LE",  0, 0, 0),
-	new testcase("UTF-16LE",  0, 1, 0),
-	new testcase("UTF-16LE",  0, 1, 1),
-	new testcase("UTF-8",     1, 0, 0),
-	new testcase("UTF-8",     1, 0, 1),
-	new testcase("UTF-8",     1, 1, 0),
-	new testcase("UTF-8",     1, 1, 1),
-	new testcase("UTF-16BE",  1, 0, 0),
-	new testcase("UTF-16BE",  1, 1, 0),
-	new testcase("UTF-16BE",  1, 1, 1),
-	new testcase("UTF-16LE",  1, 0, 0),
-	new testcase("UTF-16LE",  1, 1, 0),
-	new testcase("UTF-16LE",  1, 1, 1),
+    new testcase("UTF-8",     0, 0, 0),
+    new testcase("UTF-8",     0, 0, 1),
+    new testcase("UTF-8",     0, 1, 0),
+    new testcase("UTF-8",     0, 1, 1),
+    new testcase("UTF-16BE",  0, 0, 0),
+    new testcase("UTF-16BE",  0, 1, 0),
+    new testcase("UTF-16BE",  0, 1, 1),
+    new testcase("UTF-16LE",  0, 0, 0),
+    new testcase("UTF-16LE",  0, 1, 0),
+    new testcase("UTF-16LE",  0, 1, 1),
+    new testcase("UTF-8",     1, 0, 0),
+    new testcase("UTF-8",     1, 0, 1),
+    new testcase("UTF-8",     1, 1, 0),
+    new testcase("UTF-8",     1, 1, 1),
+    new testcase("UTF-16BE",  1, 0, 0),
+    new testcase("UTF-16BE",  1, 1, 0),
+    new testcase("UTF-16BE",  1, 1, 1),
+    new testcase("UTF-16LE",  1, 0, 0),
+    new testcase("UTF-16LE",  1, 1, 0),
+    new testcase("UTF-16LE",  1, 1, 1),
 );
 
 if (XML_SAX_IMPL == 'libxml') {
@@ -159,7 +159,7 @@ if (XML_SAX_IMPL == 'libxml') {
 }
 
 foreach ($suite as $testcase) {
-	$testcase->run();
+    $testcase->run();
 }
 
 ?>
diff --git a/ext/xml/tests/bug32001b.phpt b/ext/xml/tests/bug32001b.phpt
index 3a3c11a3ba..a7762fffca 100644
--- a/ext/xml/tests/bug32001b.phpt
+++ b/ext/xml/tests/bug32001b.phpt
@@ -11,87 +11,87 @@ foreach(array('EUC-JP', 'Shift_JISP', 'GB2312') as $encoding) {
 --FILE--
 <?php
 class testcase {
-	private $encoding;
-	private $bom;
-	private $prologue;
-	private $tags;
-	private $chunk_size;
+    private $encoding;
+    private $bom;
+    private $prologue;
+    private $tags;
+    private $chunk_size;
 
-	function testcase($enc, $chunk_size = 0, $bom = 0, $omit_prologue = 0) {
-		$this->encoding = $enc;
-		$this->chunk_size = $chunk_size;
-		$this->bom = $bom;
-		$this->prologue = !$omit_prologue;
-		$this->tags = array();
-	}
+    function testcase($enc, $chunk_size = 0, $bom = 0, $omit_prologue = 0) {
+        $this->encoding = $enc;
+        $this->chunk_size = $chunk_size;
+        $this->bom = $bom;
+        $this->prologue = !$omit_prologue;
+        $this->tags = array();
+    }
 
-	function start_element($parser, $name, $attrs) {
-		$attrs = array_map('bin2hex', $attrs);
-		$this->tags[] = bin2hex($name).": ".implode(', ', $attrs);
-	}
+    function start_element($parser, $name, $attrs) {
+        $attrs = array_map('bin2hex', $attrs);
+        $this->tags[] = bin2hex($name).": ".implode(', ', $attrs);
+    }
 
-	function end_element($parser, $name) {
-	}
+    function end_element($parser, $name) {
+    }
 
-	function run() {
-		$data = '';
+    function run() {
+        $data = '';
 
-		if ($this->prologue) {
-			$canonical_name = preg_replace('/BE|LE/i', '', $this->encoding);
-			$data .= "<?xml version=\"1.0\" encoding=\"$canonical_name\" ?>\n";
-		}
+        if ($this->prologue) {
+            $canonical_name = preg_replace('/BE|LE/i', '', $this->encoding);
+            $data .= "<?xml version=\"1.0\" encoding=\"$canonical_name\" ?>\n";
+        }
 
-		$data .= <<<HERE
+        $data .= <<<HERE
 <テスト:テスト1 xmlns:テスト="http://www.example.com/テスト/" テスト="テスト">
   <テスト:テスト2 テスト="テスト">
-	<テスト:テスト3>
-	  test! 
-	</テスト:テスト3>
+    <テスト:テスト3>
+      test!
+    </テスト:テスト3>
   </テスト:テスト2>
 </テスト:テスト1>
 HERE;
 
-		$data = iconv("UTF-8", $this->encoding, $data);
+        $data = iconv("UTF-8", $this->encoding, $data);
 
-		$parser = xml_parser_create(NULL);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-		xml_set_element_handler($parser, "start_element", "end_element");
-		xml_set_object($parser, $this);
+        $parser = xml_parser_create(NULL);
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_set_element_handler($parser, "start_element", "end_element");
+        xml_set_object($parser, $this);
 
-		if ($this->chunk_size == 0) {
-			$success = @xml_parse($parser, $data, true);
-		} else {
-			for ($offset = 0; $offset < strlen($data);
-					$offset += $this->chunk_size) {
-				$success = @xml_parse($parser, substr($data, $offset, $this->chunk_size), false);
-				if (!$success) {
-					break;
-				}
-			}
-			if ($success) {
-				$success = @xml_parse($parser, "", true);
-			}
-		}
+        if ($this->chunk_size == 0) {
+            $success = @xml_parse($parser, $data, true);
+        } else {
+            for ($offset = 0; $offset < strlen($data);
+                    $offset += $this->chunk_size) {
+                $success = @xml_parse($parser, substr($data, $offset, $this->chunk_size), false);
+                if (!$success) {
+                    break;
+                }
+            }
+            if ($success) {
+                $success = @xml_parse($parser, "", true);
+            }
+        }
 
-		echo "Encoding: $this->encoding\n";
-		echo "XML Prologue: ".($this->prologue ? 'present': 'not present'), "\n";
-		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";
+        echo "Encoding: $this->encoding\n";
+        echo "XML Prologue: ".($this->prologue ? 'present': 'not present'), "\n";
+        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) {
-			var_dump($this->tags);
-		} else {
-			echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
-		}
-	}
+        if ($success) {
+            var_dump($this->tags);
+        } else {
+            echo "[Error] ", xml_error_string(xml_get_error_code($parser)), "\n";
+        }
+    }
 }
 $suite = array(
-	new testcase("EUC-JP"  ,  0),
-	new testcase("EUC-JP"  ,  1),
-	new testcase("Shift_JIS", 0),
-	new testcase("Shift_JIS", 1),
-	new testcase("GB2312",    0),
-	new testcase("GB2312",    1),
+    new testcase("EUC-JP"  ,  0),
+    new testcase("EUC-JP"  ,  1),
+    new testcase("Shift_JIS", 0),
+    new testcase("Shift_JIS", 1),
+    new testcase("GB2312",    0),
+    new testcase("GB2312",    1),
 );
 
 if (XML_SAX_IMPL == 'libxml') {
@@ -101,7 +101,7 @@ if (XML_SAX_IMPL == 'libxml') {
 }
 
 foreach ($suite as $testcase) {
-	$testcase->run();
+    $testcase->run();
 }
 
 ?>
diff --git a/ext/xml/tests/bug76874.phpt b/ext/xml/tests/bug76874.phpt
index c4377f0b88..ec0caae706 100644
--- a/ext/xml/tests/bug76874.phpt
+++ b/ext/xml/tests/bug76874.phpt
@@ -7,19 +7,19 @@ Bug #76874: xml_parser_free() should never leak memory
 
 class c
 {
-	private $xml;
-	private $test;
+    private $xml;
+    private $test;
 
-	public function test()
-	{
-		$this->xml = xml_parser_create();
-		xml_set_character_data_handler($this->xml, array(&$this, 'handle_cdata'));
-		xml_parser_free($this->xml);
-	}
+    public function test()
+    {
+        $this->xml = xml_parser_create();
+        xml_set_character_data_handler($this->xml, array(&$this, 'handle_cdata'));
+        xml_parser_free($this->xml);
+    }
 
-	public function handle_cdata(&$parser, $data)
-	{
-	}
+    public function handle_cdata(&$parser, $data)
+    {
+    }
 }
 
 $object = new c();
diff --git a/ext/xml/tests/xml001.phpt b/ext/xml/tests/xml001.phpt
index e859a4bbcb..2d8fe54041 100644
--- a/ext/xml/tests/xml001.phpt
+++ b/ext/xml/tests/xml001.phpt
@@ -22,54 +22,54 @@ 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)) {
+    print '{'.$name;
+    if (sizeof($attribs)) {
         foreach ($attribs as $k => $v) {
-			print " $k=\"$v\"";
-		}
-	}
-	print '}';
+            print " $k=\"$v\"";
+        }
+    }
+    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)
 {
-	print '{EXTENTREF['.$openEntityNames.','.$base.','.$systemId.','.$publicId."]}\n";
-	return true;
+    print '{EXTENTREF['.$openEntityNames.','.$base.','.$systemId.','.$publicId."]}\n";
+    return true;
 }
 
 ?>
diff --git a/ext/xml/tests/xml002.phpt b/ext/xml/tests/xml002.phpt
index e183fa4ae3..27a920cedd 100644
--- a/ext/xml/tests/xml002.phpt
+++ b/ext/xml/tests/xml002.phpt
@@ -11,41 +11,41 @@ chdir(__DIR__);
 
 class myclass
 {
-	function startElement($parser, $name, $attribs)
-	{
-		print '{'.$name;
-		if (sizeof($attribs)) {
+    function startElement($parser, $name, $attribs)
+    {
+        print '{'.$name;
+        if (sizeof($attribs)) {
             foreach ($attribs as $k => $v) {
-				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;
-	}
+                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();
@@ -60,15 +60,15 @@ xml_set_external_entity_ref_handler($xml_parser,
 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);
diff --git a/ext/xml/tests/xml003.phpt b/ext/xml/tests/xml003.phpt
index fb4cbbd29e..08db287c18 100644
--- a/ext/xml/tests/xml003.phpt
+++ b/ext/xml/tests/xml003.phpt
@@ -11,41 +11,41 @@ chdir(__DIR__);
 
 class myclass
 {
-	function startElement($parser, $name, $attribs)
-	{
-		print '{'.$name;
-		if (sizeof($attribs)) {
+    function startElement($parser, $name, $attribs)
+    {
+        print '{'.$name;
+        if (sizeof($attribs)) {
             foreach ($attribs as $k => $v) {
-				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;
-	}
+                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();
@@ -59,15 +59,15 @@ 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);
diff --git a/ext/xml/tests/xml004.phpt b/ext/xml/tests/xml004.phpt
index 1e545db2a1..3d5adaa56b 100644
--- a/ext/xml/tests/xml004.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,24 @@ 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)) {
+    print "<$elem";
+    if (sizeof($attribs)) {
         foreach ($attribs as $k => $v) {
-			print " $k=\"$v\"";
-		}
-	}
-	print ">\n";
+            print " $k=\"$v\"";
+        }
+    }
+    print ">\n";
 }
 
 function end_element($xp, $elem)
 {
-	print "</$elem>\n";
+    print "</$elem>\n";
 }
 ?>
 --EXPECT--
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
index f19f0389b6..5b76dfc848 100644
--- a/ext/xml/tests/xml007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -12,12 +12,12 @@ if(strtoupper("äöüß") != "ÄÖÜß")
 <?php
 function startHandler($parser,$tag,$attr)
 {
-	var_dump($tag,$attr);
+    var_dump($tag,$attr);
 }
 
 function endHandler($parser,$tag)
 {
-	var_dump($tag);
+    var_dump($tag);
 }
 
 $xmldata = '<?xml version="1.0" encoding="ISO-8859-1"?><äöü üäß="Üäß">ÄÖÜ</äöü>';
diff --git a/ext/xml/tests/xml009.phpt b/ext/xml/tests/xml009.phpt
index 7143a9faf7..8a33a4e715 100644
--- a/ext/xml/tests/xml009.phpt
+++ b/ext/xml/tests/xml009.phpt
@@ -8,7 +8,7 @@ if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is n
 --FILE--
 <?php
 function start_elem($parser,$name,$attribs) {
-	var_dump($name);
+    var_dump($name);
 }
 function end_elem()
 {
@@ -17,7 +17,7 @@ function end_elem()
 $xml = <<<HERE
 <a xmlns="http://example.com/foo"
        xmlns:bar="http://example.com/bar"
-	   xmlns:baz="http://example.com/baz">
+       xmlns:baz="http://example.com/baz">
   <bar:b />
   <bar:c xmlns:bar="http://example.com/foo"/>
 </a>
diff --git a/ext/xml/tests/xml010.phpt b/ext/xml/tests/xml010.phpt
index e4b4dd6520..69e8469fa6 100644
--- a/ext/xml/tests/xml010.phpt
+++ b/ext/xml/tests/xml010.phpt
@@ -8,7 +8,7 @@ if (! @xml_parser_create_ns('ISO-8859-1')) { die("skip xml_parser_create_ns is n
 --FILE--
 <?php
 function start_elem($parser,$name,$attribs) {
-	print "$name ";
+    print "$name ";
 
     foreach($attribs as $key => $value) {
         print "$key = $value ";
diff --git a/ext/xml/tests/xml_closures_001.phpt b/ext/xml/tests/xml_closures_001.phpt
index da9d849da5..c1f91d50d5 100644
--- a/ext/xml/tests/xml_closures_001.phpt
+++ b/ext/xml/tests/xml_closures_001.phpt
@@ -8,18 +8,18 @@ chdir(__DIR__);
 
 $start_element = function ($xp, $elem, $attribs)
 {
-	print "<$elem";
-	if (sizeof($attribs)) {
+    print "<$elem";
+    if (sizeof($attribs)) {
         foreach ($attribs as $k => $v) {
-			print " $k=\"$v\"";
-		}
-	}
-	print ">\n";
+            print " $k=\"$v\"";
+        }
+    }
+    print ">\n";
 };
 
 $end_element = function ($xp, $elem)
 {
-	print "</$elem>\n";
+    print "</$elem>\n";
 };
 
 $xp = xml_parser_create();
@@ -27,7 +27,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);
 
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 a4ea86375e..c7b8b09049 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
@@ -18,23 +18,23 @@ class XML_Parser
 {
 
     function unparsed_entity_decl_handler($parser, $entity_name, $base, $system_ID, $public_ID, $notation_name)
-  	{
-  		echo "unparsed_entity_decl_handler called\n";
- 		echo "...Entity name=" . $entity_name . "\n";
- 		echo "...Base=" . $base . "\n";
- 		echo "...System ID=" . $system_ID . "\n";
- 		echo "...Public ID=" . $public_ID . "\n";
- 		echo "...Notation name=" . $notation_name . "\n";
-  	}
+    {
+        echo "unparsed_entity_decl_handler called\n";
+        echo "...Entity name=" . $entity_name . "\n";
+        echo "...Base=" . $base . "\n";
+        echo "...System ID=" . $system_ID . "\n";
+        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 "...Name=" . $name . "\n";
- 		echo "...Base=" . $base . "\n";
- 		echo "...System ID=" . $system_ID . "\n";
- 		echo "...Public ID=" . $public_ID . "\n";
-  	}
+    function notation_decl_handler($parser, $name, $base, $system_ID,$public_ID)
+    {
+        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)
     {
@@ -54,8 +54,8 @@ $xml = <<<HERE
     <!NOTATION AUSDATE SYSTEM "http://www.schema.net/ausdate.not">
     <!NOTATION ISODATE SYSTEM "http://www.schema.net/isodate.not">
     <!ENTITY testUS  SYSTEM "test_usdate.xml" NDATA USDATE>
-	<!ENTITY testAUS SYSTEM "test_ausdate.xml" NDATA AUSDATE>
-	<!ENTITY testISO SYSTEM "test_isodate_xml" NDATA ISODATE>]>
+    <!ENTITY testAUS SYSTEM "test_ausdate.xml" NDATA AUSDATE>
+    <!ENTITY testISO SYSTEM "test_isodate_xml" NDATA ISODATE>]>
 ]>
 HERE;
 
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 cd5dda7763..f13c52517f 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
@@ -18,10 +18,10 @@ class XML_Parser
 {
 
     function PIHandler($parser, $target, $data)
-	{
-		echo "Target: " . $target. "\n";
-		echo "Data: " . $data . "\n";
-	}
+    {
+        echo "Target: " . $target. "\n";
+        echo "Data: " . $data . "\n";
+    }
 
     function parse($data)
     {
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 8ee12e77cd..8d75d2099c 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
@@ -34,14 +34,14 @@ xml_parser_free( $parser );
 echo "Done\n";
 
 function Namespace_Start_Handler( $parser, $prefix, $uri ) {
-	echo "Namespace_Start_Handler called\n";
- 	echo "...Prefix: ". $prefix . "\n";
- 	echo "...Uri: ". $uri . "\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 "...Prefix: ". $prefix . "\n\n";
+    echo "Namespace_End_Handler called\n";
+    echo "...Prefix: ". $prefix . "\n\n";
 }
 
 function DefaultHandler( $parser, $data ) {