diff --git a/Zend/tests/attributes/001_placement.phpt b/Zend/tests/attributes/001_placement.phpt
index 7de2210460e52..518c890ef2c4a 100644
--- a/Zend/tests/attributes/001_placement.phpt
+++ b/Zend/tests/attributes/001_placement.phpt
@@ -41,8 +41,8 @@ $sources = [
 ];
 
 foreach ($sources as $r) {
-	$attr = $r->getAttributes();
-	var_dump(get_class($r), count($attr));
+    $attr = $r->getAttributes();
+    var_dump(get_class($r), count($attr));
 
     foreach ($attr as $a) {
         var_dump($a->getName(), $a->getArguments());
diff --git a/Zend/tests/attributes/003_ast_nodes.phpt b/Zend/tests/attributes/003_ast_nodes.phpt
index 0177804dcc85a..854edf3d63c15 100644
--- a/Zend/tests/attributes/003_ast_nodes.phpt
+++ b/Zend/tests/attributes/003_ast_nodes.phpt
@@ -8,7 +8,7 @@ define('V1', strtoupper(php_sapi_name()));
 #[A1([V1 => V1])]
 class C1
 {
-	public const BAR = 'bar';
+    public const BAR = 'bar';
 }
 
 $ref = new \ReflectionClass(C1::class);
@@ -38,7 +38,7 @@ echo "\n";
 #[A1(self::FOO, C1::BAR)]
 class C3
 {
-	private const FOO = 'foo';
+    private const FOO = 'foo';
 }
 
 $ref = new \ReflectionClass(C3::class);
@@ -62,7 +62,7 @@ echo "\n";
 #[Attribute]
 class C5
 {
-	public function __construct() { }
+    public function __construct() { }
 }
 
 $ref = new \ReflectionFunction(#[C5(MissingClass::SOME_CONST)] function () { });
@@ -70,15 +70,15 @@ $attr = $ref->getAttributes();
 var_dump(count($attr));
 
 try {
-	$attr[0]->getArguments();
+    $attr[0]->getArguments();
 } catch (\Error $e) {
-	var_dump($e->getMessage());
+    var_dump($e->getMessage());
 }
 
 try {
-	$attr[0]->newInstance();
+    $attr[0]->newInstance();
 } catch (\Error $e) {
-	var_dump($e->getMessage());
+    var_dump($e->getMessage());
 }
 
 ?>
diff --git a/Zend/tests/attributes/005_objects.phpt b/Zend/tests/attributes/005_objects.phpt
index 206d89fa10ab7..62b14181efd2e 100644
--- a/Zend/tests/attributes/005_objects.phpt
+++ b/Zend/tests/attributes/005_objects.phpt
@@ -6,22 +6,22 @@ Attributes can be converted into objects.
 #[Attribute(Attribute::TARGET_FUNCTION)]
 class A1
 {
-	public string $name;
-	public int $ttl;
-
-	public function __construct(string $name, int $ttl = 50)
-	{
-		$this->name = $name;
-		$this->ttl = $ttl;
-	}
+    public string $name;
+    public int $ttl;
+
+    public function __construct(string $name, int $ttl = 50)
+    {
+        $this->name = $name;
+        $this->ttl = $ttl;
+    }
 }
 
 $ref = new \ReflectionFunction(#[A1('test')] function () { });
 
 foreach ($ref->getAttributes() as $attr) {
-	$obj = $attr->newInstance();
+    $obj = $attr->newInstance();
 
-	var_dump(get_class($obj), $obj->name, $obj->ttl);
+    var_dump(get_class($obj), $obj->name, $obj->ttl);
 }
 
 echo "\n";
@@ -29,9 +29,9 @@ echo "\n";
 $ref = new \ReflectionFunction(#[A1] function () { });
 
 try {
-	$ref->getAttributes()[0]->newInstance();
+    $ref->getAttributes()[0]->newInstance();
 } catch (\ArgumentCountError $e) {
-	var_dump('ERROR 1', $e->getMessage());
+    var_dump('ERROR 1', $e->getMessage());
 }
 
 echo "\n";
@@ -39,9 +39,9 @@ echo "\n";
 $ref = new \ReflectionFunction(#[A1([])] function () { });
 
 try {
-	$ref->getAttributes()[0]->newInstance();
+    $ref->getAttributes()[0]->newInstance();
 } catch (\TypeError $e) {
-	var_dump('ERROR 2', $e->getMessage());
+    var_dump('ERROR 2', $e->getMessage());
 }
 
 echo "\n";
@@ -49,9 +49,9 @@ echo "\n";
 $ref = new \ReflectionFunction(#[A2] function () { });
 
 try {
-	$ref->getAttributes()[0]->newInstance();
+    $ref->getAttributes()[0]->newInstance();
 } catch (\Error $e) {
-	var_dump('ERROR 3', $e->getMessage());
+    var_dump('ERROR 3', $e->getMessage());
 }
 
 echo "\n";
@@ -59,15 +59,15 @@ echo "\n";
 #[Attribute]
 class A3
 {
-	private function __construct() { }
+    private function __construct() { }
 }
 
 $ref = new \ReflectionFunction(#[A3] function () { });
 
 try {
-	$ref->getAttributes()[0]->newInstance();
+    $ref->getAttributes()[0]->newInstance();
 } catch (\Error $e) {
-	var_dump('ERROR 4', $e->getMessage());
+    var_dump('ERROR 4', $e->getMessage());
 }
 
 echo "\n";
@@ -78,9 +78,9 @@ class A4 { }
 $ref = new \ReflectionFunction(#[A4(1)] function () { });
 
 try {
-	$ref->getAttributes()[0]->newInstance();
+    $ref->getAttributes()[0]->newInstance();
 } catch (\Error $e) {
-	var_dump('ERROR 5', $e->getMessage());
+    var_dump('ERROR 5', $e->getMessage());
 }
 
 echo "\n";
@@ -90,9 +90,9 @@ class A5 { }
 $ref = new \ReflectionFunction(#[A5] function () { });
 
 try {
-	$ref->getAttributes()[0]->newInstance();
+    $ref->getAttributes()[0]->newInstance();
 } catch (\Error $e) {
-	var_dump('ERROR 6', $e->getMessage());
+    var_dump('ERROR 6', $e->getMessage());
 }
 
 ?>
diff --git a/Zend/tests/attributes/006_filter.phpt b/Zend/tests/attributes/006_filter.phpt
index 8da1ec9bde1e1..2924e6ed79826 100644
--- a/Zend/tests/attributes/006_filter.phpt
+++ b/Zend/tests/attributes/006_filter.phpt
@@ -55,17 +55,17 @@ echo "\n";
 $ref = new \ReflectionFunction(function () { });
 
 try {
-	$ref->getAttributes(A1::class, 3);
+    $ref->getAttributes(A1::class, 3);
 } catch (\Error $e) {
-	var_dump('ERROR 1', $e->getMessage());
+    var_dump('ERROR 1', $e->getMessage());
 }
 
 $ref = new \ReflectionFunction(function () { });
 
 try {
-	$ref->getAttributes(SomeMissingClass::class, \ReflectionAttribute::IS_INSTANCEOF);
+    $ref->getAttributes(SomeMissingClass::class, \ReflectionAttribute::IS_INSTANCEOF);
 } catch (\Error $e) {
-	var_dump('ERROR 2', $e->getMessage());
+    var_dump('ERROR 2', $e->getMessage());
 }
 
 ?>
diff --git a/Zend/tests/attributes/011_inheritance.phpt b/Zend/tests/attributes/011_inheritance.phpt
index 36ee3fa47addf..6a589b9253d08 100644
--- a/Zend/tests/attributes/011_inheritance.phpt
+++ b/Zend/tests/attributes/011_inheritance.phpt
@@ -6,19 +6,19 @@ Attributes comply with inheritance rules.
 #[A2]
 class C1
 {
-	#[A1]
-	public function foo() { }
+    #[A1]
+    public function foo() { }
 }
 
 class C2 extends C1
 {
-	public function foo() { }
+    public function foo() { }
 }
 
 class C3 extends C1
 {
-	#[A1]
-	public function bar() { }
+    #[A1]
+    public function bar() { }
 }
 
 $ref = new \ReflectionClass(C1::class);
@@ -37,20 +37,20 @@ echo "\n";
 
 trait T1
 {
-	#[A2]
-	public $a;
+    #[A2]
+    public $a;
 }
 
 class C4
 {
-	use T1;
+    use T1;
 }
 
 class C5
 {
-	use T1;
+    use T1;
 
-	public $a;
+    public $a;
 }
 
 $ref = new \ReflectionClass(T1::class);
diff --git a/Zend/tests/attributes/012_ast_export.phpt b/Zend/tests/attributes/012_ast_export.phpt
index a9131f92d0c0b..347d1befe7f48 100644
--- a/Zend/tests/attributes/012_ast_export.phpt
+++ b/Zend/tests/attributes/012_ast_export.phpt
@@ -12,15 +12,15 @@ assert(0 && ($a = #[A1] #[A2] function ($a, #[A3(1)] $b) { }));
 assert(0 && ($a = #[A1(1, 2, 1 + 2)] fn () => 1));
 
 assert(0 && ($a = new #[A1] class() {
-	#[A1]#[A2] const FOO = 'foo';
-	#[A2] public $x;
-	#[A3] function a() { }
+    #[A1]#[A2] const FOO = 'foo';
+    #[A2] public $x;
+    #[A3] function a() { }
 }));
 
 assert(0 && ($a = function () {
-	#[A1] class Test1 { }
-	#[A2] interface Test2 { }
-	#[A3] trait Test3 { }
+    #[A1] class Test1 { }
+    #[A2] interface Test2 { }
+    #[A3] trait Test3 { }
 }));
 
 ?>
diff --git a/Zend/tests/attributes/013_class_scope.phpt b/Zend/tests/attributes/013_class_scope.phpt
index 61dd9f594c708..ff16bb7b82258 100644
--- a/Zend/tests/attributes/013_class_scope.phpt
+++ b/Zend/tests/attributes/013_class_scope.phpt
@@ -6,14 +6,14 @@ Attributes make use of class scope.
 #[A1(self::class, self::FOO)]
 class C1
 {
-	#[A1(self::class, self::FOO)]
-	private const FOO = 'foo';
+    #[A1(self::class, self::FOO)]
+    private const FOO = 'foo';
 
-	#[A1(self::class, self::FOO)]
-	public $a;
+    #[A1(self::class, self::FOO)]
+    public $a;
 
-	#[A1(self::class, self::FOO)]
-	public function bar(#[A1(self::class, self::FOO)] $p) { }
+    #[A1(self::class, self::FOO)]
+    public function bar(#[A1(self::class, self::FOO)] $p) { }
 }
 
 $ref = new \ReflectionClass(C1::class);
@@ -27,15 +27,15 @@ echo "\n";
 
 trait T1
 {
-	#[A1(self::class, self::FOO)]
-	public function foo() { }
+    #[A1(self::class, self::FOO)]
+    public function foo() { }
 }
 
 class C2
 {
-	use T1;
+    use T1;
 
-	private const FOO = 'bar';
+    private const FOO = 'bar';
 }
 
 $ref = new \ReflectionClass(C2::class);
@@ -45,7 +45,7 @@ $ref = new \ReflectionClass(T1::class);
 $attr = $ref->getMethod('foo')->getAttributes()[0];
 
 try {
-	$attr->getArguments();
+    $attr->getArguments();
 } catch (\Error $e) {
     var_dump('ERROR 1', $e->getMessage());
 }
@@ -54,17 +54,17 @@ echo "\n";
 
 class C3
 {
-	private const FOO = 'foo';
+    private const FOO = 'foo';
 
-	public static function foo()
-	{
-		return new #[A1(self::class, self::FOO)] class() {
-			private const FOO = 'bar';
+    public static function foo()
+    {
+        return new #[A1(self::class, self::FOO)] class() {
+            private const FOO = 'bar';
 
-			#[A1(self::class, self::FOO)]
-			public function bar() { }
-		};
-	}
+            #[A1(self::class, self::FOO)]
+            public function bar() { }
+        };
+    }
 }
 
 $ref = new \ReflectionObject(C3::foo());
diff --git a/Zend/tests/attributes/014_class_const_group.phpt b/Zend/tests/attributes/014_class_const_group.phpt
index a53ed09c0abd2..9f01d013a7de1 100644
--- a/Zend/tests/attributes/014_class_const_group.phpt
+++ b/Zend/tests/attributes/014_class_const_group.phpt
@@ -5,8 +5,8 @@ Attributes cannot be applied to groups of class constants.
 
 class C1
 {
-	#[A1]
-	public const A = 1, B = 2;
+    #[A1]
+    public const A = 1, B = 2;
 }
 
 ?>
diff --git a/Zend/tests/attributes/015_property_group.phpt b/Zend/tests/attributes/015_property_group.phpt
index 484d4154cf3a6..b84ded8c38d6d 100644
--- a/Zend/tests/attributes/015_property_group.phpt
+++ b/Zend/tests/attributes/015_property_group.phpt
@@ -5,8 +5,8 @@ Attributes cannot be applied to groups of properties.
 
 class C1
 {
-	#[A1]
-	public $x, $y;
+    #[A1]
+    public $x, $y;
 }
 
 ?>
diff --git a/Zend/tests/attributes/017_closure_scope.phpt b/Zend/tests/attributes/017_closure_scope.phpt
index af7de8e2e828b..8c39ceede9e61 100644
--- a/Zend/tests/attributes/017_closure_scope.phpt
+++ b/Zend/tests/attributes/017_closure_scope.phpt
@@ -5,17 +5,17 @@ Attributes make use of closure scope.
 
 class Test1
 {
-	private const FOO = 'bar';
+    private const FOO = 'bar';
 }
 
 class C1
 {
-	private const FOO = 'foo';
+    private const FOO = 'foo';
 
-	public static function foo()
-	{
-		return #[A1(self::class, self::FOO)] function (#[A1(self::class, self::FOO)] $p) { };
-	}
+    public static function foo()
+    {
+        return #[A1(self::class, self::FOO)] function (#[A1(self::class, self::FOO)] $p) { };
+    }
 }
 
 $ref = new \ReflectionFunction(C1::foo());
diff --git a/Zend/tests/attributes/020_userland_attribute_validation.phpt b/Zend/tests/attributes/020_userland_attribute_validation.phpt
index 14a10c39b288b..ce2acb26db161 100644
--- a/Zend/tests/attributes/020_userland_attribute_validation.phpt
+++ b/Zend/tests/attributes/020_userland_attribute_validation.phpt
@@ -18,9 +18,9 @@ $attr = $ref->getAttributes()[0];
 var_dump($attr->getName(), $attr->getTarget() == Attribute::TARGET_CLASS, $attr->isRepeated());
 
 try {
-	$attr->newInstance();
+    $attr->newInstance();
 } catch (\Throwable $e) {
-	var_dump('ERROR 1', $e->getMessage());
+    var_dump('ERROR 1', $e->getMessage());
 }
 
 echo "\n";
@@ -30,9 +30,9 @@ $attr = $ref->getAttributes()[0];
 var_dump($attr->getName(), $attr->getTarget() == Attribute::TARGET_FUNCTION, $attr->isRepeated());
 
 try {
-	$attr->newInstance();
+    $attr->newInstance();
 } catch (\Throwable $e) {
-	var_dump('ERROR 2', $e->getMessage());
+    var_dump('ERROR 2', $e->getMessage());
 }
 
 echo "\n";
diff --git a/Zend/tests/attributes/027_trailing_comma_args.phpt b/Zend/tests/attributes/027_trailing_comma_args.phpt
index 226025f359c2c..96966c364de66 100644
--- a/Zend/tests/attributes/027_trailing_comma_args.phpt
+++ b/Zend/tests/attributes/027_trailing_comma_args.phpt
@@ -4,10 +4,10 @@ Trailing comma in attribute argument list
 <?php
 
 #[MyAttribute(
-	"there",
-	"are",
-	"many",
-	"arguments",
+    "there",
+    "are",
+    "many",
+    "arguments",
 )]
 class Foo { }
 
diff --git a/Zend/tests/bug40770.phpt b/Zend/tests/bug40770.phpt
index c4c78c2220ef1..f37d96d5ff333 100644
--- a/Zend/tests/bug40770.phpt
+++ b/Zend/tests/bug40770.phpt
@@ -6,7 +6,7 @@ memory_limit=8M
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
 if ($zend_mm_enabled === "0") {
-	die("skip Zend MM disabled");
+    die("skip Zend MM disabled");
 }
 ?>
 --FILE--
diff --git a/Zend/tests/bug54268.phpt b/Zend/tests/bug54268.phpt
index 1680f4ceedb8f..e4ce5c0e3a774 100644
--- a/Zend/tests/bug54268.phpt
+++ b/Zend/tests/bug54268.phpt
@@ -6,7 +6,7 @@ memory_limit=8M
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
 if ($zend_mm_enabled === "0") {
-	die("skip Zend MM disabled");
+    die("skip Zend MM disabled");
 }
 ?>
 --FILE--
diff --git a/Zend/tests/bug54547.phpt b/Zend/tests/bug54547.phpt
index 7cb0cf06647a4..2f6387ca26c1d 100644
--- a/Zend/tests/bug54547.phpt
+++ b/Zend/tests/bug54547.phpt
@@ -3,7 +3,7 @@ Bug #54547: wrong equality of string numbers near LONG_MAX with 64-bit longs
 --SKIPIF--
 <?php
 if (PHP_INT_MAX !== 9223372036854775807)
-	die("skip for 64-bit long systems only");
+    die("skip for 64-bit long systems only");
 --FILE--
 <?php
 var_dump("9223372036854775807" == "9223372036854775808");
diff --git a/Zend/tests/bug62097.phpt b/Zend/tests/bug62097.phpt
index 8b78e6c69115d..52dd7499dc29f 100644
--- a/Zend/tests/bug62097.phpt
+++ b/Zend/tests/bug62097.phpt
@@ -3,7 +3,7 @@ Bug #62097: fix for bug #54547 is wrong for 32-bit machines
 --SKIPIF--
 <?php
 if (PHP_INT_MAX !== 2147483647)
-	die('skip for system with 32-bit wide longs only');
+    die('skip for system with 32-bit wide longs only');
 --FILE--
 <?php
 var_dump("02147483647" == "2147483647",
diff --git a/Zend/tests/bug70258.phpt b/Zend/tests/bug70258.phpt
index 11f59dd95b940..40915a286ef9e 100644
--- a/Zend/tests/bug70258.phpt
+++ b/Zend/tests/bug70258.phpt
@@ -6,7 +6,7 @@ memory_limit=2M
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
 if ($zend_mm_enabled === "0") {
-	die("skip Zend MM disabled");
+    die("skip Zend MM disabled");
 }
 ?>
 --FILE--
diff --git a/Zend/tests/bug70914.phpt b/Zend/tests/bug70914.phpt
index 2ea1b91241919..b8a1c91d36338 100644
--- a/Zend/tests/bug70914.phpt
+++ b/Zend/tests/bug70914.phpt
@@ -3,7 +3,7 @@ Bug #70914 zend_throw_or_error() format string vulnerability
 --SKIPIF--
 <?php
 if (!extension_loaded("pdo_sqlite")) {
-	die("skip pdo_sqlite required");
+    die("skip pdo_sqlite required");
 }
 ?>
 --FILE--
diff --git a/Zend/tests/bug76846.phpt b/Zend/tests/bug76846.phpt
index fbef2010338cf..cd837bd860973 100644
--- a/Zend/tests/bug76846.phpt
+++ b/Zend/tests/bug76846.phpt
@@ -6,7 +6,7 @@ memory_limit=33M
 <?php
 $zend_mm_enabled = getenv("USE_ZEND_ALLOC");
 if ($zend_mm_enabled === "0") {
-	die("skip Zend MM disabled");
+    die("skip Zend MM disabled");
 }
 ?>
 --FILE--
diff --git a/Zend/tests/bug79599.phpt b/Zend/tests/bug79599.phpt
index b333f153a8cb1..57e5332431f53 100644
--- a/Zend/tests/bug79599.phpt
+++ b/Zend/tests/bug79599.phpt
@@ -3,23 +3,23 @@ Bug #79599 (coredump in set_error_handler)
 --FILE--
 <?php
 set_error_handler(function($code, $message){
-	throw new \Exception($message);
+    throw new \Exception($message);
 });
 function test1(){
-	$a[] = $b;
+    $a[] = $b;
 }
 function test2(){
-	$a[$c] = $b;
+    $a[$c] = $b;
 }
 try{
-	test1();
+    test1();
 }catch(\Exception $e){
-	var_dump($e->getMessage());
+    var_dump($e->getMessage());
 }
 try{
-	test2();
+    test2();
 }catch(\Exception $e){
-	var_dump($e->getMessage());
+    var_dump($e->getMessage());
 }
 ?>
 --EXPECT--
diff --git a/Zend/tests/bug80037.phpt b/Zend/tests/bug80037.phpt
index 7bbe6128b3669..d6e057546b381 100644
--- a/Zend/tests/bug80037.phpt
+++ b/Zend/tests/bug80037.phpt
@@ -5,21 +5,21 @@ Bug #80037: Typed property must not be accessed before initialization when __get
 
 final class A
 {
-	public string $a;
+    public string $a;
 
-	public static function fromArray(array $props): self
-	{
-		$me = new static;
-		foreach ($props as $k => &$v) {
-			$me->{$k} = &$v;  # try to remove &
-		}
-		return $me;
-	}
+    public static function fromArray(array $props): self
+    {
+        $me = new static;
+        foreach ($props as $k => &$v) {
+            $me->{$k} = &$v;  # try to remove &
+        }
+        return $me;
+    }
 
-	public function __get($name)
-	{
-		throw new \LogicException("Property '$name' is not defined.");
-	}
+    public function __get($name)
+    {
+        throw new \LogicException("Property '$name' is not defined.");
+    }
 }
 
 var_dump(A::fromArray(['a' => 'foo']));
diff --git a/Zend/tests/dval_to_lval_32.phpt b/Zend/tests/dval_to_lval_32.phpt
index 9aeea650605e5..89acf9076ad75 100644
--- a/Zend/tests/dval_to_lval_32.phpt
+++ b/Zend/tests/dval_to_lval_32.phpt
@@ -3,7 +3,7 @@ zend_dval_to_lval preserves low bits  (32 bit long)
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4)
-	 die("skip for machines with 32-bit longs");
+     die("skip for machines with 32-bit longs");
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/dval_to_lval_64.phpt b/Zend/tests/dval_to_lval_64.phpt
index 3d6b736b8fdf4..b54f861bf55cf 100644
--- a/Zend/tests/dval_to_lval_64.phpt
+++ b/Zend/tests/dval_to_lval_64.phpt
@@ -3,7 +3,7 @@ zend_dval_to_lval preserves low bits  (64 bit long)
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 8)
-	 die("skip for machines with 64-bit longs");
+     die("skip for machines with 64-bit longs");
 ?>
 --FILE--
 <?php
diff --git a/Zend/tests/generators/repeated_yield_from_with_immediate_release.phpt b/Zend/tests/generators/repeated_yield_from_with_immediate_release.phpt
index 48813704b68fa..e6ab4e3c6cb6b 100644
--- a/Zend/tests/generators/repeated_yield_from_with_immediate_release.phpt
+++ b/Zend/tests/generators/repeated_yield_from_with_immediate_release.phpt
@@ -4,10 +4,10 @@ A generator can be yielded from multiple times, testing immediate release of the
 <?php
 
 function gen() {
-	yield 42;
+    yield 42;
 }
 function yield_from($gen) {
-	yield from $gen;
+    yield from $gen;
 }
 $gen = gen();
 var_dump(yield_from($gen)->current());
diff --git a/Zend/tests/magic_methods_011.phpt b/Zend/tests/magic_methods_011.phpt
index 5ce536ae403cb..7cd4d4bee1d26 100644
--- a/Zend/tests/magic_methods_011.phpt
+++ b/Zend/tests/magic_methods_011.phpt
@@ -3,7 +3,7 @@ __set first parameter should be a string when typed
 --FILE--
 <?php
 class Foo {
-	function __set(\Countable $name, $value) {}
+    function __set(\Countable $name, $value) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_012.phpt b/Zend/tests/magic_methods_012.phpt
index 4ac3952c4d872..450c7b229577a 100644
--- a/Zend/tests/magic_methods_012.phpt
+++ b/Zend/tests/magic_methods_012.phpt
@@ -3,7 +3,7 @@ __get first parameter should be a string when typed
 --FILE--
 <?php
 class Foo {
-	function __get(int $name) {}
+    function __get(int $name) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_013.phpt b/Zend/tests/magic_methods_013.phpt
index 03a4fb7ea7ffd..95614779d5666 100644
--- a/Zend/tests/magic_methods_013.phpt
+++ b/Zend/tests/magic_methods_013.phpt
@@ -3,7 +3,7 @@ __isset first parameter should be a string when typed
 --FILE--
 <?php
 class Foo {
-	function __isset(\stdClass $name) {}
+    function __isset(\stdClass $name) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_014.phpt b/Zend/tests/magic_methods_014.phpt
index 783b6003dc846..8a1aa6388d851 100644
--- a/Zend/tests/magic_methods_014.phpt
+++ b/Zend/tests/magic_methods_014.phpt
@@ -3,7 +3,7 @@ __unset first parameter should be a string when typed
 --FILE--
 <?php
 class Foo {
-	function __unset(array $name) {}
+    function __unset(array $name) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_015.phpt b/Zend/tests/magic_methods_015.phpt
index d5e93c9ef074e..3b7cf696182d5 100644
--- a/Zend/tests/magic_methods_015.phpt
+++ b/Zend/tests/magic_methods_015.phpt
@@ -3,7 +3,7 @@ __call first parameter should be a string typed
 --FILE--
 <?php
 class Foo {
-	function __call(int $name, array $arguments) {}
+    function __call(int $name, array $arguments) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_016.phpt b/Zend/tests/magic_methods_016.phpt
index a0ac45e42aebf..c456afa12783e 100644
--- a/Zend/tests/magic_methods_016.phpt
+++ b/Zend/tests/magic_methods_016.phpt
@@ -3,7 +3,7 @@ __call second parameter should be an array when typed
 --FILE--
 <?php
 class Foo {
-	function __call(string $name, \Arguments $arguments) {}
+    function __call(string $name, \Arguments $arguments) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_017.phpt b/Zend/tests/magic_methods_017.phpt
index 9afb089f311c0..0ce622712364b 100644
--- a/Zend/tests/magic_methods_017.phpt
+++ b/Zend/tests/magic_methods_017.phpt
@@ -3,7 +3,7 @@ __callStatic first parameter should be a string typed
 --FILE--
 <?php
 class Foo {
-	static function __callStatic(int $name, array $arguments) {}
+    static function __callStatic(int $name, array $arguments) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_018.phpt b/Zend/tests/magic_methods_018.phpt
index faddd3cca11d5..914a8898082c8 100644
--- a/Zend/tests/magic_methods_018.phpt
+++ b/Zend/tests/magic_methods_018.phpt
@@ -3,7 +3,7 @@ __callStatic second parameter should be an array typed
 --FILE--
 <?php
 class Foo {
-	static function __callStatic(string $name, \Arguments $args) {}
+    static function __callStatic(string $name, \Arguments $args) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_019.phpt b/Zend/tests/magic_methods_019.phpt
index 85823e6c40291..f0a5fabff29d7 100644
--- a/Zend/tests/magic_methods_019.phpt
+++ b/Zend/tests/magic_methods_019.phpt
@@ -3,7 +3,7 @@ __unserialize first parameter must be an array
 --FILE--
 <?php
 class Foo {
-	public function __unserialize(string $name) {}
+    public function __unserialize(string $name) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_020.phpt b/Zend/tests/magic_methods_020.phpt
index 45e144cac793c..4efaf6fb18a82 100644
--- a/Zend/tests/magic_methods_020.phpt
+++ b/Zend/tests/magic_methods_020.phpt
@@ -4,7 +4,7 @@ __set_state first parameter must be an array
 <?php
 
 class Foo {
-	public static function __set_state(int $properties) {}
+    public static function __set_state(int $properties) {}
 }
 
 ?>
diff --git a/Zend/tests/magic_methods_inheritance_rules.phpt b/Zend/tests/magic_methods_inheritance_rules.phpt
index e91fdc7848097..6bdcafb1bfb5a 100644
--- a/Zend/tests/magic_methods_inheritance_rules.phpt
+++ b/Zend/tests/magic_methods_inheritance_rules.phpt
@@ -3,65 +3,65 @@ Magic Methods inheritance rules
 --FILE--
 <?php
 class ValidMagicMethods {
-	public function __call(string $name, array $arguments): mixed {}
+    public function __call(string $name, array $arguments): mixed {}
 
-	public static function __callStatic(string $name, array $arguments): mixed {}
+    public static function __callStatic(string $name, array $arguments): mixed {}
 
-	public function __clone(): void {}
+    public function __clone(): void {}
 
-	public function __debugInfo(): ?array {}
+    public function __debugInfo(): ?array {}
 
-	public function __get(string $name): mixed {}
+    public function __get(string $name): mixed {}
 
-	public function __invoke(mixed $arguments): mixed {}
+    public function __invoke(mixed $arguments): mixed {}
 
-	public function __isset(string $name): bool {}
+    public function __isset(string $name): bool {}
 
-	public function __serialize(): array {}
+    public function __serialize(): array {}
 
-	public function __set(string $name, mixed $value): void {}
+    public function __set(string $name, mixed $value): void {}
 
-	public static function __set_state(array $properties): object {}
+    public static function __set_state(array $properties): object {}
 
-	public function __sleep(): array {}
+    public function __sleep(): array {}
 
-	public function __toString(): string {}
+    public function __toString(): string {}
 
-	public function __unserialize(array $data): void {}
+    public function __unserialize(array $data): void {}
 
-	public function __unset(string $name): void {}
+    public function __unset(string $name): void {}
 
-	public function __wakeup(): void {}
+    public function __wakeup(): void {}
 }
 
 class NarrowedReturnType extends ValidMagicMethods {
-	public function __call(string $name, array $arguments): string|float|null {}
+    public function __call(string $name, array $arguments): string|float|null {}
 
-	public static function __callStatic(string $name, array $arguments): ?array {}
+    public static function __callStatic(string $name, array $arguments): ?array {}
 
-	public function __debugInfo(): array {}
+    public function __debugInfo(): array {}
 
-	public function __get(string $name): int|string {}
+    public function __get(string $name): int|string {}
 
-	public function __invoke(mixed $arguments): object {}
+    public function __invoke(mixed $arguments): object {}
 }
 
 class WidenedArgumentType extends NarrowedReturnType {
-	public function __call(string|array $name, array|string $arguments): string|float|null {}
+    public function __call(string|array $name, array|string $arguments): string|float|null {}
 
-	public static function __callStatic(string|object $name, array|object $arguments): ?array {}
+    public static function __callStatic(string|object $name, array|object $arguments): ?array {}
 
-	public function __get(string|array $name): int|string {}
+    public function __get(string|array $name): int|string {}
 
-	public function __isset(string|bool $name): bool {}
+    public function __isset(string|bool $name): bool {}
 
-	public function __set(string|bool|float $name, mixed $value): void {}
+    public function __set(string|bool|float $name, mixed $value): void {}
 
-	public static function __set_state(string|array $properties): object {}
+    public static function __set_state(string|array $properties): object {}
 
-	public function __unserialize(array|string $data): void {}
+    public function __unserialize(array|string $data): void {}
 
-	public function __unset(string|array $name): void {}
+    public function __unset(string|array $name): void {}
 }
 
 echo 'No problems!';
diff --git a/Zend/tests/magic_methods_inheritance_rules_non_trivial_01.phpt b/Zend/tests/magic_methods_inheritance_rules_non_trivial_01.phpt
index a57c8b7dc8e1d..84a960240a707 100644
--- a/Zend/tests/magic_methods_inheritance_rules_non_trivial_01.phpt
+++ b/Zend/tests/magic_methods_inheritance_rules_non_trivial_01.phpt
@@ -3,15 +3,15 @@ Magic Methods inheritance rules on a non-trivial class hierarchy
 --FILE--
 <?php
 class A {
-	public function __get(string|array $name): mixed {} // valid
+    public function __get(string|array $name): mixed {} // valid
 }
 
 class B extends A {
-	public function __get(string|array|object $name): int {} // also valid
+    public function __get(string|array|object $name): int {} // also valid
 }
 
 class C extends B {
-	public function __get(string|array $name): int {} // this is invalid
+    public function __get(string|array $name): int {} // this is invalid
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_inheritance_rules_non_trivial_02.phpt b/Zend/tests/magic_methods_inheritance_rules_non_trivial_02.phpt
index 72c20a788532d..2835b46830952 100644
--- a/Zend/tests/magic_methods_inheritance_rules_non_trivial_02.phpt
+++ b/Zend/tests/magic_methods_inheritance_rules_non_trivial_02.phpt
@@ -3,15 +3,15 @@ Magic Methods inheritance rules on a non-trivial class hierarchy
 --FILE--
 <?php
 class A {
-	public function __get(string|array $name): mixed {} // valid
+    public function __get(string|array $name): mixed {} // valid
 }
 
 class B extends A {
-	public function __get(string|array|object $name): int {} // also valid
+    public function __get(string|array|object $name): int {} // also valid
 }
 
 class C extends B {
-	public function __get(string|array|object $name): int|float {} // this is invalid
+    public function __get(string|array|object $name): int|float {} // this is invalid
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_sleep.phpt b/Zend/tests/magic_methods_sleep.phpt
index 593d8fc037bf4..89baac4699d13 100644
--- a/Zend/tests/magic_methods_sleep.phpt
+++ b/Zend/tests/magic_methods_sleep.phpt
@@ -3,7 +3,7 @@ __sleep cannot take arguments
 --FILE--
 <?php
 class Foo {
-	public function __sleep(string $name) {}
+    public function __sleep(string $name) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/magic_methods_wakeup.phpt b/Zend/tests/magic_methods_wakeup.phpt
index f4edb33576bc5..8d72b6be866ad 100644
--- a/Zend/tests/magic_methods_wakeup.phpt
+++ b/Zend/tests/magic_methods_wakeup.phpt
@@ -3,7 +3,7 @@ __wakeup cannot take arguments
 --FILE--
 <?php
 class Foo {
-	public function __wakeup(string $name) {}
+    public function __wakeup(string $name) {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/return_types/033.phpt b/Zend/tests/return_types/033.phpt
index e725465253fda..1eb5171cb08ef 100644
--- a/Zend/tests/return_types/033.phpt
+++ b/Zend/tests/return_types/033.phpt
@@ -3,7 +3,7 @@ __set can only declare void return
 --FILE--
 <?php
 class Foo {
-	function __set($name, $value) : string {}
+    function __set($name, $value) : string {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/return_types/034.phpt b/Zend/tests/return_types/034.phpt
index 50324208cbc9a..80a57cf1e8cd2 100644
--- a/Zend/tests/return_types/034.phpt
+++ b/Zend/tests/return_types/034.phpt
@@ -3,7 +3,7 @@ __isset can only declare a boolean return type
 --FILE--
 <?php
 class Foo {
-	function __isset($name) : \stdClass|bool {}
+    function __isset($name) : \stdClass|bool {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/tests/return_types/035.phpt b/Zend/tests/return_types/035.phpt
index fa2d331f55e6e..359790b82eab8 100644
--- a/Zend/tests/return_types/035.phpt
+++ b/Zend/tests/return_types/035.phpt
@@ -3,7 +3,7 @@ __unset can only declare void return
 --FILE--
 <?php
 class Foo {
-	function __unset($name) : bool {}
+    function __unset($name) : bool {}
 }
 ?>
 --EXPECTF--
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index baca12f66b56d..b99919bb57fb1 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -262,7 +262,7 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */
 			OBJ_RELEASE(&parent->std);
 			/* Reset for resuming in finally */
 			generator->node.parent = NULL;
-			generator->node.ptr.root = generator; 
+			generator->node.ptr.root = generator;
 		}
 	}
 
diff --git a/ext/com_dotnet/tests/bug66431_0.phpt b/ext/com_dotnet/tests/bug66431_0.phpt
index 4a0062a7e13c2..5f9bc5c0b0bb5 100644
--- a/ext/com_dotnet/tests/bug66431_0.phpt
+++ b/ext/com_dotnet/tests/bug66431_0.phpt
@@ -33,7 +33,7 @@ if (!$result) {
 $fpath = str_replace("/", "\\", __DIR__ . "/bug66431.txt");
 
 if (file_exists($fpath)) {
-	unlink($fpath);
+    unlink($fpath);
 }
 ?>
 --EXPECT--
diff --git a/ext/com_dotnet/tests/bug66431_1.phpt b/ext/com_dotnet/tests/bug66431_1.phpt
index e99131d27b1e1..7ebf16a10d1da 100644
--- a/ext/com_dotnet/tests/bug66431_1.phpt
+++ b/ext/com_dotnet/tests/bug66431_1.phpt
@@ -5,9 +5,9 @@ Bug #66431 Special Character via COM Interface (CP_UTF8), Application.Word
 if (!extension_loaded("com_dotnet")){ echo "skip COM/.Net support not present"; }
 
 try {
-	new COM("word.application", NULL, CP_UTF8);
+    new COM("word.application", NULL, CP_UTF8);
 } catch (Exception $e) {
-	die('skip ' . $e->getMessage());
+    die('skip ' . $e->getMessage());
 }
 
 ?>
@@ -51,7 +51,7 @@ if (!$result) {
 $fpath = str_replace("/", "\\", __DIR__ . "/bug66431.docx");
 
 if (file_exists($fpath)) {
-	unlink($fpath);
+    unlink($fpath);
 }
 ?>
 --EXPECT--
diff --git a/ext/com_dotnet/tests/variants_x64.phpt b/ext/com_dotnet/tests/variants_x64.phpt
index 88f9f3e12616e..6a1b7e1c12925 100644
--- a/ext/com_dotnet/tests/variants_x64.phpt
+++ b/ext/com_dotnet/tests/variants_x64.phpt
@@ -5,7 +5,7 @@ COM: General variant tests
 if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present";
 if (8 != PHP_INT_SIZE) print "skip x64 only";
 if ((string) variant_cat(new VARIANT(false), new VARIANT(0.5)) != 'False0.5')
-	print "skip English locale only";
+    print "skip English locale only";
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/bug46711.phpt b/ext/curl/tests/bug46711.phpt
index c46ea5331d75f..501bd3ee169cc 100644
--- a/ext/curl/tests/bug46711.phpt
+++ b/ext/curl/tests/bug46711.phpt
@@ -3,7 +3,7 @@ Bug #46711 (lost memory when foreach is used for values passed to curl_setopt())
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	exit("skip curl extension not loaded");
+    exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/bug48514.phpt b/ext/curl/tests/bug48514.phpt
index 759e4bc1be163..12dcdd498b0c0 100644
--- a/ext/curl/tests/bug48514.phpt
+++ b/ext/curl/tests/bug48514.phpt
@@ -4,7 +4,7 @@ Bug #48514 (cURL extension uses same resource name for simple and multi APIs)
 <?php
 
 if (!extension_loaded('curl')) {
-	exit("skip curl extension not loaded");
+    exit("skip curl extension not loaded");
 }
 
 ?>
diff --git a/ext/curl/tests/bug52827.phpt b/ext/curl/tests/bug52827.phpt
index 8fbcad627d4ef..3b9aabf92cdc1 100644
--- a/ext/curl/tests/bug52827.phpt
+++ b/ext/curl/tests/bug52827.phpt
@@ -4,7 +4,7 @@ Bug #52827 (curl_setopt with CURLOPT_STDERR erroneously increments the resource
 <?php
 
 if (!extension_loaded('curl')) {
-	exit("skip curl extension not loaded");
+    exit("skip curl extension not loaded");
 }
 
 ?>
diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt
index 316fa4d0e7315..9b795241f26b2 100644
--- a/ext/curl/tests/bug61948.phpt
+++ b/ext/curl/tests/bug61948.phpt
@@ -18,9 +18,9 @@ Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 ?>
 --CLEAN--
 <?php
-	$base_dir = __DIR__ . DIRECTORY_SEPARATOR . "bug61948";
-	rmdir("$base_dir/foo");
-	rmdir($base_dir);
+    $base_dir = __DIR__ . DIRECTORY_SEPARATOR . "bug61948";
+    rmdir("$base_dir/foo");
+    rmdir($base_dir);
 ?>
 --EXPECTF--
 %a
diff --git a/ext/curl/tests/bug71523.phpt b/ext/curl/tests/bug71523.phpt
index 2d947febecb7b..3252f75f4613b 100644
--- a/ext/curl/tests/bug71523.phpt
+++ b/ext/curl/tests/bug71523.phpt
@@ -3,7 +3,7 @@ Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	exit("skip curl extension not loaded");
+    exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/bug72202.phpt b/ext/curl/tests/bug72202.phpt
index bf04d9faea501..5b2ebfa2cccc4 100644
--- a/ext/curl/tests/bug72202.phpt
+++ b/ext/curl/tests/bug72202.phpt
@@ -3,7 +3,7 @@ Bug #72202 (curl_close doesn't close cURL handle)
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	exit("skip curl extension not loaded");
+    exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/bug76675.phpt b/ext/curl/tests/bug76675.phpt
index e59aabc7c3407..5d36abfdd671b 100644
--- a/ext/curl/tests/bug76675.phpt
+++ b/ext/curl/tests/bug76675.phpt
@@ -4,11 +4,11 @@ Bug #76675 (Segfault with H2 server push write/writeheader handlers)
 <?php
 include 'skipif.inc';
 if (getenv("SKIP_ONLINE_TESTS")) {
-	die("skip online test");
+    die("skip online test");
 }
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
-	exit("skip: test may crash with curl < 7.61.0");
+    exit("skip: test may crash with curl < 7.61.0");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/bug77535.phpt b/ext/curl/tests/bug77535.phpt
index 95eec344a894e..b1d8f4d4da51a 100644
--- a/ext/curl/tests/bug77535.phpt
+++ b/ext/curl/tests/bug77535.phpt
@@ -4,11 +4,11 @@ Bug #77535 (Invalid callback, h2 server push)
 <?php
 include 'skipif.inc';
 if (getenv("SKIP_ONLINE_TESTS")) {
-	die("skip online test");
+    die("skip online test");
 }
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073d00) {
-	exit("skip: test may crash with curl < 7.61.0");
+    exit("skip: test may crash with curl < 7.61.0");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/bug77946.phpt b/ext/curl/tests/bug77946.phpt
index c983a7761747f..2a0dcd62a3802 100644
--- a/ext/curl/tests/bug77946.phpt
+++ b/ext/curl/tests/bug77946.phpt
@@ -4,7 +4,7 @@ Bug #77946 (Errored cURL resources returned by curl_multi_info_read() must be co
 <?php
 
 if (!extension_loaded('curl')) {
-	exit('skip curl extension not loaded');
+    exit('skip curl extension not loaded');
 }
 
 ?>
diff --git a/ext/curl/tests/bug79741.phpt b/ext/curl/tests/bug79741.phpt
index 3f5a4801b19c2..5fddd30c2769c 100644
--- a/ext/curl/tests/bug79741.phpt
+++ b/ext/curl/tests/bug79741.phpt
@@ -4,7 +4,7 @@ Bug #79741: curl_setopt CURLOPT_POSTFIELDS asserts on object with declared prope
 <?php
 
 class Test {
-	public $prop = "value";
+    public $prop = "value";
 }
 
 $ch = curl_init();
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt
index 2764a82f3816c..f1c61fbf3bebd 100644
--- a/ext/curl/tests/check_win_config.phpt
+++ b/ext/curl/tests/check_win_config.phpt
@@ -3,7 +3,7 @@ Check libcurl config on windows
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	die('skip - curl extension not available in this build');
+    die('skip - curl extension not available in this build');
 }
 if(substr(PHP_OS, 0, 3) != 'WIN' )
   die("skip for windows only");
diff --git a/ext/curl/tests/curl_basic_008.phpt b/ext/curl/tests/curl_basic_008.phpt
index 70f82532b72b0..3b5f67b5e04f1 100644
--- a/ext/curl/tests/curl_basic_008.phpt
+++ b/ext/curl/tests/curl_basic_008.phpt
@@ -4,11 +4,11 @@ Test curl_error() & curl_errno() function with problematic host
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) print "skip";
-	$addr = "www.".uniqid().".".uniqid();
-	if (gethostbyname($addr) != $addr) {
-		print "skip catch all dns";
-	}
+    if (!extension_loaded("curl")) print "skip";
+    $addr = "www.".uniqid().".".uniqid();
+    if (gethostbyname($addr) != $addr) {
+        print "skip catch all dns";
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/curl_basic_010.phpt b/ext/curl/tests/curl_basic_010.phpt
index 13fbd0c4045d0..5a9d4d44ae481 100644
--- a/ext/curl/tests/curl_basic_010.phpt
+++ b/ext/curl/tests/curl_basic_010.phpt
@@ -4,11 +4,11 @@ Test curl_error() & curl_errno() function with problematic proxy
 TestFest 2009 - AFUP - Perrick Penet <perrick@noparking.net>
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) print "skip";
-	$addr = "www.".uniqid().".".uniqid();
-	if (gethostbyname($addr) != $addr) {
-		print "skip catch all dns";
-	}
+    if (!extension_loaded("curl")) print "skip";
+    $addr = "www.".uniqid().".".uniqid();
+    if (gethostbyname($addr) != $addr) {
+        print "skip catch all dns";
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/curl_basic_023.phpt b/ext/curl/tests/curl_basic_023.phpt
index 6bcfd72b32749..1ac764ea2c062 100644
--- a/ext/curl/tests/curl_basic_023.phpt
+++ b/ext/curl/tests/curl_basic_023.phpt
@@ -4,7 +4,7 @@ Test curl_getinfo() function with CURLINFO_HTTP_VERSION parameter
 <?php if (!extension_loaded("curl")) print "skip";
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073200) {
-	    exit("skip: test works only with curl >= 7.50.0");
+        exit("skip: test works only with curl >= 7.50.0");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_basic_024.phpt b/ext/curl/tests/curl_basic_024.phpt
index 6875d4f02a25d..4037a0bc12636 100644
--- a/ext/curl/tests/curl_basic_024.phpt
+++ b/ext/curl/tests/curl_basic_024.phpt
@@ -4,7 +4,7 @@ Test curl_getinfo() function with CURLINFO_* from curl >= 7.52.0
 <?php if (!extension_loaded("curl")) print "skip";
 $curl_version = curl_version();
 if ($curl_version['version_number'] < 0x073400) {
-	    exit("skip: test works only with curl >= 7.52.0");
+        exit("skip: test works only with curl >= 7.52.0");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_copy_handle_basic.phpt b/ext/curl/tests/curl_copy_handle_basic.phpt
index 0aa58dbcf869e..945768436c5fe 100644
--- a/ext/curl/tests/curl_copy_handle_basic.phpt
+++ b/ext/curl/tests/curl_copy_handle_basic.phpt
@@ -5,7 +5,7 @@ Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+    if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/curl_copy_handle_variation1.phpt b/ext/curl/tests/curl_copy_handle_variation1.phpt
index 8dbb3f6987caa..63331b5726861 100644
--- a/ext/curl/tests/curl_copy_handle_variation1.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation1.phpt
@@ -5,7 +5,7 @@ Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+    if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
 --FILE--
 <?php
diff --git a/ext/curl/tests/curl_copy_handle_variation2.phpt b/ext/curl/tests/curl_copy_handle_variation2.phpt
index be036d0ca80d9..afa8944bde6d1 100644
--- a/ext/curl/tests/curl_copy_handle_variation2.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation2.phpt
@@ -5,7 +5,7 @@ Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
+    if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
 --DESCRIPTION--
 the only way to test if a option is setten on a curl handle is using the curl_getinfo() function.
diff --git a/ext/curl/tests/curl_escape.phpt b/ext/curl/tests/curl_escape.phpt
index 015b010a1ca2c..91dff3f056339 100644
Binary files a/ext/curl/tests/curl_escape.phpt and b/ext/curl/tests/curl_escape.phpt differ
diff --git a/ext/curl/tests/curl_file_serialize.phpt b/ext/curl/tests/curl_file_serialize.phpt
index 7748272b7610d..7776a455a402f 100644
--- a/ext/curl/tests/curl_file_serialize.phpt
+++ b/ext/curl/tests/curl_file_serialize.phpt
@@ -3,7 +3,7 @@ CURL file uploading
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	exit("skip curl extension not loaded");
+    exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_multi_errno_strerror_001.phpt b/ext/curl/tests/curl_multi_errno_strerror_001.phpt
index cc8e175460a51..d0c237ef0c72e 100644
--- a/ext/curl/tests/curl_multi_errno_strerror_001.phpt
+++ b/ext/curl/tests/curl_multi_errno_strerror_001.phpt
@@ -3,7 +3,7 @@ curl_multi_errno and curl_multi_strerror basic test
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	    exit("skip curl extension not loaded");
+        exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_multi_setopt_basic001.phpt b/ext/curl/tests/curl_multi_setopt_basic001.phpt
index 25c3b4962f5c6..7620c421e4cdd 100644
--- a/ext/curl/tests/curl_multi_setopt_basic001.phpt
+++ b/ext/curl/tests/curl_multi_setopt_basic001.phpt
@@ -3,7 +3,7 @@ curl_multi_setopt basic test
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	    exit("skip curl extension not loaded");
+        exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_multi_strerror_001.phpt b/ext/curl/tests/curl_multi_strerror_001.phpt
index 3c2edb988de6b..7d1b426a258a4 100644
--- a/ext/curl/tests/curl_multi_strerror_001.phpt
+++ b/ext/curl/tests/curl_multi_strerror_001.phpt
@@ -3,7 +3,7 @@ curl_multi_strerror basic test
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	    exit("skip curl extension not loaded");
+        exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_share_errno_strerror_001.phpt b/ext/curl/tests/curl_share_errno_strerror_001.phpt
index 3a24121b57ee3..d8f18eb76fd9c 100644
--- a/ext/curl/tests/curl_share_errno_strerror_001.phpt
+++ b/ext/curl/tests/curl_share_errno_strerror_001.phpt
@@ -3,7 +3,7 @@ curl_share_errno and curl_share_strerror basic test
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	    exit("skip curl extension not loaded");
+        exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_share_setopt_basic001.phpt b/ext/curl/tests/curl_share_setopt_basic001.phpt
index d53ae4ff8e963..476ea688250b4 100644
--- a/ext/curl/tests/curl_share_setopt_basic001.phpt
+++ b/ext/curl/tests/curl_share_setopt_basic001.phpt
@@ -3,7 +3,7 @@ curl_share_setopt basic test
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	    exit("skip curl extension not loaded");
+        exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/curl/tests/curl_strerror_001.phpt b/ext/curl/tests/curl_strerror_001.phpt
index 06342598962d9..85a13271c190a 100644
--- a/ext/curl/tests/curl_strerror_001.phpt
+++ b/ext/curl/tests/curl_strerror_001.phpt
@@ -3,7 +3,7 @@ curl_strerror basic test
 --SKIPIF--
 <?php
 if (!extension_loaded("curl")) {
-	    exit("skip curl extension not loaded");
+        exit("skip curl extension not loaded");
 }
 ?>
 --FILE--
diff --git a/ext/date/tests/002.phpt b/ext/date/tests/002.phpt
index 36dc43d7605b6..65e8228149338 100644
--- a/ext/date/tests/002.phpt
+++ b/ext/date/tests/002.phpt
@@ -3,7 +3,7 @@ strtotime() function
 --SKIPIF--
 <?php
 if (!@putenv("TZ=EST5") || getenv("TZ") != 'EST5') {
-	die("skip unable to change TZ environment variable\n");
+    die("skip unable to change TZ environment variable\n");
 }
 ?>
 --FILE--
diff --git a/ext/date/tests/bug13142.phpt b/ext/date/tests/bug13142.phpt
index 80d4fa82fc453..63eba795d866e 100644
--- a/ext/date/tests/bug13142.phpt
+++ b/ext/date/tests/bug13142.phpt
@@ -5,10 +5,10 @@ date.timezone=US/Eastern
 --SKIPIF--
 <?php
 if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-	die("skip. set TZ env is not supported at runtime.");
+    die("skip. set TZ env is not supported at runtime.");
 }
 if (!@putenv("TZ=US/Eastern") || getenv("TZ") != 'US/Eastern') {
-	die("skip unable to change TZ environment variable\n");
+    die("skip unable to change TZ environment variable\n");
 }
 ?>
 --FILE--
diff --git a/ext/date/tests/bug26317.phpt b/ext/date/tests/bug26317.phpt
index 38c724ed57017..bfd416fc5e308 100644
--- a/ext/date/tests/bug26317.phpt
+++ b/ext/date/tests/bug26317.phpt
@@ -5,7 +5,7 @@ date.timezone=GMT0
 --SKIPIF--
 <?php
 if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
-	die("skip unable to change TZ environment variable\n");
+    die("skip unable to change TZ environment variable\n");
 }
 ?>
 --FILE--
diff --git a/ext/date/tests/bug26320.phpt b/ext/date/tests/bug26320.phpt
index 563e39ab30601..b8d4fc1d2a3e2 100644
--- a/ext/date/tests/bug26320.phpt
+++ b/ext/date/tests/bug26320.phpt
@@ -5,7 +5,7 @@ date.timezone=GMT0
 --SKIPIF--
 <?php
 if (!@putenv("TZ=GMT0") || getenv("TZ") != 'GMT0') {
-	die("skip unable to change TZ environment variable\n");
+    die("skip unable to change TZ environment variable\n");
 }
 ?>
 --FILE--
diff --git a/ext/date/tests/date_default_timezone_get-1.phpt b/ext/date/tests/date_default_timezone_get-1.phpt
index 32c066c1ca7ca..fc466d411d1ec 100644
--- a/ext/date/tests/date_default_timezone_get-1.phpt
+++ b/ext/date/tests/date_default_timezone_get-1.phpt
@@ -2,7 +2,7 @@
 date_default_timezone_get() function [1]
 --SKIPIF--
 <?php
-	if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
+    if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
 ?>
 --INI--
 date.timezone=
diff --git a/ext/date/tests/date_default_timezone_get-2.phpt b/ext/date/tests/date_default_timezone_get-2.phpt
index cf7478c90b502..44d94cd76f2a3 100644
--- a/ext/date/tests/date_default_timezone_get-2.phpt
+++ b/ext/date/tests/date_default_timezone_get-2.phpt
@@ -2,7 +2,7 @@
 date_default_timezone_get() function [2]
 --SKIPIF--
 <?php
-	if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
+    if(substr(PHP_OS, 0, 3) == 'WIN') die("skip on windows");
 ?>
 --INI--
 date.timezone=
diff --git a/ext/date/tests/strftime_variation22.phpt b/ext/date/tests/strftime_variation22.phpt
index b1c107ba78c08..ab0089e7f75b1 100644
--- a/ext/date/tests/strftime_variation22.phpt
+++ b/ext/date/tests/strftime_variation22.phpt
@@ -6,7 +6,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
     die("skip Test is not valid for Windows");
 }
 if(!setlocale(LC_ALL, "POSIX")) {
-	die("skip Locale POSIX is  needed by test and is not available");
+    die("skip Locale POSIX is  needed by test and is not available");
 }
 ?>
 --FILE--
diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt
index fe625b62bc6b4..a7a87c70c3474 100644
--- a/ext/dba/tests/bug36436.phpt
+++ b/ext/dba/tests/bug36436.phpt
@@ -2,8 +2,8 @@
 Bug #36436 (DBA problem with Berkeley DB4)
 --SKIPIF--
 <?php
-	$handler = 'db4';
-	require_once(__DIR__ .'/skipif.inc');
+    $handler = 'db4';
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
@@ -26,7 +26,7 @@ dba_close($db);
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 resource(%d) of type (dba persistent)
diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt
index fe4c68aa80fea..364d54d00496a 100644
--- a/ext/dba/tests/bug38698.phpt
+++ b/ext/dba/tests/bug38698.phpt
@@ -2,8 +2,8 @@
 Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't read valid db)
 --SKIPIF--
 <?php
-	$handler = 'cdb_make';
-	require_once(__DIR__ .'/skipif.inc');
+    $handler = 'cdb_make';
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt
index c735c9a07d966..bded251791c67 100644
--- a/ext/dba/tests/bug48240.phpt
+++ b/ext/dba/tests/bug48240.phpt
@@ -2,8 +2,8 @@
 Bug #48240 (DBA Segmentation fault dba_nextkey)
 --SKIPIF--
 <?php
-	$handler = 'db4';
-	require_once(__DIR__ .'/skipif.inc');
+    $handler = 'db4';
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
@@ -20,7 +20,7 @@ dba_close($db);
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 bool(false)
diff --git a/ext/dba/tests/bug49125.phpt b/ext/dba/tests/bug49125.phpt
index 70f59c97c91a2..7e46ea9f1f04c 100644
--- a/ext/dba/tests/bug49125.phpt
+++ b/ext/dba/tests/bug49125.phpt
@@ -2,8 +2,8 @@
 Bug #49125 (Error in dba_exists C code)
 --SKIPIF--
 <?php
-	$handler = 'db4';
-	require_once(__DIR__ .'/skipif.inc');
+    $handler = 'db4';
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
@@ -24,7 +24,7 @@ dba_close($db);
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt
index 8bec60a543fc2..dff291a39d263 100644
--- a/ext/dba/tests/bug65708.phpt
+++ b/ext/dba/tests/bug65708.phpt
@@ -2,7 +2,7 @@
 Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write)
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
@@ -29,7 +29,7 @@ dba_close($db);
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 integer
diff --git a/ext/dba/tests/bug72157.phpt b/ext/dba/tests/bug72157.phpt
index 71fa8730b89ac..490e9116d153e 100644
--- a/ext/dba/tests/bug72157.phpt
+++ b/ext/dba/tests/bug72157.phpt
@@ -2,7 +2,7 @@
 Bug #72157 (use-after-free caused by dba_open)
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt
index 79ebb2d237713..d5984c54c8725 100644
--- a/ext/dba/tests/dba001.phpt
+++ b/ext/dba/tests/dba001.phpt
@@ -2,8 +2,8 @@
 DBA File Creation Test
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -18,7 +18,7 @@ DBA File Creation Test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index c0432c4599bc2..2aba823af25c6 100644
--- a/ext/dba/tests/dba002.phpt
+++ b/ext/dba/tests/dba002.phpt
@@ -2,8 +2,8 @@
 DBA Insert/Fetch Test
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -19,7 +19,7 @@ DBA Insert/Fetch Test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt
index 55d4ce9fe010a..dd08f86ed571f 100644
--- a/ext/dba/tests/dba003.phpt
+++ b/ext/dba/tests/dba003.phpt
@@ -2,8 +2,8 @@
 DBA Insert/Replace/Fetch Test
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -21,7 +21,7 @@ DBA Insert/Replace/Fetch Test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt
index 3846ccfd2918e..eebbc04ffb9ec 100644
--- a/ext/dba/tests/dba004.phpt
+++ b/ext/dba/tests/dba004.phpt
@@ -2,8 +2,8 @@
 DBA Multiple Insert/Fetch Test
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -25,7 +25,7 @@ DBA Multiple Insert/Fetch Test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt
index 0f5767988dd95..bde23a495defa 100644
--- a/ext/dba/tests/dba005.phpt
+++ b/ext/dba/tests/dba005.phpt
@@ -2,8 +2,8 @@
 DBA FirstKey/NextKey Loop Test With 5 Items
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -32,7 +32,7 @@ DBA FirstKey/NextKey Loop Test With 5 Items
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt
index 1264ccf89955e..dfe93f874db81 100644
--- a/ext/dba/tests/dba006.phpt
+++ b/ext/dba/tests/dba006.phpt
@@ -2,8 +2,8 @@
 DBA FirstKey/NextKey with 2 deletes
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -34,7 +34,7 @@ DBA FirstKey/NextKey with 2 deletes
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index bb71ad273e40e..b617c34e9b6d6 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -2,9 +2,9 @@
 DBA Multiple File Creation Test
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	if (!function_exists('dba_list')) die('skip dba_list() not available');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    if (!function_exists('dba_list')) die('skip dba_list() not available');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -35,7 +35,7 @@ DBA Multiple File Creation Test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt
index 4ca9b0ed96ce4..3f23c9748c2e3 100644
--- a/ext/dba/tests/dba009.phpt
+++ b/ext/dba/tests/dba009.phpt
@@ -2,8 +2,8 @@
 DBA dba_popen Test
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	print("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    print("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -26,7 +26,7 @@ DBA dba_popen Test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba010.phpt b/ext/dba/tests/dba010.phpt
index f5cb08871a936..1b0d6172aa3c6 100644
--- a/ext/dba/tests/dba010.phpt
+++ b/ext/dba/tests/dba010.phpt
@@ -2,8 +2,8 @@
 DBA with array keys
 --SKIPIF--
 <?php
-	require_once(__DIR__ .'/skipif.inc');
-	die("info $HND handler used");
+    require_once(__DIR__ .'/skipif.inc');
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -37,7 +37,7 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) {
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: %s
diff --git a/ext/dba/tests/dba015.phpt b/ext/dba/tests/dba015.phpt
index 42a448dde99d5..1da13070492b4 100644
--- a/ext/dba/tests/dba015.phpt
+++ b/ext/dba/tests/dba015.phpt
@@ -50,7 +50,7 @@ echo dba_fetch("key2", $db_file1), "\n";
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba016.phpt b/ext/dba/tests/dba016.phpt
index 5d2a35990cdfb..e670ec86b96b1 100644
--- a/ext/dba/tests/dba016.phpt
+++ b/ext/dba/tests/dba016.phpt
@@ -17,7 +17,7 @@ $db_file1 = dba_popen($db_filename, 'n-t', 'flatfile');
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index 956483f5f35f3..7ed9a6487b9a9 100644
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -2,9 +2,9 @@
 DBA CDB handler test
 --SKIPIF--
 <?php
-	$handler = 'cdb';
-	require_once(__DIR__ .'/skipif.inc');
-	die('info CDB does not support replace or delete');
+    $handler = 'cdb';
+    require_once(__DIR__ .'/skipif.inc');
+    die('info CDB does not support replace or delete');
 ?>
 --FILE--
 <?php
@@ -14,7 +14,7 @@ DBA CDB handler test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: cdb
diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 21969db0743a8..c15f49a805418 100644
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -2,9 +2,9 @@
 DBA CDB_MAKE handler test
 --SKIPIF--
 <?php
-	$handler = 'cdb_make';
-	require_once(__DIR__ .'/skipif.inc');
-	die('info CDB_MAKE does not support reading');
+    $handler = 'cdb_make';
+    require_once(__DIR__ .'/skipif.inc');
+    die('info CDB_MAKE does not support reading');
 ?>
 --FILE--
 <?php
@@ -32,7 +32,7 @@ DBA CDB_MAKE handler test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: cdb_make
diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 39fc85e454cac..77afb95661d9a 100644
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -2,8 +2,8 @@
 DBA CDB handler test (read only)
 --SKIPIF--
 <?php
-	$handler = 'cdb_make';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'cdb_make';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt
index 26711c9d5e5c1..d87699bdaacb6 100644
--- a/ext/dba/tests/dba_db1.phpt
+++ b/ext/dba/tests/dba_db1.phpt
@@ -2,8 +2,8 @@
 DBA DB1 handler test
 --SKIPIF--
 <?php
-	$handler = 'db1';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'db1';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt
index 013813062a4a0..3683058d7dfa2 100644
--- a/ext/dba/tests/dba_db2.phpt
+++ b/ext/dba/tests/dba_db2.phpt
@@ -2,8 +2,8 @@
 DBA DB2 handler test
 --SKIPIF--
 <?php
-	$handler = 'db2';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'db2';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt
index f3c2061414cae..12a19fae7c1f9 100644
--- a/ext/dba/tests/dba_db3.phpt
+++ b/ext/dba/tests/dba_db3.phpt
@@ -2,8 +2,8 @@
 DBA DB3 handler test
 --SKIPIF--
 <?php
-	$handler = 'db3';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'db3';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt
index e69d60489d1c7..c85f133fabbd5 100644
--- a/ext/dba/tests/dba_db4_018.phpt
+++ b/ext/dba/tests/dba_db4_018.phpt
@@ -50,7 +50,7 @@ echo dba_fetch("key2", $db_file1), "\n";
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --XFAIL--
 Test 6 crashes with dba pointer of NULL, bug http://bugs.php.net/bug.php?id=51278
diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt
index 47bbae28c0757..6fc649d29c445 100644
--- a/ext/dba/tests/dba_dbm.phpt
+++ b/ext/dba/tests/dba_dbm.phpt
@@ -2,8 +2,8 @@
 DBA DBM handler test
 --SKIPIF--
 <?php
-	$handler = 'dbm';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'dbm';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
@@ -13,7 +13,7 @@ DBA DBM handler test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: dbm
diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt
index 41bd0f891d307..c2022895ab70d 100644
--- a/ext/dba/tests/dba_flatfile.phpt
+++ b/ext/dba/tests/dba_flatfile.phpt
@@ -2,8 +2,8 @@
 DBA FlatFile handler test
 --SKIPIF--
 <?php
-	$handler = 'flatfile';
-	require_once(__DIR__ .'/skipif.inc');
+    $handler = 'flatfile';
+    require_once(__DIR__ .'/skipif.inc');
 ?>
 --FILE--
 <?php
@@ -13,7 +13,7 @@ DBA FlatFile handler test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index ae4216d7fd5c3..f8174dde58ee7 100644
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -2,8 +2,8 @@
 DBA GDBM handler test
 --SKIPIF--
 <?php
-	$handler = 'gdbm';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'gdbm';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt
index e9bc185bf48ef..d1db7beb6cd67 100644
--- a/ext/dba/tests/dba_inifile.phpt
+++ b/ext/dba/tests/dba_inifile.phpt
@@ -2,8 +2,8 @@
 DBA INIFILE handler test
 --SKIPIF--
 <?php
-	$handler = 'inifile';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'inifile';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
@@ -13,7 +13,7 @@ DBA INIFILE handler test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: inifile
diff --git a/ext/dba/tests/dba_lmdb.phpt b/ext/dba/tests/dba_lmdb.phpt
index a97244bf36918..b23a2686f8751 100644
--- a/ext/dba/tests/dba_lmdb.phpt
+++ b/ext/dba/tests/dba_lmdb.phpt
@@ -2,8 +2,8 @@
 DBA LMDB handler test
 --SKIPIF--
 <?php
-	$handler = 'lmdb';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'lmdb';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
@@ -14,7 +14,7 @@ DBA LMDB handler test
 ?>
 --CLEAN--
 <?php
-	require_once __DIR__ .'/clean.inc';
+    require_once __DIR__ .'/clean.inc';
 ?>
 --EXPECTF--
 database handler: lmdb
diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt
index 74f316e1908e3..0cd00bbab191e 100644
--- a/ext/dba/tests/dba_ndbm.phpt
+++ b/ext/dba/tests/dba_ndbm.phpt
@@ -2,8 +2,8 @@
 DBA NDBM handler test
 --SKIPIF--
 <?php
-	$handler = 'ndbm';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'ndbm';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt
index c0ecc3101d842..e36643944f313 100644
--- a/ext/dba/tests/dba_optimize.phpt
+++ b/ext/dba/tests/dba_optimize.phpt
@@ -2,8 +2,8 @@
 DBA Optimize Test
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	die("info $HND handler used");
+    require_once __DIR__ .'/skipif.inc';
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -32,7 +32,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_qdbm.phpt b/ext/dba/tests/dba_qdbm.phpt
index efe34653b3f55..940b929bdf284 100644
--- a/ext/dba/tests/dba_qdbm.phpt
+++ b/ext/dba/tests/dba_qdbm.phpt
@@ -2,8 +2,8 @@
 DBA QDBM handler test
 --SKIPIF--
 <?php
-	$handler = 'qdbm';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'qdbm';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
@@ -14,7 +14,7 @@ DBA QDBM handler test
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECTF--
 database handler: qdbm
diff --git a/ext/dba/tests/dba_split.phpt b/ext/dba/tests/dba_split.phpt
index a85798474182b..246018715033b 100644
--- a/ext/dba/tests/dba_split.phpt
+++ b/ext/dba/tests/dba_split.phpt
@@ -2,8 +2,8 @@
 DBA Split Test
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	die("info $HND handler used");
+    require_once __DIR__ .'/skipif.inc';
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt
index 56cba13a1ce54..ffd5a13003ea0 100644
--- a/ext/dba/tests/dba_sync.phpt
+++ b/ext/dba/tests/dba_sync.phpt
@@ -2,8 +2,8 @@
 DBA Sync Test
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	die("info $HND handler used");
+    require_once __DIR__ .'/skipif.inc';
+    die("info $HND handler used");
 ?>
 --FILE--
 <?php
@@ -32,7 +32,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) {
 ?>
 --CLEAN--
 <?php
-	require(__DIR__ .'/clean.inc');
+    require(__DIR__ .'/clean.inc');
 ?>
 --EXPECT--
 database handler: flatfile
diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt
index 0d7c32f06c6ac..f8ff71cb9eadc 100644
--- a/ext/dba/tests/dba_tcadb.phpt
+++ b/ext/dba/tests/dba_tcadb.phpt
@@ -2,8 +2,8 @@
 DBA TCADB handler test
 --SKIPIF--
 <?php
-	$handler = 'tcadb';
-	require_once __DIR__ .'/skipif.inc';
+    $handler = 'tcadb';
+    require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/dom/tests/DOMDocument_save_basic.phpt b/ext/dom/tests/DOMDocument_save_basic.phpt
index 2fe9cdac7591e..2b92048ea8c8d 100644
--- a/ext/dom/tests/DOMDocument_save_basic.phpt
+++ b/ext/dom/tests/DOMDocument_save_basic.phpt
@@ -25,8 +25,8 @@ echo 'Wrote: ' . $doc->save($temp_filename) . ' bytes'; // Wrote: 72 bytes
 ?>
 --CLEAN--
 <?php
-	$temp_filename = __DIR__."/DomDocument_save_basic.tmp";
-	unlink($temp_filename);
+    $temp_filename = __DIR__."/DomDocument_save_basic.tmp";
+    unlink($temp_filename);
 ?>
 --EXPECT--
 Wrote: 72 bytes
diff --git a/ext/enchant/tests/broker_describe.phpt b/ext/enchant/tests/broker_describe.phpt
index 07134ae50fa2b..93ec1fafdc820 100644
--- a/ext/enchant/tests/broker_describe.phpt
+++ b/ext/enchant/tests/broker_describe.phpt
@@ -5,21 +5,21 @@ marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
 <?php
 if (!extension_loaded('enchant')) {
-	echo "skip: Enchant extension not enabled\n";
-	exit;
+    echo "skip: Enchant extension not enabled\n";
+    exit;
 }
 
 $broker = enchant_broker_init();
 
 if (!$broker) {
-	echo "skip: Unable to init broker\n";
-	exit;
+    echo "skip: Unable to init broker\n";
+    exit;
 }
 
 if (!enchant_broker_describe($broker)) {
-	@enchant_broker_free($broker);
+    @enchant_broker_free($broker);
 
-	echo "skip: No broker providers found\n";
+    echo "skip: No broker providers found\n";
 }
 
 @enchant_broker_free($broker);
diff --git a/ext/enchant/tests/broker_list_dicts.phpt b/ext/enchant/tests/broker_list_dicts.phpt
index ad4121512c2ee..a12527733c97f 100644
--- a/ext/enchant/tests/broker_list_dicts.phpt
+++ b/ext/enchant/tests/broker_list_dicts.phpt
@@ -5,21 +5,21 @@ marcosptf - <marcosptf@yahoo.com.br>
 --SKIPIF--
 <?php
 if (!extension_loaded('enchant')) {
-	echo "skip: Enchant extension not enabled\n";
-	exit;
+    echo "skip: Enchant extension not enabled\n";
+    exit;
 }
 
 $broker = enchant_broker_init();
 
 if (!$broker) {
-	echo "skip: Unable to init broker\n";
-	exit;
+    echo "skip: Unable to init broker\n";
+    exit;
 }
 
 if (!enchant_broker_list_dicts($broker)) {
-	@enchant_broker_free($broker);
+    @enchant_broker_free($broker);
 
-	echo "skip: No broker dicts installed\n";
+    echo "skip: No broker dicts installed\n";
 }
 
 @enchant_broker_free($broker);
diff --git a/ext/enchant/tests/bug13181.phpt b/ext/enchant/tests/bug13181.phpt
index f195fdc52253f..9cfdd2c6f9f4b 100644
--- a/ext/enchant/tests/bug13181.phpt
+++ b/ext/enchant/tests/bug13181.phpt
@@ -3,21 +3,21 @@ bug #13181, leaving a context frees the broker resources
 --SKIPIF--
 <?php
 if (!extension_loaded('enchant')) {
-	echo "skip: Enchant extension not enabled\n";
-	exit;
+    echo "skip: Enchant extension not enabled\n";
+    exit;
 }
 
 $broker = enchant_broker_init();
 
 if (!$broker) {
-	echo "skip: Unable to init broker\n";
-	exit;
+    echo "skip: Unable to init broker\n";
+    exit;
 }
 
 if (!enchant_broker_list_dicts($broker)) {
-	@enchant_broker_free($broker);
+    @enchant_broker_free($broker);
 
-	echo "skip: No broker dicts installed\n";
+    echo "skip: No broker dicts installed\n";
 }
 
 @enchant_broker_free($broker);
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 59a3ab74d518f..7a69ba470e509 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -2085,7 +2085,7 @@ static inline zend_bool exif_offset_info_contains(
 	return start >= info->valid_start && end <= info->valid_end;
 }
 
-#ifdef EXIF_DEBUG 
+#ifdef EXIF_DEBUG
 static inline int exif_offset_info_length(const exif_offset_info *info)
 {
 	return info->valid_end - info->valid_start;
diff --git a/ext/exif/tests/exif003.phpt b/ext/exif/tests/exif003.phpt
index 9d66e35ddc56a..6c043af4e2fdb 100644
--- a/ext/exif/tests/exif003.phpt
+++ b/ext/exif/tests/exif003.phpt
@@ -2,9 +2,9 @@
 Check for exif_read_data, Unicode user comment
 --SKIPIF--
 <?php
-	if (!extension_loaded('exif')) die('skip exif extension not available');
-	if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
-	if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
+    if (!extension_loaded('exif')) die('skip exif extension not available');
+    if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+    if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
 ?>
 --INI--
 output_handler=
diff --git a/ext/exif/tests/exif004.phpt b/ext/exif/tests/exif004.phpt
index 2b2e978d528df..1b371ff81f886 100644
--- a/ext/exif/tests/exif004.phpt
+++ b/ext/exif/tests/exif004.phpt
@@ -2,9 +2,9 @@
 Check for exif_read_data, Unicode WinXP tags
 --SKIPIF--
 <?php
-	if (!extension_loaded('exif')) die('skip exif extension not available');
-	if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
-	if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
+    if (!extension_loaded('exif')) die('skip exif extension not available');
+    if (!extension_loaded('mbstring')) die('skip mbstring extension not available');
+    if (!defined("EXIF_USE_MBSTRING") || !EXIF_USE_MBSTRING) die ('skip mbstring loaded by dl');
 ?>
 --INI--
 output_handler=
diff --git a/ext/ffi/tests/100.phpt b/ext/ffi/tests/100.phpt
index 634d8d44362a7..62cd0b2bdb602 100644
--- a/ext/ffi/tests/100.phpt
+++ b/ext/ffi/tests/100.phpt
@@ -5,9 +5,9 @@ FFI 100: PHP symbols
 <?php require_once('utils.inc'); ?>
 <?php
 try {
-	ffi_cdef("extern void *zend_printf;", ffi_get_php_dll_name());
+    ffi_cdef("extern void *zend_printf;", ffi_get_php_dll_name());
 } catch (Throwable $e) {
-	die('skip PHP symbols not available');
+    die('skip PHP symbols not available');
 }
 ?>
 --INI--
diff --git a/ext/ffi/tests/101.phpt b/ext/ffi/tests/101.phpt
index 3acc98f035a59..d3a81cbfd1bdc 100644
--- a/ext/ffi/tests/101.phpt
+++ b/ext/ffi/tests/101.phpt
@@ -5,9 +5,9 @@ FFI 101: PHP symbols (function address)
 <?php require_once('utils.inc'); ?>
 <?php
 try {
-	ffi_cdef("extern void *zend_printf;", ffi_get_php_dll_name());
+    ffi_cdef("extern void *zend_printf;", ffi_get_php_dll_name());
 } catch (Throwable $e) {
-	die('skip PHP symbols not available');
+    die('skip PHP symbols not available');
 }
 ?>
 --INI--
diff --git a/ext/ffi/tests/200.phpt b/ext/ffi/tests/200.phpt
index 39dcbdf71a6b7..0fba3d4e16175 100644
--- a/ext/ffi/tests/200.phpt
+++ b/ext/ffi/tests/200.phpt
@@ -5,9 +5,9 @@ FFI 200: PHP callbacks
 <?php require_once('utils.inc'); ?>
 <?php
 try {
-	FFI::cdef("void* zend_write;", ffi_get_php_dll_name());
+    FFI::cdef("void* zend_write;", ffi_get_php_dll_name());
 } catch (Throwable $e) {
-	die('skip PHP symbols not available');
+    die('skip PHP symbols not available');
 }
 ?>
 --INI--
diff --git a/ext/ffi/tests/bug77632.phpt b/ext/ffi/tests/bug77632.phpt
index 314424548a0fa..df9078b723486 100644
--- a/ext/ffi/tests/bug77632.phpt
+++ b/ext/ffi/tests/bug77632.phpt
@@ -4,9 +4,9 @@ Bug #77632 (FFI Segfaults When Called With Variadics)
 <?php
 require_once('skipif.inc');
 try {
-	$libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
+    $libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
 } catch (Throwable $_) {
-	die('skip libc.so.6 not available');
+    die('skip libc.so.6 not available');
 }
 ?>
 --INI--
diff --git a/ext/ffi/tests/bug77632b.phpt b/ext/ffi/tests/bug77632b.phpt
index 2509aa9bae8c8..c0fee9ed4f531 100644
--- a/ext/ffi/tests/bug77632b.phpt
+++ b/ext/ffi/tests/bug77632b.phpt
@@ -5,9 +5,9 @@ Bug #77632 (FFI function pointers with variadics)
 require_once('skipif.inc');
 require_once('utils.inc');
 try {
-	FFI::cdef("extern void *zend_printf;", ffi_get_php_dll_name());
+    FFI::cdef("extern void *zend_printf;", ffi_get_php_dll_name());
 } catch (Throwable $_) {
-	die('skip PHP symbols not available');
+    die('skip PHP symbols not available');
 }
 ?>
 --INI--
diff --git a/ext/ffi/tests/bug77706.phpt b/ext/ffi/tests/bug77706.phpt
index 87ef584d51284..5a44d5855371b 100644
--- a/ext/ffi/tests/bug77706.phpt
+++ b/ext/ffi/tests/bug77706.phpt
@@ -4,9 +4,9 @@ Bug #77632 (FFI Segfaults When Called With Variadics)
 <?php
 require_once('skipif.inc');
 try {
-	$libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
+    $libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
 } catch (Throwable $_) {
-	die('skip libc.so.6 not available');
+    die('skip libc.so.6 not available');
 }
 ?>
 --INI--
diff --git a/ext/ffi/tests/bug77768.phpt b/ext/ffi/tests/bug77768.phpt
index 6c29db59d7cef..204a6e4f8cdb9 100644
--- a/ext/ffi/tests/bug77768.phpt
+++ b/ext/ffi/tests/bug77768.phpt
@@ -4,9 +4,9 @@ Bug #77768 (Redeclaration of builtin types and repeated declarations)
 <?php
 require_once('skipif.inc');
 try {
-	$libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
+    $libc = FFI::cdef("int printf(const char *format, ...);", "libc.so.6");
 } catch (Throwable $_) {
-	die('skip libc.so.6 not available');
+    die('skip libc.so.6 not available');
 }
 ?>
 --INI--
diff --git a/ext/fileinfo/tests/bug57547.phpt b/ext/fileinfo/tests/bug57547.phpt
index 184ea6e018627..a2375005017fe 100644
--- a/ext/fileinfo/tests/bug57547.phpt
+++ b/ext/fileinfo/tests/bug57547.phpt
@@ -3,7 +3,7 @@ Bug #57547 Settings options on file doesn't give same result as constructor opti
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/bug61173.phpt b/ext/fileinfo/tests/bug61173.phpt
index b96e08662d3b1..dba814936f956 100644
--- a/ext/fileinfo/tests/bug61173.phpt
+++ b/ext/fileinfo/tests/bug61173.phpt
@@ -3,7 +3,7 @@ Bug #61173: Unable to detect error from finfo constructor
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/bug67516.phpt b/ext/fileinfo/tests/bug67516.phpt
index 6f4147fb0ea5c..7eed8049a55f3 100644
--- a/ext/fileinfo/tests/bug67516.phpt
+++ b/ext/fileinfo/tests/bug67516.phpt
@@ -3,7 +3,7 @@ Bug #67516 wrong mimetypes with finfo_file(filename, FILEINFO_MIME_TYPE)
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
 
diff --git a/ext/fileinfo/tests/bug67647-mb.phpt b/ext/fileinfo/tests/bug67647-mb.phpt
index c5ce8f9dc1751..b3f4d576a0ebf 100644
--- a/ext/fileinfo/tests/bug67647-mb.phpt
+++ b/ext/fileinfo/tests/bug67647-mb.phpt
@@ -2,11 +2,11 @@
 Bug #67647: Bundled libmagic 5.17 does not detect quicktime files correctly
 --SKIPIF--
 <?php
-	require_once(__DIR__ . '/skipif.inc');
+    require_once(__DIR__ . '/skipif.inc');
 
-	if (ini_get("default_charset") != "UTF-8") {
-		die("skip require default_charset == UTF-8");
-	}
+    if (ini_get("default_charset") != "UTF-8") {
+        die("skip require default_charset == UTF-8");
+    }
 ?>
 --FILE--
 <?php
@@ -29,9 +29,9 @@ var_dump($fi->file($f));
 +++DONE+++
 --CLEAN--
 <?php
-	$f_base = "67647��ガラスを食�られ��.mov";
-	$f = __DIR__ . DIRECTORY_SEPARATOR . $f_base;
-	unlink($f);
+    $f_base = "67647��ガラスを食�られ��.mov";
+    $f = __DIR__ . DIRECTORY_SEPARATOR . $f_base;
+    unlink($f);
 ?>
 --EXPECT--
 string(15) "video/quicktime"
diff --git a/ext/fileinfo/tests/bug68731.phpt b/ext/fileinfo/tests/bug68731.phpt
index c15b83c951f17..5ae63ee11f775 100644
--- a/ext/fileinfo/tests/bug68731.phpt
+++ b/ext/fileinfo/tests/bug68731.phpt
@@ -3,7 +3,7 @@ Bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
     $buffer = file_get_contents(__DIR__ . '/68731.gif');
diff --git a/ext/fileinfo/tests/bug69320.phpt b/ext/fileinfo/tests/bug69320.phpt
index 9ab2bf2cb39ad..e6800b5f4a4e8 100644
--- a/ext/fileinfo/tests/bug69320.phpt
+++ b/ext/fileinfo/tests/bug69320.phpt
@@ -12,8 +12,8 @@ var_dump(finfo_file(finfo_open(FILEINFO_MIME_TYPE), $fname));
 ?>
 --CLEAN--
 <?php
-	$fname = __DIR__ . DIRECTORY_SEPARATOR . "bug69320.txt";
-	unlink($fname);
+    $fname = __DIR__ . DIRECTORY_SEPARATOR . "bug69320.txt";
+    unlink($fname);
 ?>
 --EXPECT--
 string(10) "text/plain"
diff --git a/ext/fileinfo/tests/bug71527-mb.phpt b/ext/fileinfo/tests/bug71527-mb.phpt
index 272cdba702fb4..ea32a8122a923 100644
--- a/ext/fileinfo/tests/bug71527-mb.phpt
+++ b/ext/fileinfo/tests/bug71527-mb.phpt
@@ -3,7 +3,7 @@ Bug #71527 Buffer over-write in finfo_open with malformed magic file
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --ENV--
 USE_ZEND_ALLOC=0
 --FILE--
diff --git a/ext/fileinfo/tests/bug71527.phpt b/ext/fileinfo/tests/bug71527.phpt
index e6289b73fdeef..9a00c4f32b83d 100644
--- a/ext/fileinfo/tests/bug71527.phpt
+++ b/ext/fileinfo/tests/bug71527.phpt
@@ -3,7 +3,7 @@ Bug #71527 Buffer over-write in finfo_open with malformed magic file
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --ENV--
 USE_ZEND_ALLOC=0
 --FILE--
diff --git a/ext/fileinfo/tests/bug74170.phpt b/ext/fileinfo/tests/bug74170.phpt
index ceb0adc32f429..e6a3fd59784e4 100644
--- a/ext/fileinfo/tests/bug74170.phpt
+++ b/ext/fileinfo/tests/bug74170.phpt
@@ -3,11 +3,11 @@ Bug #74170 locale information change after mime_content_type
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (setlocale(LC_CTYPE, 'ru_RU.koi8r') === false)
-	die('skip ru_RU.koi8r locale is not available');
+    die('skip ru_RU.koi8r locale is not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/fileinfo/tests/cve-2014-1943-mb.phpt b/ext/fileinfo/tests/cve-2014-1943-mb.phpt
index b5cab7774ff9d..4de1bd71bca9b 100644
--- a/ext/fileinfo/tests/cve-2014-1943-mb.phpt
+++ b/ext/fileinfo/tests/cve-2014-1943-mb.phpt
@@ -3,7 +3,7 @@ Bug #66731: file: infinite recursion
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
 $fd = __DIR__.'/cve-2014-1943��ガラスを食�られ��.data';
diff --git a/ext/fileinfo/tests/cve-2014-1943.phpt b/ext/fileinfo/tests/cve-2014-1943.phpt
index 588c087c54264..32453d98d3a7e 100644
--- a/ext/fileinfo/tests/cve-2014-1943.phpt
+++ b/ext/fileinfo/tests/cve-2014-1943.phpt
@@ -3,7 +3,7 @@ Bug #66731: file: infinite recursion
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
 $fd = __DIR__.'/cve-2014-1943.data';
diff --git a/ext/fileinfo/tests/cve-2014-3538-mb.phpt b/ext/fileinfo/tests/cve-2014-3538-mb.phpt
index bad322e3ca29f..4d0050f95096b 100644
--- a/ext/fileinfo/tests/cve-2014-3538-mb.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538-mb.phpt
@@ -3,9 +3,9 @@ Bug #66731: file: extensive backtracking
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 if (getenv('SKIP_PERF_SENSITIVE'))
-	die("skip performance sensitive test");
+    die("skip performance sensitive test");
 ?>
 --FILE--
 <?php
diff --git a/ext/fileinfo/tests/cve-2014-3538-nojit.phpt b/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
index bed288ce32afb..61f99ebcee9f7 100644
--- a/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538-nojit.phpt
@@ -3,11 +3,11 @@ Bug #66731: file: extensive backtracking, with pcre.jit=0
 --SKIPIF--
 <?php
 if (defined("PHP_DEBUG") && PHP_DEBUG)
-	die("skip not suitable for debug build");
+    die("skip not suitable for debug build");
 if (getenv('SKIP_PERF_SENSITIVE'))
     die("skip performance sensitive test");
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 ?>
 --INI--
 pcre.jit=0
diff --git a/ext/fileinfo/tests/cve-2014-3538.phpt b/ext/fileinfo/tests/cve-2014-3538.phpt
index 0ff2a68685b7e..4d571b1b3f8b7 100644
--- a/ext/fileinfo/tests/cve-2014-3538.phpt
+++ b/ext/fileinfo/tests/cve-2014-3538.phpt
@@ -3,9 +3,9 @@ Bug #66731: file: extensive backtracking
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 if (getenv('SKIP_PERF_SENSITIVE'))
-	die("skip performance sensitive test");
+    die("skip performance sensitive test");
 ?>
 --FILE--
 <?php
diff --git a/ext/fileinfo/tests/finfo_extension_flag.phpt b/ext/fileinfo/tests/finfo_extension_flag.phpt
index 5c4079b97a1e8..440c2184805e9 100644
--- a/ext/fileinfo/tests/finfo_extension_flag.phpt
+++ b/ext/fileinfo/tests/finfo_extension_flag.phpt
@@ -3,7 +3,7 @@ Test FILEINFO_EXTENSION flag
 --SKIPIF--
 <?php
 if (!class_exists('finfo'))
-	die('skip no fileinfo extension');
+    die('skip no fileinfo extension');
 --FILE--
 <?php
 
diff --git a/ext/gd/tests/bug19366.phpt b/ext/gd/tests/bug19366.phpt
index 2832f72645e26..c6c3ed08ce3ad 100644
--- a/ext/gd/tests/bug19366.phpt
+++ b/ext/gd/tests/bug19366.phpt
@@ -2,7 +2,7 @@
 Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd))
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug22544-mb.phpt b/ext/gd/tests/bug22544-mb.phpt
index ae347edd70f25..23499617b88f7 100644
--- a/ext/gd/tests/bug22544-mb.phpt
+++ b/ext/gd/tests/bug22544-mb.phpt
@@ -2,9 +2,9 @@
 Bug #22544 (TrueColor transparency in PNG images).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug22544.phpt b/ext/gd/tests/bug22544.phpt
index c7b1e91966d63..3aca54df97a3c 100644
--- a/ext/gd/tests/bug22544.phpt
+++ b/ext/gd/tests/bug22544.phpt
@@ -2,9 +2,9 @@
 Bug #22544 (TrueColor transparency in PNG images).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt
index ff4f40fdeced2..59da4598491e0 100644
--- a/ext/gd/tests/bug24155.phpt
+++ b/ext/gd/tests/bug24155.phpt
@@ -2,10 +2,10 @@
 Bug #24155 (gdImageRotate270 rotation problem).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
-	if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
+    if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug24594.phpt b/ext/gd/tests/bug24594.phpt
index 138258cbbc741..4c91c6fe14639 100644
--- a/ext/gd/tests/bug24594.phpt
+++ b/ext/gd/tests/bug24594.phpt
@@ -2,9 +2,9 @@
 Bug #24594 (Filling an area using tiles).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug28147.phpt b/ext/gd/tests/bug28147.phpt
index fc5f37c5a0af7..def3bfd23333c 100644
--- a/ext/gd/tests/bug28147.phpt
+++ b/ext/gd/tests/bug28147.phpt
@@ -2,7 +2,7 @@
 Bug #28147 (Crash with anti-aliased line)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug36697-mb.phpt b/ext/gd/tests/bug36697-mb.phpt
index 371c8e48be452..8e7097eaa017f 100644
--- a/ext/gd/tests/bug36697-mb.phpt
+++ b/ext/gd/tests/bug36697-mb.phpt
@@ -2,9 +2,9 @@
 Bug #36697 (TrueColor transparency with GIF palette output).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug36697.phpt b/ext/gd/tests/bug36697.phpt
index 262b881ca0d96..990d65b2234cb 100644
--- a/ext/gd/tests/bug36697.phpt
+++ b/ext/gd/tests/bug36697.phpt
@@ -2,9 +2,9 @@
 Bug #36697 (TrueColor transparency with GIF palette output).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug37346-mb.phpt b/ext/gd/tests/bug37346-mb.phpt
index e1a9b8b4706c9..92a0416985fed 100644
--- a/ext/gd/tests/bug37346-mb.phpt
+++ b/ext/gd/tests/bug37346-mb.phpt
@@ -2,7 +2,7 @@
 Bug #37346 (gdimagecreatefromgif, bad colormap)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug37346.phpt b/ext/gd/tests/bug37346.phpt
index 40b3341685daa..3884024c45485 100644
--- a/ext/gd/tests/bug37346.phpt
+++ b/ext/gd/tests/bug37346.phpt
@@ -2,7 +2,7 @@
 Bug #37346 (gdimagecreatefromgif, bad colormap)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug37360.phpt b/ext/gd/tests/bug37360.phpt
index 74a58223a96c0..356c877f71539 100644
--- a/ext/gd/tests/bug37360.phpt
+++ b/ext/gd/tests/bug37360.phpt
@@ -2,7 +2,7 @@
 Bug #37360 (gdimagecreatefromgif, bad image sizes)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug38112.phpt b/ext/gd/tests/bug38112.phpt
index 4eb553b614384..328741a921901 100644
--- a/ext/gd/tests/bug38112.phpt
+++ b/ext/gd/tests/bug38112.phpt
@@ -2,9 +2,9 @@
 Bug #38112 (GIF Invalid Code size ).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug39082.phpt b/ext/gd/tests/bug39082.phpt
index 9bd6f5edc4e35..e6f1ad757560e 100644
--- a/ext/gd/tests/bug39082.phpt
+++ b/ext/gd/tests/bug39082.phpt
@@ -2,9 +2,9 @@
 Bug #39082 (Output image to stdout segfaults).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug39273.phpt b/ext/gd/tests/bug39273.phpt
index 7e938f4bb177e..3fb56761e7f2a 100644
--- a/ext/gd/tests/bug39273.phpt
+++ b/ext/gd/tests/bug39273.phpt
@@ -2,7 +2,7 @@
 Bug #37360 (gdimagecreatefromgif, bad image sizes)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug39366.phpt b/ext/gd/tests/bug39366.phpt
index 85c72fe860437..c23f9eadf1b65 100644
--- a/ext/gd/tests/bug39366.phpt
+++ b/ext/gd/tests/bug39366.phpt
@@ -2,8 +2,8 @@
 Bug #39366 (imagerotate does not respect alpha with angles>45)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!function_exists("imagerotate")) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug39508.phpt b/ext/gd/tests/bug39508.phpt
index f00a4aae4e2e1..6bfd83614fe42 100644
--- a/ext/gd/tests/bug39508.phpt
+++ b/ext/gd/tests/bug39508.phpt
@@ -2,7 +2,7 @@
 Bug #39508 (imagefill crashes with small images 3 pixels or less)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug39780.phpt b/ext/gd/tests/bug39780.phpt
index 6468f28b7342d..700dad46cfce0 100644
--- a/ext/gd/tests/bug39780.phpt
+++ b/ext/gd/tests/bug39780.phpt
@@ -2,8 +2,8 @@
 Bug #39780 (PNG image with CRC/data error raises a fatal error)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug39780_extern.phpt b/ext/gd/tests/bug39780_extern.phpt
index e090477314831..52c64534dc427 100644
--- a/ext/gd/tests/bug39780_extern.phpt
+++ b/ext/gd/tests/bug39780_extern.phpt
@@ -2,8 +2,8 @@
 Bug #39780 (PNG image with CRC/data error raises a fatal error)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (GD_BUNDLED) die("skip requires extern GD\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (GD_BUNDLED) die("skip requires extern GD\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug40764.phpt b/ext/gd/tests/bug40764.phpt
index 3802094e2552d..8a673207b60cd 100644
--- a/ext/gd/tests/bug40764.phpt
+++ b/ext/gd/tests/bug40764.phpt
@@ -2,7 +2,7 @@
 Bug #40764 (line thickness not respected for horizontal and vertical lines)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug41442.phpt b/ext/gd/tests/bug41442.phpt
index 351734931accc..2f88cc6d6cf27 100644
--- a/ext/gd/tests/bug41442.phpt
+++ b/ext/gd/tests/bug41442.phpt
@@ -2,12 +2,12 @@
 Bug #41442 (imagegd2() under output control)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagegd2")) {
-		die("skip GD2 support unavailable");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagegd2")) {
+        die("skip GD2 support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt
index 3db42a228e0ec..854e49eac4c62 100644
--- a/ext/gd/tests/bug42434.phpt
+++ b/ext/gd/tests/bug42434.phpt
@@ -3,7 +3,7 @@ Bug #42434 (ImageLine w/ antialias = 1px shorter)
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) {
-	die('skip gd extension not available');
+    die('skip gd extension not available');
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug43073.phpt b/ext/gd/tests/bug43073.phpt
index 74641496de970..4257f6c1a7d8f 100644
--- a/ext/gd/tests/bug43073.phpt
+++ b/ext/gd/tests/bug43073.phpt
@@ -2,8 +2,8 @@
 Bug #43073 (TrueType bounding box is wrong for angle<>0)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imagettftext')) die('skip imagettftext() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt
index 1c3a7e5bc7261..38668fdfbbcd6 100644
--- a/ext/gd/tests/bug43121.phpt
+++ b/ext/gd/tests/bug43121.phpt
@@ -2,10 +2,10 @@
 Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
-		die("skip test requires GD 2.2.0 or higher");
-	}
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) {
+        die("skip test requires GD 2.2.0 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt
index 9264299181c2f..71c567570a63c 100644
--- a/ext/gd/tests/bug43475.phpt
+++ b/ext/gd/tests/bug43475.phpt
@@ -2,10 +2,10 @@
 Bug #43475 (Thick styled lines have scrambled patterns)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug43828.phpt b/ext/gd/tests/bug43828.phpt
index 0f130d28fd356..de2b51ea3bdc5 100644
--- a/ext/gd/tests/bug43828.phpt
+++ b/ext/gd/tests/bug43828.phpt
@@ -4,7 +4,7 @@ Bug #43828 (broken transparency of imagearc for truecolor in blendingmode)
 <?php
 if (!extension_loaded('gd')) die('skip ext/gd not available');
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
+    die("skip test requires GD 2.2.2 or higher");
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug44849.phpt b/ext/gd/tests/bug44849.phpt
index 22e8a65ec45bc..4710f218f9b21 100644
--- a/ext/gd/tests/bug44849.phpt
+++ b/ext/gd/tests/bug44849.phpt
@@ -2,7 +2,7 @@
 Bug #44849 (imagecolorclosesthwb is not available on Windows)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug45799.phpt b/ext/gd/tests/bug45799.phpt
index 34fafa94231b9..fd7af45b91b8c 100644
--- a/ext/gd/tests/bug45799.phpt
+++ b/ext/gd/tests/bug45799.phpt
@@ -2,7 +2,7 @@
 Bug #45799 (imagepng() crashes on empty image).
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug48555.phpt b/ext/gd/tests/bug48555.phpt
index 03ee5a2b945a1..68c533d75a987 100644
--- a/ext/gd/tests/bug48555.phpt
+++ b/ext/gd/tests/bug48555.phpt
@@ -2,8 +2,8 @@
 Bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug48732-mb.phpt b/ext/gd/tests/bug48732-mb.phpt
index 437731bb4bdca..8f27d28086433 100644
--- a/ext/gd/tests/bug48732-mb.phpt
+++ b/ext/gd/tests/bug48732-mb.phpt
@@ -2,9 +2,9 @@
 Bug #48732 (TTF Bounding box wrong for letters below baseline)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imagefttext')) die('skip imagefttext() not available');
-	if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imagefttext')) die('skip imagefttext() not available');
+    if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug48732.phpt b/ext/gd/tests/bug48732.phpt
index b2be6a47f1ba1..323690e2a0919 100644
--- a/ext/gd/tests/bug48732.phpt
+++ b/ext/gd/tests/bug48732.phpt
@@ -2,8 +2,8 @@
 Bug #48732 (TTF Bounding box wrong for letters below baseline)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imagefttext')) die('skip imagefttext() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imagefttext')) die('skip imagefttext() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug48801-mb.phpt b/ext/gd/tests/bug48801-mb.phpt
index 1793ac33863b9..435af2d3904ee 100644
--- a/ext/gd/tests/bug48801-mb.phpt
+++ b/ext/gd/tests/bug48801-mb.phpt
@@ -2,9 +2,9 @@
 Bug #48801 (Problem with imagettfbbox)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
-	if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
+    if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug48801.phpt b/ext/gd/tests/bug48801.phpt
index b5e32af48063e..0975d7d774517 100644
--- a/ext/gd/tests/bug48801.phpt
+++ b/ext/gd/tests/bug48801.phpt
@@ -2,8 +2,8 @@
 Bug #48801 (Problem with imagettfbbox)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug49600.phpt b/ext/gd/tests/bug49600.phpt
index 79830be71f96f..3817391765cf7 100644
--- a/ext/gd/tests/bug49600.phpt
+++ b/ext/gd/tests/bug49600.phpt
@@ -2,9 +2,9 @@
 Bug #49600 (imageTTFText text shifted right)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imagettftext')) die('skip imagettftext() not available');
-	if(!function_exists('imagettfbbox')) die('skip imagettfbbox() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+    if(!function_exists('imagettfbbox')) die('skip imagettfbbox() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug51263.phpt b/ext/gd/tests/bug51263.phpt
index 6f14cd3c98463..04d827709465e 100644
--- a/ext/gd/tests/bug51263.phpt
+++ b/ext/gd/tests/bug51263.phpt
@@ -2,8 +2,8 @@
 Bug #51263 (imagettftext and rotated text uses wrong baseline)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imagettftext')) die('skip imagettftext() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug51671.phpt b/ext/gd/tests/bug51671.phpt
index 1d72e734a95e0..1520e84f35e32 100644
--- a/ext/gd/tests/bug51671.phpt
+++ b/ext/gd/tests/bug51671.phpt
@@ -2,7 +2,7 @@
 Bug #51671 (imagefill does not work correctly for small images)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug53504.phpt b/ext/gd/tests/bug53504.phpt
index 11e7a8af57f2d..3a6a06006aa06 100644
--- a/ext/gd/tests/bug53504.phpt
+++ b/ext/gd/tests/bug53504.phpt
@@ -2,8 +2,8 @@
 Bug #53504 imagettfbbox/imageftbbox gives incorrect values for bounding box
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imageftbbox')) die('skip imageftbbox() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug60160.phpt b/ext/gd/tests/bug60160.phpt
index c6a50ba48b33f..ed7b463c305e2 100644
--- a/ext/gd/tests/bug60160.phpt
+++ b/ext/gd/tests/bug60160.phpt
@@ -2,7 +2,7 @@
 Bug #60160 (imagefill does not work correctly for small images) @see bug51671
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt
index 4eb2e28730c73..69f76e5719afb 100644
--- a/ext/gd/tests/bug64641.phpt
+++ b/ext/gd/tests/bug64641.phpt
@@ -4,7 +4,7 @@ Bug #64641 (imagefilledpolygon doesn't draw horizontal line)
 <?php
 if (!extension_loaded('gd')) die("skip gd extension not available\n");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
+    die("skip test requires GD 2.2.2 or higher");
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt
index a255997ca08aa..0803ed48bdfdd 100644
--- a/ext/gd/tests/bug66356.phpt
+++ b/ext/gd/tests/bug66356.phpt
@@ -2,7 +2,7 @@
 Bug #66356 (Heap Overflow Vulnerability in imagecrop())
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug67447.phpt b/ext/gd/tests/bug67447.phpt
index c17454433d944..985183effcafa 100644
--- a/ext/gd/tests/bug67447.phpt
+++ b/ext/gd/tests/bug67447.phpt
@@ -2,9 +2,9 @@
 Bug #67447 (imagecrop() adds a black line when cropping)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug70976.phpt b/ext/gd/tests/bug70976.phpt
index cd10a8ffc03d8..6af034383fdf6 100644
--- a/ext/gd/tests/bug70976.phpt
+++ b/ext/gd/tests/bug70976.phpt
@@ -2,7 +2,7 @@
 Bug #70976 (Memory Read via gdImageRotateInterpolated Array Index Out of Bounds)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug71952.phpt b/ext/gd/tests/bug71952.phpt
index 6aed9e9361754..0a4a8e31a0bfd 100644
--- a/ext/gd/tests/bug71952.phpt
+++ b/ext/gd/tests/bug71952.phpt
@@ -2,7 +2,7 @@
 Bug #71952 (Corruption inside imageaffinematrixget)
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72227.phpt b/ext/gd/tests/bug72227.phpt
index fb1b5bde94c1a..943d961f46c41 100644
--- a/ext/gd/tests/bug72227.phpt
+++ b/ext/gd/tests/bug72227.phpt
@@ -2,7 +2,7 @@
 Bug #72227: imagescale out-of-bounds read
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72298.phpt b/ext/gd/tests/bug72298.phpt
index a3aa491cbe978..0224c2ed4fdc3 100644
--- a/ext/gd/tests/bug72298.phpt
+++ b/ext/gd/tests/bug72298.phpt
@@ -2,7 +2,7 @@
 Bug #72298: pass2_no_dither out-of-bounds access
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt
index 4baaa92ab21e1..442f6ab290fff 100644
--- a/ext/gd/tests/bug72339.phpt
+++ b/ext/gd/tests/bug72339.phpt
@@ -4,7 +4,7 @@ Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
 <?php
 if (!function_exists("imagecreatefromgd2")) print "skip";
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
+    die("skip test requires GD 2.2.2 or higher");
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt
index e9331ec600639..96b6de10237d7 100644
--- a/ext/gd/tests/bug72512.phpt
+++ b/ext/gd/tests/bug72512.phpt
@@ -2,10 +2,10 @@
 Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd))
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72512_0.phpt b/ext/gd/tests/bug72512_0.phpt
index 565d60a6329f5..d9c6c8e297ca1 100644
--- a/ext/gd/tests/bug72512_0.phpt
+++ b/ext/gd/tests/bug72512_0.phpt
@@ -2,10 +2,10 @@
 Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var 0
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/bug72512_1.phpt b/ext/gd/tests/bug72512_1.phpt
index 2983ff29b89de..0c5ae7cb767ce 100644
--- a/ext/gd/tests/bug72512_1.phpt
+++ b/ext/gd/tests/bug72512_1.phpt
@@ -2,10 +2,10 @@
 Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var 1
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/crafted_gd2.phpt b/ext/gd/tests/crafted_gd2.phpt
index a5b0dfe339bba..1bf9895c1b6c9 100644
--- a/ext/gd/tests/crafted_gd2.phpt
+++ b/ext/gd/tests/crafted_gd2.phpt
@@ -2,9 +2,9 @@
 Test max colors for a gd image.
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available\n");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/createfromwbmp2.phpt b/ext/gd/tests/createfromwbmp2.phpt
index c6a1a22427d6a..37f7cd48ff6c1 100644
--- a/ext/gd/tests/createfromwbmp2.phpt
+++ b/ext/gd/tests/createfromwbmp2.phpt
@@ -2,8 +2,8 @@
 imagecreatefromwbmp with invalid wbmp
 --SKIPIF--
 <?php
-	if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/createfromwbmp2_extern.phpt b/ext/gd/tests/createfromwbmp2_extern.phpt
index ab15ec024e7e7..b426816f5b224 100644
--- a/ext/gd/tests/createfromwbmp2_extern.phpt
+++ b/ext/gd/tests/createfromwbmp2_extern.phpt
@@ -2,8 +2,8 @@
 imagecreatefromwbmp with invalid wbmp
 --SKIPIF--
 <?php
-	if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
-	if (GD_BUNDLED) die("skip requires extern GD\n");
+    if (!function_exists('imagecreatefromwbmp')) die("skip gd extension not available\n");
+    if (GD_BUNDLED) die("skip requires extern GD\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/gd_info_basic.phpt b/ext/gd/tests/gd_info_basic.phpt
index 5c18b1f2ce7e6..61f73d97e7d95 100644
--- a/ext/gd/tests/gd_info_basic.phpt
+++ b/ext/gd/tests/gd_info_basic.phpt
@@ -2,9 +2,9 @@
 gd_info()
 --SKIPIF--
 <?php
-	if (!function_exists('gd_info')) {
-		die('skip gd_info() not available');
-	}
+    if (!function_exists('gd_info')) {
+        die('skip gd_info() not available');
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/gif.phpt b/ext/gd/tests/gif.phpt
index 8315fb0dbc3b9..75b8322715bb9 100644
--- a/ext/gd/tests/gif.phpt
+++ b/ext/gd/tests/gif.phpt
@@ -2,12 +2,12 @@
 gif in/out
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagegif") || !function_exists("imagecreatefromgif") || !function_exists('imagecreatefromjpeg')) {
-		die("skip gif support unavailable");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagegif") || !function_exists("imagecreatefromgif") || !function_exists('imagecreatefromjpeg')) {
+        die("skip gif support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/gif2gd.phpt b/ext/gd/tests/gif2gd.phpt
index a741cadb26516..1d8a8278a1c41 100644
--- a/ext/gd/tests/gif2gd.phpt
+++ b/ext/gd/tests/gif2gd.phpt
@@ -2,13 +2,13 @@
 gif --> gd1/gd2 conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefromgif")) {
-		die("skip gif read support unavailable");
-	}
+    if (!function_exists("imagecreatefromgif")) {
+        die("skip gif read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/gif2jpg.phpt b/ext/gd/tests/gif2jpg.phpt
index b0ce474886ab0..ba02bed00e155 100644
--- a/ext/gd/tests/gif2jpg.phpt
+++ b/ext/gd/tests/gif2jpg.phpt
@@ -2,16 +2,16 @@
 gif --> jpeg conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagejpeg")) {
-		die("skip jpeg support unavailable");
-	}
-	if (!function_exists("imagecreatefromgif")) {
-		die("skip gif read support unavailable");
-	}
+    if (!function_exists("imagejpeg")) {
+        die("skip jpeg support unavailable");
+    }
+    if (!function_exists("imagecreatefromgif")) {
+        die("skip gif read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/gif2png.phpt b/ext/gd/tests/gif2png.phpt
index 295a80944c908..c051d73425788 100644
--- a/ext/gd/tests/gif2png.phpt
+++ b/ext/gd/tests/gif2png.phpt
@@ -2,16 +2,16 @@
 gif --> png conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagepng")) {
-		die("skip png support unavailable");
-	}
-	if (!function_exists("imagecreatefromgif")) {
-		die("skip gif read support unavailable");
-	}
+    if (!function_exists("imagepng")) {
+        die("skip png support unavailable");
+    }
+    if (!function_exists("imagecreatefromgif")) {
+        die("skip gif read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagechar_basic.phpt b/ext/gd/tests/imagechar_basic.phpt
index 3616f449ec3eb..54b8c6df8ec49 100644
--- a/ext/gd/tests/imagechar_basic.phpt
+++ b/ext/gd/tests/imagechar_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecharup_basic.phpt b/ext/gd/tests/imagecharup_basic.phpt
index 258f8b6e38cfd..15984eaf7fbcf 100644
--- a/ext/gd/tests/imagecharup_basic.phpt
+++ b/ext/gd/tests/imagecharup_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
index e7b5807bbcb60..d6e19b8eef6fa 100644
--- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt
+++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt
@@ -4,10 +4,10 @@ Testing imagecolorallocatealpha()
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecolordeallocate_basic.phpt b/ext/gd/tests/imagecolordeallocate_basic.phpt
index 877e8b64c4b58..6f8c3b7506392 100644
--- a/ext/gd/tests/imagecolordeallocate_basic.phpt
+++ b/ext/gd/tests/imagecolordeallocate_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecolordeallocate_error3.phpt b/ext/gd/tests/imagecolordeallocate_error3.phpt
index 51df328f8c835..92568667b0353 100644
--- a/ext/gd/tests/imagecolordeallocate_error3.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error3.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecolordeallocate_error4.phpt b/ext/gd/tests/imagecolordeallocate_error4.phpt
index 6d9bceb3ac91f..1a4b9e61c5aad 100644
--- a/ext/gd/tests/imagecolordeallocate_error4.phpt
+++ b/ext/gd/tests/imagecolordeallocate_error4.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecolorset_basic.phpt b/ext/gd/tests/imagecolorset_basic.phpt
index ef7f361ad519f..3da518912808d 100644
--- a/ext/gd/tests/imagecolorset_basic.phpt
+++ b/ext/gd/tests/imagecolorset_basic.phpt
@@ -6,7 +6,7 @@ Erick Belluci Tedeschi <erickbt86 [at] gmail [dot] com>
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) {
-	die('skip gd extension is not loaded');
+    die('skip gd extension is not loaded');
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt
index 955dee9848fdd..0d03ecf7586f6 100644
--- a/ext/gd/tests/imagecolourstotal_basic.phpt
+++ b/ext/gd/tests/imagecolourstotal_basic.phpt
@@ -4,12 +4,12 @@ Test imagecolorstotal() function : basic functionality
 Felix De Vliegher <felix.devliegher@gmail.com>
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagecolorstotal")) {
-		die("skip imagecolorstotal() not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagecolorstotal")) {
+        die("skip imagecolorstotal() not available.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index de1f25c0e00a1..1d6012e3f96e7 100644
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -2,7 +2,7 @@
 imagecopyresampled()
 --SKIPIF--
 <?php
-	if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
+    if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available');
 ?>
 --FILE--
 <?php
@@ -52,10 +52,10 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-	$dest_lge = dirname(realpath(__FILE__)) . '/imagelarge.png';
-	$dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png';
-	@unlink($dest_lge);
-	@unlink($dest_sml);
+    $dest_lge = dirname(realpath(__FILE__)) . '/imagelarge.png';
+    $dest_sml = dirname(realpath(__FILE__)) . '/imagesmall.png';
+    @unlink($dest_lge);
+    @unlink($dest_sml);
 ?>
 --EXPECT--
 Simple test of imagecopyresampled() function
diff --git a/ext/gd/tests/imagecreate_error.phpt b/ext/gd/tests/imagecreate_error.phpt
index b0b6c3abf7e94..3e16c1f034193 100644
--- a/ext/gd/tests/imagecreate_error.phpt
+++ b/ext/gd/tests/imagecreate_error.phpt
@@ -2,8 +2,8 @@
 Testing imagecreate(): error on out of bound parameters
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreate")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreate")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecreatetruecolor_basic.phpt b/ext/gd/tests/imagecreatetruecolor_basic.phpt
index 2da09cd18bb1a..bb29eb6b1cb25 100644
--- a/ext/gd/tests/imagecreatetruecolor_basic.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_basic.phpt
@@ -4,8 +4,8 @@ Testing imagecreatetruecolor() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagecreatetruecolor_error2.phpt b/ext/gd/tests/imagecreatetruecolor_error2.phpt
index 995aa03d7ed02..09870e2826475 100644
--- a/ext/gd/tests/imagecreatetruecolor_error2.phpt
+++ b/ext/gd/tests/imagecreatetruecolor_error2.phpt
@@ -4,8 +4,8 @@ Testing imagecreatetruecolor(): error on out of bound parameters
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt
index 258eabf854b8a..28ad43c7068bd 100644
--- a/ext/gd/tests/imagedashedline_basic.phpt
+++ b/ext/gd/tests/imagedashedline_basic.phpt
@@ -2,7 +2,7 @@
 imagedashedline()
 --SKIPIF--
 <?php
-	if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
+    if (!function_exists('imagedashedline')) die('skip imagedashedline() not available');
 ?>
 --FILE--
 <?php
@@ -41,8 +41,8 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-	$dest = dirname(realpath(__FILE__)) . '/imagedashedline.png';
-	@unlink($dest);
+    $dest = dirname(realpath(__FILE__)) . '/imagedashedline.png';
+    @unlink($dest);
 ?>
 --EXPECT--
 Simple test of imagedashedline() function
diff --git a/ext/gd/tests/imagefill_1.phpt b/ext/gd/tests/imagefill_1.phpt
index f356fe826df43..ea2129b52b0ef 100644
--- a/ext/gd/tests/imagefill_1.phpt
+++ b/ext/gd/tests/imagefill_1.phpt
@@ -2,12 +2,12 @@
 imagefill() infinite loop with wrong color index
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagefttext")) {
-		die("skip imagefttext() not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagefttext")) {
+        die("skip imagefttext() not available.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt
index b353d808e6a30..199d435d9dd1a 100644
--- a/ext/gd/tests/imagefilledarc_basic.phpt
+++ b/ext/gd/tests/imagefilledarc_basic.phpt
@@ -7,7 +7,7 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 <?php
 if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
+    die("skip test requires GD 2.2.2 or higher");
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt
index cc6e01b4ad495..f17651afef249 100644
--- a/ext/gd/tests/imagefilledarc_variation1.phpt
+++ b/ext/gd/tests/imagefilledarc_variation1.phpt
@@ -7,7 +7,7 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 <?php
 if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
+    die("skip test requires GD 2.2.2 or higher");
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt
index feb81a8e0628c..b388882390983 100644
--- a/ext/gd/tests/imagefilledarc_variation2.phpt
+++ b/ext/gd/tests/imagefilledarc_variation2.phpt
@@ -7,7 +7,7 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br>
 <?php
 if (!extension_loaded("gd")) die("skip GD not present");
 if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-	die("skip test requires GD 2.2.2 or higher");
+    die("skip test requires GD 2.2.2 or higher");
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt
index 165e685052d47..6462f42de736e 100644
--- a/ext/gd/tests/imagefilledpolygon_basic.phpt
+++ b/ext/gd/tests/imagefilledpolygon_basic.phpt
@@ -2,7 +2,7 @@
 imagefilledpolygon()
 --SKIPIF--
 <?php
-	if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
+    if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available');
 ?>
 --FILE--
 <?php
@@ -57,8 +57,8 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-	$dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png';
-	@unlink($dest);
+    $dest = dirname(realpath(__FILE__)) . '/imagefilledpolygon.png';
+    @unlink($dest);
 ?>
 --EXPECT--
 Simple test of imagefilledpolygon() function
diff --git a/ext/gd/tests/imagefilter.phpt b/ext/gd/tests/imagefilter.phpt
index f040c5cac4490..a55b88ee90384 100644
--- a/ext/gd/tests/imagefilter.phpt
+++ b/ext/gd/tests/imagefilter.phpt
@@ -2,10 +2,10 @@
 imagefilter() function test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagefilter")) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagefilter")) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefontheight_basic.phpt b/ext/gd/tests/imagefontheight_basic.phpt
index ddb47c7cbd97f..65d6ec15bbe02 100644
--- a/ext/gd/tests/imagefontheight_basic.phpt
+++ b/ext/gd/tests/imagefontheight_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefontwidth_basic.phpt b/ext/gd/tests/imagefontwidth_basic.phpt
index 2e3a5eb3caf4d..87eac74133718 100644
--- a/ext/gd/tests/imagefontwidth_basic.phpt
+++ b/ext/gd/tests/imagefontwidth_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagefttext.phpt b/ext/gd/tests/imagefttext.phpt
index d140af858e97a..52ed27aadbf22 100644
--- a/ext/gd/tests/imagefttext.phpt
+++ b/ext/gd/tests/imagefttext.phpt
@@ -2,12 +2,12 @@
 imagefttext() function test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagefttext")) {
-		die("skip imagefttext() not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagefttext")) {
+        die("skip imagefttext() not available.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt
index 0e3203e9857af..449363f8e68f0 100644
--- a/ext/gd/tests/imagegammacorrect_basic.phpt
+++ b/ext/gd/tests/imagegammacorrect_basic.phpt
@@ -5,10 +5,10 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt
index 8cc978a6fff0e..81b3ac7d46ee3 100644
--- a/ext/gd/tests/imagegammacorrect_variation1.phpt
+++ b/ext/gd/tests/imagegammacorrect_variation1.phpt
@@ -5,10 +5,10 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imageistruecolor_basic.phpt b/ext/gd/tests/imageistruecolor_basic.phpt
index fa323897ba7e9..971a9dc3b8f68 100644
--- a/ext/gd/tests/imageistruecolor_basic.phpt
+++ b/ext/gd/tests/imageistruecolor_basic.phpt
@@ -4,8 +4,8 @@ Testing imageistruecolor() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
index 2f175271d158b..be385b8bdc4cc 100644
--- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
@@ -5,7 +5,7 @@ Testing null byte injection in imagejpeg
 if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['JPEG Support']) || $support['JPEG Support'] === false) {
-	print 'skip jpeg support not available';
+    print 'skip jpeg support not available';
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt
index 5a9c380758218..dc41148394b00 100644
--- a/ext/gd/tests/imagelayereffect_basic.phpt
+++ b/ext/gd/tests/imagelayereffect_basic.phpt
@@ -5,8 +5,8 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt
index a4ad10839b913..6d30c1de337b7 100644
--- a/ext/gd/tests/imageloadfont_error2.phpt
+++ b/ext/gd/tests/imageloadfont_error2.phpt
@@ -4,7 +4,7 @@ Testing that imageloadfont() breaks on invalid file passed as first argument
 Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imageloadfont_invalid.phpt b/ext/gd/tests/imageloadfont_invalid.phpt
index 0ef49da2a5129..7bf326160c0c8 100644
--- a/ext/gd/tests/imageloadfont_invalid.phpt
+++ b/ext/gd/tests/imageloadfont_invalid.phpt
@@ -2,7 +2,7 @@
 imageloadfont() function crashes
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index 830ee542baada..8a415478ddcef 100644
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -5,7 +5,7 @@ Testing null byte injection in imagepng
 if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['PNG Support']) || $support['PNG Support'] === false) {
-	print 'skip png support not available';
+    print 'skip png support not available';
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagepolygon_basic.phpt b/ext/gd/tests/imagepolygon_basic.phpt
index d4948fcc61016..bea4462c6a160 100644
--- a/ext/gd/tests/imagepolygon_basic.phpt
+++ b/ext/gd/tests/imagepolygon_basic.phpt
@@ -2,7 +2,7 @@
 imagepolygon()
 --SKIPIF--
 <?php
-	if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
+    if (!function_exists('imagepolygon')) die('skip imagepolygon() not available');
 ?>
 --FILE--
 <?php
@@ -43,8 +43,8 @@ echo "Done\n";
 ?>
 --CLEAN--
 <?php
-	$dest = dirname(realpath(__FILE__)) . '/imagepolygon.png';
-	@unlink($dest);
+    $dest = dirname(realpath(__FILE__)) . '/imagepolygon.png';
+    @unlink($dest);
 ?>
 --EXPECT--
 Simple test of imagepolygon() function
diff --git a/ext/gd/tests/imagerotate_overflow.phpt b/ext/gd/tests/imagerotate_overflow.phpt
index ade61d8f801ce..34d66862ea5bf 100644
--- a/ext/gd/tests/imagerotate_overflow.phpt
+++ b/ext/gd/tests/imagerotate_overflow.phpt
@@ -2,13 +2,13 @@
 imagerotate() overflow with negative numbers
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists('imagerotate')) {
-		die("skip imagerotate() not available.");
-	}
+    if (!function_exists('imagerotate')) {
+        die("skip imagerotate() not available.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagesetbrush_basic.phpt b/ext/gd/tests/imagesetbrush_basic.phpt
index 0afe6fc1d0133..ae6a52a28ed16 100644
--- a/ext/gd/tests/imagesetbrush_basic.phpt
+++ b/ext/gd/tests/imagesetbrush_basic.phpt
@@ -6,7 +6,7 @@ Erick Belluci Tedeschi <erickbt86 [at] gmail [dot] com>
 --SKIPIF--
 <?php
 if (!extension_loaded('gd')) {
-	die('skip gd extension is not loaded');
+    die('skip gd extension is not loaded');
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagesetthickness_basic.phpt b/ext/gd/tests/imagesetthickness_basic.phpt
index 376d18f790b91..30bd6094aa083 100644
--- a/ext/gd/tests/imagesetthickness_basic.phpt
+++ b/ext/gd/tests/imagesetthickness_basic.phpt
@@ -4,8 +4,8 @@ Testing imagetruecolortopalette() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagestring_basic.phpt b/ext/gd/tests/imagestring_basic.phpt
index 1265fed6e603a..0e418a69dd0b5 100644
--- a/ext/gd/tests/imagestring_basic.phpt
+++ b/ext/gd/tests/imagestring_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagestringup_basic.phpt b/ext/gd/tests/imagestringup_basic.phpt
index 4a53da464ff94..93ea4f34ea2a5 100644
--- a/ext/gd/tests/imagestringup_basic.phpt
+++ b/ext/gd/tests/imagestringup_basic.phpt
@@ -5,7 +5,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 #testfest PHPSP on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
+    if (!extension_loaded("gd")) die("skip GD not present");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt
index 18aa04a35d9c5..6c6ceb2f9fe56 100644
--- a/ext/gd/tests/imagetruecolortopalette_basic.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt
@@ -4,11 +4,11 @@ Testing imagetruecolortopalette() of GD library
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
-		die("skip test requires GD 2.2.2 or higher");
-	}
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) {
+        die("skip test requires GD 2.2.2 or higher");
+    }
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagetruecolortopalette_error3.phpt b/ext/gd/tests/imagetruecolortopalette_error3.phpt
index 707f7e37bce14..3fd8be0c3adb3 100644
--- a/ext/gd/tests/imagetruecolortopalette_error3.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error3.phpt
@@ -4,8 +4,8 @@ Testing imagetruecolortopalette(): wrong parameters for parameter 3
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagetruecolortopalette_error4.phpt b/ext/gd/tests/imagetruecolortopalette_error4.phpt
index 5726befab25a3..dd24aecc8154b 100644
--- a/ext/gd/tests/imagetruecolortopalette_error4.phpt
+++ b/ext/gd/tests/imagetruecolortopalette_error4.phpt
@@ -4,8 +4,8 @@ Testing imagetruecolortopalette(): out of range parameter 3
 Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("gd")) die("skip GD not present");
-	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+    if (!extension_loaded("gd")) die("skip GD not present");
+    if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imagettftext_charmap_order.phpt b/ext/gd/tests/imagettftext_charmap_order.phpt
index 850ca806b6a7a..36d2449fb18c6 100644
--- a/ext/gd/tests/imagettftext_charmap_order.phpt
+++ b/ext/gd/tests/imagettftext_charmap_order.phpt
@@ -2,8 +2,8 @@
 Font charmap order is deterministic based on order in the font, use the selected encoding
 --SKIPIF--
 <?php
-	if(!extension_loaded('gd')){ die('skip gd extension not available'); }
-	if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+    if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+    if(!function_exists('imagettftext')) die('skip imagettftext() not available');
   if(gd_info()['JIS-mapped Japanese Font Support']) die('skip JIS-mapped Japanese Font Support not supported');
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
index 8f2bdcec5951e..d7c3f0c41617b 100644
--- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
@@ -5,7 +5,7 @@ Testing null byte injection in imagewbmp
 if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['WBMP Support']) || $support['WBMP Support'] === false) {
-	print 'skip wbmp support not available';
+    print 'skip wbmp support not available';
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/imagewebp_nullbyte_injection.phpt b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
index c48fd7d821fd0..52ecc59941247 100644
--- a/ext/gd/tests/imagewebp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
@@ -5,7 +5,7 @@ Testing null byte injection in imagewebp
 if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['WebP Support']) || $support['WebP Support'] === false) {
-	print 'skip webp support not available';
+    print 'skip webp support not available';
 }
 ?>
 --FILE--
diff --git a/ext/gd/tests/jpeg2png.phpt b/ext/gd/tests/jpeg2png.phpt
index dfcd1ef1a264f..cae283d10b968 100644
--- a/ext/gd/tests/jpeg2png.phpt
+++ b/ext/gd/tests/jpeg2png.phpt
@@ -2,16 +2,16 @@
 jpeg <--> png conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
-		die("skip png support unavailable");
-	}
-	if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
-		die("skip jpeg support unavailable");
-	}
+    if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
+        die("skip png support unavailable");
+    }
+    if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
+        die("skip jpeg support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/jpg2gd-mb.phpt b/ext/gd/tests/jpg2gd-mb.phpt
index 8cf4ffd28399a..d68ff24dd5635 100644
--- a/ext/gd/tests/jpg2gd-mb.phpt
+++ b/ext/gd/tests/jpg2gd-mb.phpt
@@ -2,13 +2,13 @@
 jpeg <--> gd1/gd2 conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
-		die("skip jpeg support unavailable");
-	}
+    if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
+        die("skip jpeg support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/jpg2gd.phpt b/ext/gd/tests/jpg2gd.phpt
index da671e01ac056..855f7a53212e4 100644
--- a/ext/gd/tests/jpg2gd.phpt
+++ b/ext/gd/tests/jpg2gd.phpt
@@ -2,13 +2,13 @@
 jpeg <--> gd1/gd2 conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
-		die("skip jpeg support unavailable");
-	}
+    if (!function_exists("imagecreatefromjpeg") || !function_exists("imagejpeg")) {
+        die("skip jpeg support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00086.phpt b/ext/gd/tests/libgd00086.phpt
index 959828f0685ac..69afee8090189 100644
--- a/ext/gd/tests/libgd00086.phpt
+++ b/ext/gd/tests/libgd00086.phpt
@@ -2,8 +2,8 @@
 libgd #86 (Possible infinite loop in imagecreatefrompng)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00086_extern.phpt b/ext/gd/tests/libgd00086_extern.phpt
index 78bafa761e88b..1cdb28fee8623 100644
--- a/ext/gd/tests/libgd00086_extern.phpt
+++ b/ext/gd/tests/libgd00086_extern.phpt
@@ -2,8 +2,8 @@
 libgd #86 (Possible infinite loop in imagecreatefrompng)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (GD_BUNDLED) die("skip requires external GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (GD_BUNDLED) die("skip requires external GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00094-mb.phpt b/ext/gd/tests/libgd00094-mb.phpt
index 7ce24a43b22c2..ca313893d52cc 100644
--- a/ext/gd/tests/libgd00094-mb.phpt
+++ b/ext/gd/tests/libgd00094-mb.phpt
@@ -2,8 +2,8 @@
 libgd #94 (imagecreatefromxbm can crash if gdImageCreate fails)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00094.phpt b/ext/gd/tests/libgd00094.phpt
index 8af0b342d97c0..f9cbeec871916 100644
--- a/ext/gd/tests/libgd00094.phpt
+++ b/ext/gd/tests/libgd00094.phpt
@@ -2,8 +2,8 @@
 libgd #94 (imagecreatefromxbm can crash if gdImageCreate fails)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00100.phpt b/ext/gd/tests/libgd00100.phpt
index c6fa6dd30e5cc..9392fcf83469c 100644
--- a/ext/gd/tests/libgd00100.phpt
+++ b/ext/gd/tests/libgd00100.phpt
@@ -2,8 +2,8 @@
 libgd #100 (spurious horizontal line drawn by gdImageFilledPolygon)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00101.phpt b/ext/gd/tests/libgd00101.phpt
index d2e278ced9888..0206bd626b745 100644
--- a/ext/gd/tests/libgd00101.phpt
+++ b/ext/gd/tests/libgd00101.phpt
@@ -2,8 +2,8 @@
 libgd #101 (imagecreatefromgd can crash if gdImageCreate fails)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00106.phpt b/ext/gd/tests/libgd00106.phpt
index d651b0bb1f6fe..151d126075559 100644
--- a/ext/gd/tests/libgd00106.phpt
+++ b/ext/gd/tests/libgd00106.phpt
@@ -2,7 +2,7 @@
 libgd #106 (imagerectangle 1x1 draws 1x3)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00186.phpt b/ext/gd/tests/libgd00186.phpt
index cb1686b5ac412..0df501c268d45 100644
--- a/ext/gd/tests/libgd00186.phpt
+++ b/ext/gd/tests/libgd00186.phpt
@@ -2,7 +2,7 @@
 libgd #186 (Tiling true colour with palette image does not work)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/libgd00191.phpt b/ext/gd/tests/libgd00191.phpt
index 983b93e180e14..692d012c72ef2 100644
--- a/ext/gd/tests/libgd00191.phpt
+++ b/ext/gd/tests/libgd00191.phpt
@@ -2,8 +2,8 @@
 libgd FS#191 (A circle becomes square)
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) die("skip gd extension not available\n");
-	if (!GD_BUNDLED) die("skip requires bundled GD library\n");
+    if (!extension_loaded('gd')) die("skip gd extension not available\n");
+    if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/png2gd.phpt b/ext/gd/tests/png2gd.phpt
index 850cdd0be2f73..0df1e0611a223 100644
--- a/ext/gd/tests/png2gd.phpt
+++ b/ext/gd/tests/png2gd.phpt
@@ -2,13 +2,13 @@
 png <--> gd1/gd2 conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
-		die("skip png support unavailable");
-	}
+    if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
+        die("skip png support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/pngcomp.phpt b/ext/gd/tests/pngcomp.phpt
index f9065ea82add7..880e3a5b525b7 100644
--- a/ext/gd/tests/pngcomp.phpt
+++ b/ext/gd/tests/pngcomp.phpt
@@ -2,13 +2,13 @@
 png compression test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
-		die("skip png support unavailable");
-	}
+    if (!function_exists("imagecreatefrompng") || !function_exists("imagepng")) {
+        die("skip png support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/xbm2png.phpt b/ext/gd/tests/xbm2png.phpt
index 9b1b4013c89ef..c3b77f2e369a1 100644
--- a/ext/gd/tests/xbm2png.phpt
+++ b/ext/gd/tests/xbm2png.phpt
@@ -2,15 +2,15 @@
 xbm --> png conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
-	if (!function_exists("imagepng")) {
-		die("skip png support unavailable");
-	}
-	if (!function_exists("imagecreatefromxbm")) {
-		die("skip xbm read support unavailable");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
+    if (!function_exists("imagepng")) {
+        die("skip png support unavailable");
+    }
+    if (!function_exists("imagecreatefromxbm")) {
+        die("skip xbm read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/xpm2gd.phpt b/ext/gd/tests/xpm2gd.phpt
index dba9f03ec8e27..47e6c2faf1da5 100644
--- a/ext/gd/tests/xpm2gd.phpt
+++ b/ext/gd/tests/xpm2gd.phpt
@@ -2,13 +2,13 @@
 xpm --> gd1/gd2 conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagecreatefromxpm")) {
-		die("skip xpm read support unavailable");
-	}
+    if (!function_exists("imagecreatefromxpm")) {
+        die("skip xpm read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/xpm2jpg.phpt b/ext/gd/tests/xpm2jpg.phpt
index 6491b85646557..c16c3d89cf878 100644
--- a/ext/gd/tests/xpm2jpg.phpt
+++ b/ext/gd/tests/xpm2jpg.phpt
@@ -2,16 +2,16 @@
 xpm --> jpeg conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagejpeg")) {
-		die("skip jpeg support unavailable");
-	}
-	if (!function_exists("imagecreatefromxpm")) {
-		die("skip xpm read support unavailable");
-	}
+    if (!function_exists("imagejpeg")) {
+        die("skip jpeg support unavailable");
+    }
+    if (!function_exists("imagecreatefromxpm")) {
+        die("skip xpm read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/xpm2png.phpt b/ext/gd/tests/xpm2png.phpt
index 602fc72a7cff0..c9902f07631b1 100644
--- a/ext/gd/tests/xpm2png.phpt
+++ b/ext/gd/tests/xpm2png.phpt
@@ -2,16 +2,16 @@
 xpm --> png conversion test
 --SKIPIF--
 <?php
-	if (!extension_loaded('gd')) {
-		die("skip gd extension not available.");
-	}
+    if (!extension_loaded('gd')) {
+        die("skip gd extension not available.");
+    }
 
-	if (!function_exists("imagepng")) {
-		die("skip png support unavailable");
-	}
-	if (!function_exists("imagecreatefromxpm")) {
-		die("skip xpm read support unavailable");
-	}
+    if (!function_exists("imagepng")) {
+        die("skip png support unavailable");
+    }
+    if (!function_exists("imagecreatefromxpm")) {
+        die("skip xpm read support unavailable");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gettext/tests/44938.phpt b/ext/gettext/tests/44938.phpt
index 4dc45260f8467..1de644a9339c2 100644
--- a/ext/gettext/tests/44938.phpt
+++ b/ext/gettext/tests/44938.phpt
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 if (!extension_loaded("gettext")) {
-	die("skip\n");
+    die("skip\n");
 }
 --FILE--
 <?php
diff --git a/ext/gettext/tests/bug66267.phpt b/ext/gettext/tests/bug66267.phpt
index 749f4cd1a2fe4..3b0b3fd0eeab6 100644
--- a/ext/gettext/tests/bug66267.phpt
+++ b/ext/gettext/tests/bug66267.phpt
@@ -3,20 +3,20 @@
 --SKIPIF--
 <?php
 if (!extension_loaded("gettext")) {
-	die("skip\n");
+    die("skip\n");
 }
 if (PHP_ZTS) {
-	/* this is supposed to fail on the TS build at least on Windows,
-	should be even XFAIL till it's fixed there */
-	die("skip NTS only");
+    /* this is supposed to fail on the TS build at least on Windows,
+    should be even XFAIL till it's fixed there */
+    die("skip NTS only");
 }
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	$loc = ["de_DE", "fr_FR", "en_US"];
-	foreach($loc as $l) {
-		if (!setlocale(LC_ALL, $l)) {
-			die("SKIP '$l' locale not supported.");
-		}
-	}
+    $loc = ["de_DE", "fr_FR", "en_US"];
+    foreach($loc as $l) {
+        if (!setlocale(LC_ALL, $l)) {
+            die("SKIP '$l' locale not supported.");
+        }
+    }
 }
 ?>
 --FILE--
diff --git a/ext/gettext/tests/gettext_basic-enus.phpt b/ext/gettext/tests/gettext_basic-enus.phpt
index edbd31cc48180..6fcd5bed80499 100644
--- a/ext/gettext/tests/gettext_basic-enus.phpt
+++ b/ext/gettext/tests/gettext_basic-enus.phpt
@@ -2,12 +2,12 @@
 Gettext basic test with en_US locale that should be on nearly every system
 --SKIPIF--
 <?php
-	if (!extension_loaded("gettext")) {
-		die("skip\n");
-	}
-	if (!setlocale(LC_ALL, 'en_US.UTF-8')) {
-		die("skip en_US.UTF-8 locale not supported.");
-	}
+    if (!extension_loaded("gettext")) {
+        die("skip\n");
+    }
+    if (!setlocale(LC_ALL, 'en_US.UTF-8')) {
+        die("skip en_US.UTF-8 locale not supported.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gettext/tests/gettext_basic.phpt b/ext/gettext/tests/gettext_basic.phpt
index 26e7b7017ec5a..b02c1e78a000c 100644
--- a/ext/gettext/tests/gettext_basic.phpt
+++ b/ext/gettext/tests/gettext_basic.phpt
@@ -2,12 +2,12 @@
 Gettext basic test
 --SKIPIF--
 <?php
-	if (!extension_loaded("gettext")) {
-		die("skip\n");
-	}
-	if (!setlocale(LC_ALL, 'fi_FI')) {
-		die("skip fi_FI locale not supported.");
-	}
+    if (!extension_loaded("gettext")) {
+        die("skip\n");
+    }
+    if (!setlocale(LC_ALL, 'fi_FI')) {
+        die("skip fi_FI locale not supported.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
index 498568294ad95..cc86d780400af 100644
--- a/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
+++ b/ext/gettext/tests/gettext_bind_textdomain_codeset-retval.phpt
@@ -2,9 +2,9 @@
 test if bind_textdomain_codeset() returns correct value
 --SKIPIF--
 <?php
-	if (!extension_loaded("gettext")) {
-		die("skip");
-	}
+    if (!extension_loaded("gettext")) {
+        die("skip");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gettext/tests/gettext_ngettext.phpt b/ext/gettext/tests/gettext_ngettext.phpt
index e9a7de7e7384a..19a51f116b369 100644
--- a/ext/gettext/tests/gettext_ngettext.phpt
+++ b/ext/gettext/tests/gettext_ngettext.phpt
@@ -2,12 +2,12 @@
 Test ngettext() functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded("gettext")) {
-		die("SKIP extension gettext not loaded\n");
-	}
-	if (!setlocale(LC_ALL, 'en_US.UTF-8')) {
-		die("SKIP en_US.UTF-8 locale not supported.");
-	}
+    if (!extension_loaded("gettext")) {
+        die("SKIP extension gettext not loaded\n");
+    }
+    if (!setlocale(LC_ALL, 'en_US.UTF-8')) {
+        die("SKIP en_US.UTF-8 locale not supported.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gettext/tests/gettext_phpinfo.phpt b/ext/gettext/tests/gettext_phpinfo.phpt
index a2bc332ea2a1b..0b7603651a16e 100644
--- a/ext/gettext/tests/gettext_phpinfo.phpt
+++ b/ext/gettext/tests/gettext_phpinfo.phpt
@@ -2,9 +2,9 @@
 Test phpinfo() displays gettext support
 --SKIPIF--
 <?php
-	if (!extension_loaded("gettext")) {
-		die("SKIP extension gettext not loaded\n");
-	}
+    if (!extension_loaded("gettext")) {
+        die("SKIP extension gettext not loaded\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gettext/tests/gettext_textdomain-retval.phpt b/ext/gettext/tests/gettext_textdomain-retval.phpt
index c5326a99dfef6..98927c740b105 100644
--- a/ext/gettext/tests/gettext_textdomain-retval.phpt
+++ b/ext/gettext/tests/gettext_textdomain-retval.phpt
@@ -2,12 +2,12 @@
 Check if textdomain() returns the new domain
 --SKIPIF--
 <?php
-	if (!extension_loaded("gettext")) {
-		die("skip\n");
-	}
-	if (!setlocale(LC_ALL, 'en_US.UTF-8')) {
-		die("skip en_US.UTF-8 locale not supported.");
-	}
+    if (!extension_loaded("gettext")) {
+        die("skip\n");
+    }
+    if (!setlocale(LC_ALL, 'en_US.UTF-8')) {
+        die("skip en_US.UTF-8 locale not supported.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/gmp/tests/gmp_divexact.phpt b/ext/gmp/tests/gmp_divexact.phpt
index f148693ef3f39..15182bbbee7b3 100644
--- a/ext/gmp/tests/gmp_divexact.phpt
+++ b/ext/gmp/tests/gmp_divexact.phpt
@@ -4,7 +4,7 @@ gmp_divexact() tests
 <?php
 if (!extension_loaded("gmp")) die ("skip");
 if (!defined('GMP_VERSION') || version_compare("4.2.1", GMP_VERSION, ">=")) {
-	die("skip your GMP is too old and will crash");
+    die("skip your GMP is too old and will crash");
 }
 ?>
 --FILE--
diff --git a/ext/gmp/tests/gmp_setbit_long.phpt b/ext/gmp/tests/gmp_setbit_long.phpt
index 065c8f8208fd6..a967a80d76fd7 100644
--- a/ext/gmp/tests/gmp_setbit_long.phpt
+++ b/ext/gmp/tests/gmp_setbit_long.phpt
@@ -6,19 +6,19 @@ gmp_setbit() with large index
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?>
 <?php
-	/* This test requires about 8G RAM which likely not to be present on an arbitrary CI. */
-	if (!file_exists("/proc/meminfo")) {
-		die("skip cannot determine free memory amount.");
-	}
-	$s = file_get_contents("/proc/meminfo");
-	$free = 0;
-	if (preg_match(",MemFree:\s+(\d+)\s+kB,", $s, $m)) {
-		/* Got amount in kb. */
-		$free = $m[1]/1024/1024;
-	}
-	if ($free < 8) {
-		die("skip not enough free RAM.");
-	}
+    /* This test requires about 8G RAM which likely not to be present on an arbitrary CI. */
+    if (!file_exists("/proc/meminfo")) {
+        die("skip cannot determine free memory amount.");
+    }
+    $s = file_get_contents("/proc/meminfo");
+    $free = 0;
+    if (preg_match(",MemFree:\s+(\d+)\s+kB,", $s, $m)) {
+        /* Got amount in kb. */
+        $free = $m[1]/1024/1024;
+    }
+    if ($free < 8) {
+        die("skip not enough free RAM.");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/iconv/tests/bug37176.phpt b/ext/iconv/tests/bug37176.phpt
index c562ceac850de..d1da176b6a108 100644
--- a/ext/iconv/tests/bug37176.phpt
+++ b/ext/iconv/tests/bug37176.phpt
@@ -6,7 +6,7 @@ include('skipif.inc');
 
 $test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
 if ($test === false) {
-	die("skip UTF-8 is not supported?");
+    die("skip UTF-8 is not supported?");
 }
 
 ?>
diff --git a/ext/iconv/tests/bug37773.phpt b/ext/iconv/tests/bug37773.phpt
index e2fb6a55e6a8b..3b520c6e022a3 100644
--- a/ext/iconv/tests/bug37773.phpt
+++ b/ext/iconv/tests/bug37773.phpt
@@ -6,7 +6,7 @@ include('skipif.inc');
 
 $test = @iconv_strpos("abbttt","ttt",0,"UTF-8");
 if ($test === false) {
-	die("skip UTF-8 is not supported?");
+    die("skip UTF-8 is not supported?");
 }
 
 ?>
diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index 6be5a86a69eba..c43402262ece5 100644
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -4,7 +4,7 @@ iconv() test 2 (UCS4BE to ASCII)
 <?php
 include('skipif.inc');
 if (@iconv("ascii","UCS-4LE", "abcd") == '') {
-	die("skip conversion to UCS-4LE not supported");
+    die("skip conversion to UCS-4LE not supported");
 }
 ?>
 --INI--
diff --git a/ext/imap/tests/bug45705_1.phpt b/ext/imap/tests/bug45705_1.phpt
index f699451407e11..05d3a0a2f6b9d 100644
--- a/ext/imap/tests/bug45705_1.phpt
+++ b/ext/imap/tests/bug45705_1.phpt
@@ -2,9 +2,9 @@
 Bug #45705 test #1 (imap rfc822_parse_adrlist() modifies passed address parameter)
 --SKIPIF--
 <?php
-	if (!extension_loaded("imap")) {
-		die("skip imap extension not available");
-	}
+    if (!extension_loaded("imap")) {
+        die("skip imap extension not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/imap/tests/bug45705_2.phpt b/ext/imap/tests/bug45705_2.phpt
index b8c1c295aee09..3de50290f7e38 100644
--- a/ext/imap/tests/bug45705_2.phpt
+++ b/ext/imap/tests/bug45705_2.phpt
@@ -2,9 +2,9 @@
 Bug #45705 test #2 (imap rfc822_parse_adrlist() modifies passed address parameter)
 --SKIPIF--
 <?php
-	if (!extension_loaded("imap")) {
-		die("skip imap extension not available");
-	}
+    if (!extension_loaded("imap")) {
+        die("skip imap extension not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/imap/tests/bug77153.phpt b/ext/imap/tests/bug77153.phpt
index 63590aee1dde4..7b759621fe16f 100644
--- a/ext/imap/tests/bug77153.phpt
+++ b/ext/imap/tests/bug77153.phpt
@@ -2,8 +2,8 @@
 Bug #77153 (imap_open allows to run arbitrary shell commands via mailbox parameter)
 --SKIPIF--
 <?php
-        if (!extension_loaded("imap")) { 
-                die("skip imap extension not available");  
+        if (!extension_loaded("imap")) {
+                die("skip imap extension not available");
         }
 ?>
 --FILE--
diff --git a/ext/intl/tests/breakiter___construct.phpt b/ext/intl/tests/breakiter___construct.phpt
index 16ca32bf184f6..716de728ae7b6 100644
--- a/ext/intl/tests/breakiter___construct.phpt
+++ b/ext/intl/tests/breakiter___construct.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::__construct() should not be callable
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_clone_basic.phpt b/ext/intl/tests/breakiter_clone_basic.phpt
index 4e997a84188b9..7ee277bc5c518 100644
--- a/ext/intl/tests/breakiter_clone_basic.phpt
+++ b/ext/intl/tests/breakiter_clone_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator: clone handler
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_createCodePointInstance_basic.phpt b/ext/intl/tests/breakiter_createCodePointInstance_basic.phpt
index bf07edf3beb19..954d404c04cd0 100644
--- a/ext/intl/tests/breakiter_createCodePointInstance_basic.phpt
+++ b/ext/intl/tests/breakiter_createCodePointInstance_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::createCodePointInstance(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_current_basic.phpt b/ext/intl/tests/breakiter_current_basic.phpt
index 6715d08f554be..3edad104fe994 100644
--- a/ext/intl/tests/breakiter_current_basic.phpt
+++ b/ext/intl/tests/breakiter_current_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::current(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_factories_basic.phpt b/ext/intl/tests/breakiter_factories_basic.phpt
index 0e2c65fb445ce..bed60e1c1f5c4 100644
--- a/ext/intl/tests/breakiter_factories_basic.phpt
+++ b/ext/intl/tests/breakiter_factories_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator factories: basic tests
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_first_basic.phpt b/ext/intl/tests/breakiter_first_basic.phpt
index 24c015f3fbdd9..a74c29857572e 100644
--- a/ext/intl/tests/breakiter_first_basic.phpt
+++ b/ext/intl/tests/breakiter_first_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::first(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_following_basic.phpt b/ext/intl/tests/breakiter_following_basic.phpt
index 4b56f03c3976f..b6af697b479eb 100644
--- a/ext/intl/tests/breakiter_following_basic.phpt
+++ b/ext/intl/tests/breakiter_following_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::following(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
index c3210906c7aec..428bf158bf80a 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU <= 57.1
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
 ?>
 --FILE--
diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
index 834da13ecea7d..826f57e45ab9e 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::getPartsIterator(): basic test, ICU >= 58.1
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
 ?>
 --FILE--
diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
index f86e64d4ccdd7..cd518b19d4d02 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::getPartsIterator(): bad args
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.default_locale", "pt_PT");
diff --git a/ext/intl/tests/breakiter_getPartsIterator_var1.phpt b/ext/intl/tests/breakiter_getPartsIterator_var1.phpt
index 3ad2c73a99289..2e83daa0154d4 100644
--- a/ext/intl/tests/breakiter_getPartsIterator_var1.phpt
+++ b/ext/intl/tests/breakiter_getPartsIterator_var1.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::getPartsIterator(): argument variations
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_getText_basic.phpt b/ext/intl/tests/breakiter_getText_basic.phpt
index 3efc1ca89fe00..a52fd58d8d1a9 100644
--- a/ext/intl/tests/breakiter_getText_basic.phpt
+++ b/ext/intl/tests/breakiter_getText_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::getText(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_isBoundary_basic.phpt b/ext/intl/tests/breakiter_isBoundary_basic.phpt
index 598d1f9d01729..8c8212d34f766 100644
--- a/ext/intl/tests/breakiter_isBoundary_basic.phpt
+++ b/ext/intl/tests/breakiter_isBoundary_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::isBoundary(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_last_basic.phpt b/ext/intl/tests/breakiter_last_basic.phpt
index 014c57872552a..50213d2a7ea93 100644
--- a/ext/intl/tests/breakiter_last_basic.phpt
+++ b/ext/intl/tests/breakiter_last_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::last(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_next_basic.phpt b/ext/intl/tests/breakiter_next_basic.phpt
index fa40eed4bdffa..27e8f60ed332d 100644
--- a/ext/intl/tests/breakiter_next_basic.phpt
+++ b/ext/intl/tests/breakiter_next_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::next(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_preceding_basic.phpt b/ext/intl/tests/breakiter_preceding_basic.phpt
index 31feb5efb2ce4..b272bddf5bf4d 100644
--- a/ext/intl/tests/breakiter_preceding_basic.phpt
+++ b/ext/intl/tests/breakiter_preceding_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::preceding(): basic test, ICU <= 57.1
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '57.1') > 0) die('skip for ICU <= 57.1');
 ?>
 --FILE--
diff --git a/ext/intl/tests/breakiter_preceding_basic2.phpt b/ext/intl/tests/breakiter_preceding_basic2.phpt
index 8c1ee625e4517..53446b2f6bc2c 100644
--- a/ext/intl/tests/breakiter_preceding_basic2.phpt
+++ b/ext/intl/tests/breakiter_preceding_basic2.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::preceding(): basic test, ICU >= 58.1
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '57.1') <= 0) die('skip for ICU >= 58.1');
 --FILE--
 <?php
diff --git a/ext/intl/tests/breakiter_previous_basic.phpt b/ext/intl/tests/breakiter_previous_basic.phpt
index b30399365a35f..cd754456b60af 100644
--- a/ext/intl/tests/breakiter_previous_basic.phpt
+++ b/ext/intl/tests/breakiter_previous_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::previous(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/breakiter_setText_basic.phpt b/ext/intl/tests/breakiter_setText_basic.phpt
index 0526fe0e51c6c..1cab0f2d34977 100644
--- a/ext/intl/tests/breakiter_setText_basic.phpt
+++ b/ext/intl/tests/breakiter_setText_basic.phpt
@@ -3,7 +3,7 @@ IntlBreakIterator::setText(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/bug58756_MessageFormatter.phpt b/ext/intl/tests/bug58756_MessageFormatter.phpt
index 01673b8c485c9..e30f11dde893d 100644
--- a/ext/intl/tests/bug58756_MessageFormatter.phpt
+++ b/ext/intl/tests/bug58756_MessageFormatter.phpt
@@ -3,9 +3,9 @@ Bug #58756: w.r.t MessageFormatter
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '51.2') >=  0)
-	die('skip for ICU < 51.2');
+    die('skip for ICU < 51.2');
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt b/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt
index 790033c95b572..2c3b7bf4098b7 100644
--- a/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt
+++ b/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt
@@ -3,9 +3,9 @@ Bug #58756: w.r.t MessageFormatter
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '51.2') < 0)
-	die('skip for ICU >= 51.2');
+    die('skip for ICU >= 51.2');
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug60192-compare.phpt b/ext/intl/tests/bug60192-compare.phpt
index 4830e73d9cf82..46a585cdd2cd4 100644
--- a/ext/intl/tests/bug60192-compare.phpt
+++ b/ext/intl/tests/bug60192-compare.phpt
@@ -2,7 +2,7 @@
 Bug #60192 (SegFault when Collator not constructed properly)
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl')) { die('skip intl extension not available'); }
+    if (!extension_loaded('intl')) { die('skip intl extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug60192-getlocale.phpt b/ext/intl/tests/bug60192-getlocale.phpt
index 2fea77cbd5720..90378c0c1a20a 100644
--- a/ext/intl/tests/bug60192-getlocale.phpt
+++ b/ext/intl/tests/bug60192-getlocale.phpt
@@ -2,7 +2,7 @@
 Bug #60192 (SegFault when Collator not constructed properly)
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl')) { die('skip intl extension not available'); }
+    if (!extension_loaded('intl')) { die('skip intl extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug60192-getsortkey.phpt b/ext/intl/tests/bug60192-getsortkey.phpt
index e00858bbd1c74..954e0b63e3b7a 100644
--- a/ext/intl/tests/bug60192-getsortkey.phpt
+++ b/ext/intl/tests/bug60192-getsortkey.phpt
@@ -2,7 +2,7 @@
 Bug #60192 (SegFault when Collator not constructed properly)
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl')) { die('skip intl extension not available'); }
+    if (!extension_loaded('intl')) { die('skip intl extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug60192-sort.phpt b/ext/intl/tests/bug60192-sort.phpt
index e0d20f7c3c539..8489a6db7da39 100644
--- a/ext/intl/tests/bug60192-sort.phpt
+++ b/ext/intl/tests/bug60192-sort.phpt
@@ -2,7 +2,7 @@
 Bug #60192 (SegFault when Collator not constructed properly)
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl')) { die('skip intl extension not available'); }
+    if (!extension_loaded('intl')) { die('skip intl extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug60192-sortwithsortkeys.phpt b/ext/intl/tests/bug60192-sortwithsortkeys.phpt
index f324d052b0e33..698672ef8f73d 100644
--- a/ext/intl/tests/bug60192-sortwithsortkeys.phpt
+++ b/ext/intl/tests/bug60192-sortwithsortkeys.phpt
@@ -2,7 +2,7 @@
 Bug #60192 (SegFault when Collator not constructed properly)
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl')) { die('skip intl extension not available'); }
+    if (!extension_loaded('intl')) { die('skip intl extension not available'); }
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/bug62017.phpt b/ext/intl/tests/bug62017.phpt
index 28e0bb570ad45..0032ae8337275 100644
--- a/ext/intl/tests/bug62017.phpt
+++ b/ext/intl/tests/bug62017.phpt
@@ -3,7 +3,7 @@ Bug #62017: datefmt_create with incorrectly encoded timezone leaks pattern
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set('intl.error_level', E_WARNING);
diff --git a/ext/intl/tests/bug62081.phpt b/ext/intl/tests/bug62081.phpt
index a9889d26d919a..3693e3e20b57b 100644
--- a/ext/intl/tests/bug62081.phpt
+++ b/ext/intl/tests/bug62081.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set('intl.error_level', E_WARNING);
diff --git a/ext/intl/tests/bug62082.phpt b/ext/intl/tests/bug62082.phpt
index ab0eca20b9413..449a3b8c4a192 100644
--- a/ext/intl/tests/bug62082.phpt
+++ b/ext/intl/tests/bug62082.phpt
@@ -3,7 +3,7 @@ Bug #62082: Memory corruption in internal get_icu_disp_value_src_php()
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 var_dump(locale_get_display_name(str_repeat("a", 300), null));
diff --git a/ext/intl/tests/bug62083.phpt b/ext/intl/tests/bug62083.phpt
index 7bfa53058bae5..5b0f36e4f0872 100644
--- a/ext/intl/tests/bug62083.phpt
+++ b/ext/intl/tests/bug62083.phpt
@@ -3,7 +3,7 @@ Bug #62083: grapheme_extract() leaks memory
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 $arr1 = array();
diff --git a/ext/intl/tests/bug62915-2.phpt b/ext/intl/tests/bug62915-2.phpt
index 411023dc41872..d5a7a81944bce 100644
--- a/ext/intl/tests/bug62915-2.phpt
+++ b/ext/intl/tests/bug62915-2.phpt
@@ -3,9 +3,9 @@ Bug #62915: cloning of several classes is defective
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	    die('skip intl extension not enabled');
+        die('skip intl extension not enabled');
 if (!class_exists('Spoofchecker'))
-		die('skip intl extension does not have spoof checker');
+        die('skip intl extension does not have spoof checker');
 --FILE--
 <?php
 class A extends IntlDateFormatter {
diff --git a/ext/intl/tests/bug62915.phpt b/ext/intl/tests/bug62915.phpt
index 09d757f63a70c..923cfe805fdbd 100644
--- a/ext/intl/tests/bug62915.phpt
+++ b/ext/intl/tests/bug62915.phpt
@@ -3,7 +3,7 @@ Bug #62915: incomplete cloning of IntlTimeZone objects
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	    die('skip intl extension not enabled');
+        die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/bug74484_MessageFormatter.phpt b/ext/intl/tests/bug74484_MessageFormatter.phpt
index da2fe6acdabbe..152dc0b741f82 100644
--- a/ext/intl/tests/bug74484_MessageFormatter.phpt
+++ b/ext/intl/tests/bug74484_MessageFormatter.phpt
@@ -3,7 +3,7 @@ Bug #74484 MessageFormatter::formatMessage memory corruption with 11+ named plac
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/calendar_add_basic.phpt b/ext/intl/tests/calendar_add_basic.phpt
index 3e8ed55579b79..9c20ddda320bd 100644
--- a/ext/intl/tests/calendar_add_basic.phpt
+++ b/ext/intl/tests/calendar_add_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_add_error.phpt b/ext/intl/tests/calendar_add_error.phpt
index 2fdf7e0c9cc0e..4b64274642721 100644
--- a/ext/intl/tests/calendar_add_error.phpt
+++ b/ext/intl/tests/calendar_add_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_before_after_error.phpt b/ext/intl/tests/calendar_before_after_error.phpt
index 707ad08f0d636..850e59128dc69 100644
--- a/ext/intl/tests/calendar_before_after_error.phpt
+++ b/ext/intl/tests/calendar_before_after_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_clear_basic.phpt b/ext/intl/tests/calendar_clear_basic.phpt
index 1c4b40f424cc2..5845541b94470 100644
--- a/ext/intl/tests/calendar_clear_basic.phpt
+++ b/ext/intl/tests/calendar_clear_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::clear() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_clear_error.phpt b/ext/intl/tests/calendar_clear_error.phpt
index 1e61f173155bc..ef3e0e9dcbf9a 100644
--- a/ext/intl/tests/calendar_clear_error.phpt
+++ b/ext/intl/tests/calendar_clear_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_clear_variation1.phpt b/ext/intl/tests/calendar_clear_variation1.phpt
index 6bc97b6c71b0f..ef7f57a2a85d3 100644
--- a/ext/intl/tests/calendar_clear_variation1.phpt
+++ b/ext/intl/tests/calendar_clear_variation1.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_const_field_field_count.phpt b/ext/intl/tests/calendar_const_field_field_count.phpt
index db7d57addec7a..83249aa654ffe 100644
--- a/ext/intl/tests/calendar_const_field_field_count.phpt
+++ b/ext/intl/tests/calendar_const_field_field_count.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 var_dump(IntlCalendar::FIELD_FIELD_COUNT);
diff --git a/ext/intl/tests/calendar_createInstance_basic.phpt b/ext/intl/tests/calendar_createInstance_basic.phpt
index 1dcb8f892f05d..4af69ed93979f 100644
--- a/ext/intl/tests/calendar_createInstance_basic.phpt
+++ b/ext/intl/tests/calendar_createInstance_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::createInstance() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_createInstance_error.phpt b/ext/intl/tests/calendar_createInstance_error.phpt
index 19d817b6beeb7..7438dc9f4c595 100644
--- a/ext/intl/tests/calendar_createInstance_error.phpt
+++ b/ext/intl/tests/calendar_createInstance_error.phpt
@@ -3,7 +3,7 @@ IntlCalendar::createInstance: bad arguments
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_createInstance_variation1.phpt b/ext/intl/tests/calendar_createInstance_variation1.phpt
index 3bd0084c7805b..48783a7bb4cfe 100644
--- a/ext/intl/tests/calendar_createInstance_variation1.phpt
+++ b/ext/intl/tests/calendar_createInstance_variation1.phpt
@@ -3,7 +3,7 @@ IntlCalendar::createInstance() argument variations
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_equals_before_after_basic.phpt b/ext/intl/tests/calendar_equals_before_after_basic.phpt
index 49604a47d6f51..ff9484b4ea8c9 100644
--- a/ext/intl/tests/calendar_equals_before_after_basic.phpt
+++ b/ext/intl/tests/calendar_equals_before_after_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_equals_error.phpt b/ext/intl/tests/calendar_equals_error.phpt
index 177518e381f41..f2ea3fefd0cfc 100644
--- a/ext/intl/tests/calendar_equals_error.phpt
+++ b/ext/intl/tests/calendar_equals_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_fieldDifference_basic.phpt b/ext/intl/tests/calendar_fieldDifference_basic.phpt
index 918f279fb159b..9a1e0fd27a1bb 100644
--- a/ext/intl/tests/calendar_fieldDifference_basic.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_fieldDifference_error.phpt b/ext/intl/tests/calendar_fieldDifference_error.phpt
index c43cbfe92f46e..7df49f092d103 100644
--- a/ext/intl/tests/calendar_fieldDifference_error.phpt
+++ b/ext/intl/tests/calendar_fieldDifference_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_fromDateTime_basic.phpt b/ext/intl/tests/calendar_fromDateTime_basic.phpt
index 84010329a6d1e..d8c59714a2698 100644
--- a/ext/intl/tests/calendar_fromDateTime_basic.phpt
+++ b/ext/intl/tests/calendar_fromDateTime_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::fromDateTime(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_fromDateTime_error.phpt b/ext/intl/tests/calendar_fromDateTime_error.phpt
index c610335bb3350..40a56228c1c1f 100644
--- a/ext/intl/tests/calendar_fromDateTime_error.phpt
+++ b/ext/intl/tests/calendar_fromDateTime_error.phpt
@@ -3,7 +3,7 @@ IntlCalendar::fromDateTime(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getAvailableLocales_basic.phpt b/ext/intl/tests/calendar_getAvailableLocales_basic.phpt
index a5071545e2652..15fd39f0a4489 100644
--- a/ext/intl/tests/calendar_getAvailableLocales_basic.phpt
+++ b/ext/intl/tests/calendar_getAvailableLocales_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getAvailableLocales() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt b/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt
index c525dca988ba5..9a73ffcea95a1 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt
@@ -5,9 +5,9 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '52.1') >= 0)
-	die('skip for ICU < 52.1');
+    die('skip for ICU < 52.1');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt b/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt
index 982eaf4251b83..a4dac59144c19 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt
@@ -5,9 +5,9 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 if (version_compare(INTL_ICU_VERSION, '52.1') < 0)
-	die('skip for ICU >= 52.1');
+    die('skip for ICU >= 52.1');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
index 512d29743bd20..9a066d800b78a 100644
--- a/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
+++ b/ext/intl/tests/calendar_getDayOfWeekType_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 $c = new IntlGregorianCalendar(NULL, 'pt_PT');
diff --git a/ext/intl/tests/calendar_getErrorCode_error.phpt b/ext/intl/tests/calendar_getErrorCode_error.phpt
index 7c7481ebbf541..d7e739f2eaf24 100644
--- a/ext/intl/tests/calendar_getErrorCode_error.phpt
+++ b/ext/intl/tests/calendar_getErrorCode_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt b/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt
index 2bd97330edf02..fe57b1833e797 100644
--- a/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt
+++ b/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getErrorMessage_error.phpt b/ext/intl/tests/calendar_getErrorMessage_error.phpt
index 7b94b607b0191..39a456e53fff9 100644
--- a/ext/intl/tests/calendar_getErrorMessage_error.phpt
+++ b/ext/intl/tests/calendar_getErrorMessage_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt
index 3858b8a937138..d61436ba5ccf8 100644
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getFirstDayOfWeek() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
index 353c5cb09924b..55769f0f37450 100644
--- a/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_getFirstDayOfWeek_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt b/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt
index fbfe8515b98ad..4c649f0e647b5 100644
--- a/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt
+++ b/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getKeywordValuesForLocale() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getLocale_basic.phpt b/ext/intl/tests/calendar_getLocale_basic.phpt
index 92b61d35d5379..bb4d3b8887223 100644
--- a/ext/intl/tests/calendar_getLocale_basic.phpt
+++ b/ext/intl/tests/calendar_getLocale_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getLocale() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getLocale_error.phpt b/ext/intl/tests/calendar_getLocale_error.phpt
index a7711e45659a0..eea3109934544 100644
--- a/ext/intl/tests/calendar_getLocale_error.phpt
+++ b/ext/intl/tests/calendar_getLocale_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt
index 2206c6e0be6d3..1b579ccfcb175 100644
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getMinimalDaysInFirstWeek() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
index c5918dae37115..296887247dcb8 100644
--- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getNow_basic.phpt b/ext/intl/tests/calendar_getNow_basic.phpt
index bc103420c4c2d..00bed7f8d7e24 100644
--- a/ext/intl/tests/calendar_getNow_basic.phpt
+++ b/ext/intl/tests/calendar_getNow_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getNow() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
index 3d604da1b4719..7dfa0e36b2b83 100644
--- a/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_getSkipped_RepeatedWallTimeOption_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getTimeZone_basic.phpt b/ext/intl/tests/calendar_getTimeZone_basic.phpt
index acd3effb20bd6..509700b564dc6 100644
--- a/ext/intl/tests/calendar_getTimeZone_basic.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getTimeZone() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getTimeZone_error.phpt b/ext/intl/tests/calendar_getTimeZone_error.phpt
index 4ccd28243c4ab..b1f3ab6fe1038 100644
--- a/ext/intl/tests/calendar_getTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_getTimeZone_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getTime_basic.phpt b/ext/intl/tests/calendar_getTime_basic.phpt
index b644bc0737a04..6ef757fa9d423 100644
--- a/ext/intl/tests/calendar_getTime_basic.phpt
+++ b/ext/intl/tests/calendar_getTime_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getTime_error.phpt b/ext/intl/tests/calendar_getTime_error.phpt
index 13f5253728924..7c958d11df62c 100644
--- a/ext/intl/tests/calendar_getTime_error.phpt
+++ b/ext/intl/tests/calendar_getTime_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getType_basic.phpt b/ext/intl/tests/calendar_getType_basic.phpt
index 495caa390e96f..c861ff0965763 100644
--- a/ext/intl/tests/calendar_getType_basic.phpt
+++ b/ext/intl/tests/calendar_getType_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getType_error.phpt b/ext/intl/tests/calendar_getType_error.phpt
index 30c2cb90e8607..46ba6f13bc645 100644
--- a/ext/intl/tests/calendar_getType_error.phpt
+++ b/ext/intl/tests/calendar_getType_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getWeekendTransition_basic.phpt b/ext/intl/tests/calendar_getWeekendTransition_basic.phpt
index 616f40b5266ae..0ba8d207ec5dd 100644
--- a/ext/intl/tests/calendar_getWeekendTransition_basic.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getWeekendTransition_error.phpt b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
index 87bb96d2200eb..b20dfdd0ce15d 100644
--- a/ext/intl/tests/calendar_getWeekendTransition_error.phpt
+++ b/ext/intl/tests/calendar_getWeekendTransition_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getXMaximum_basic.phpt b/ext/intl/tests/calendar_getXMaximum_basic.phpt
index 82e77b8c8eb33..72f48fd53333f 100644
--- a/ext/intl/tests/calendar_getXMaximum_basic.phpt
+++ b/ext/intl/tests/calendar_getXMaximum_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_getXMinimum_basic.phpt b/ext/intl/tests/calendar_getXMinimum_basic.phpt
index a1f52b361d299..e4e879b78b8d3 100644
--- a/ext/intl/tests/calendar_getXMinimum_basic.phpt
+++ b/ext/intl/tests/calendar_getXMinimum_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
index 13952ce6b205a..7b0d682c7361e 100644
--- a/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
+++ b/ext/intl/tests/calendar_get_Least_Greatest_Minimum_Maximum_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_get_basic.phpt b/ext/intl/tests/calendar_get_basic.phpt
index dc008ce9599f4..750ae03341ea5 100644
--- a/ext/intl/tests/calendar_get_basic.phpt
+++ b/ext/intl/tests/calendar_get_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::get() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
index 2b5f344cb14e2..2bc603780b4e7 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
index afc3df210a293..00f8ca3c66e83 100644
--- a/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
+++ b/ext/intl/tests/calendar_get_getActualMaximum_Minumum_error2.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
index 83e6b846453fe..d671dda235c1a 100644
--- a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
+++ b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::get/setRepeatedWallTimeOption(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt
index 2f96aaf96df3c..3e5e3d98970bc 100644
--- a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt
+++ b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::get/setSkippedWallTimeOption(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_inDaylightTime_basic.phpt b/ext/intl/tests/calendar_inDaylightTime_basic.phpt
index 6bbf833be79bc..3bb566cf2f688 100644
--- a/ext/intl/tests/calendar_inDaylightTime_basic.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_inDaylightTime_error.phpt b/ext/intl/tests/calendar_inDaylightTime_error.phpt
index f0cb1d0cb1a93..51bbf77d9b43e 100644
--- a/ext/intl/tests/calendar_inDaylightTime_error.phpt
+++ b/ext/intl/tests/calendar_inDaylightTime_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_isEquivalentTo_basic.phpt b/ext/intl/tests/calendar_isEquivalentTo_basic.phpt
index 5e78c0b92c758..f312941f4d6ae 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_basic.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::isEquivalentTo() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_isEquivalentTo_error.phpt b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
index a387b8cbd0d03..33e5d415ce05e 100644
--- a/ext/intl/tests/calendar_isEquivalentTo_error.phpt
+++ b/ext/intl/tests/calendar_isEquivalentTo_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_isLenient_error.phpt b/ext/intl/tests/calendar_isLenient_error.phpt
index b4e499cbb3df4..35e1d848bf8a6 100644
--- a/ext/intl/tests/calendar_isLenient_error.phpt
+++ b/ext/intl/tests/calendar_isLenient_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_isSet_basic.phpt b/ext/intl/tests/calendar_isSet_basic.phpt
index 39f0026e63909..fa4af38dc49cb 100644
--- a/ext/intl/tests/calendar_isSet_basic.phpt
+++ b/ext/intl/tests/calendar_isSet_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::isSet() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_isSet_error.phpt b/ext/intl/tests/calendar_isSet_error.phpt
index f7d3c3960113c..f1e3f67a2e1c0 100644
--- a/ext/intl/tests/calendar_isSet_error.phpt
+++ b/ext/intl/tests/calendar_isSet_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_isWeekend_basic.phpt b/ext/intl/tests/calendar_isWeekend_basic.phpt
index 943bd9a29ae9e..be0dac90ff9ae 100644
--- a/ext/intl/tests/calendar_isWeekend_basic.phpt
+++ b/ext/intl/tests/calendar_isWeekend_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_isWeekend_error.phpt b/ext/intl/tests/calendar_isWeekend_error.phpt
index 72e4708c88b86..7e2b8e044e677 100644
--- a/ext/intl/tests/calendar_isWeekend_error.phpt
+++ b/ext/intl/tests/calendar_isWeekend_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_is_set_lenient_basic.phpt b/ext/intl/tests/calendar_is_set_lenient_basic.phpt
index b7e2be42931f0..bb3d706dd311e 100644
--- a/ext/intl/tests/calendar_is_set_lenient_basic.phpt
+++ b/ext/intl/tests/calendar_is_set_lenient_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::isLenient(), ::setLenient() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_roll_basic.phpt b/ext/intl/tests/calendar_roll_basic.phpt
index 14db357c00eb4..beed750d72258 100644
--- a/ext/intl/tests/calendar_roll_basic.phpt
+++ b/ext/intl/tests/calendar_roll_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_roll_error.phpt b/ext/intl/tests/calendar_roll_error.phpt
index 1cad8c7e62847..fccf0ec8f5492 100644
--- a/ext/intl/tests/calendar_roll_error.phpt
+++ b/ext/intl/tests/calendar_roll_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_roll_variation1.phpt b/ext/intl/tests/calendar_roll_variation1.phpt
index 54f584d3eb70d..0e16ca7298068 100644
--- a/ext/intl/tests/calendar_roll_variation1.phpt
+++ b/ext/intl/tests/calendar_roll_variation1.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt
index 5ca4afc918f45..17d2d72f824ac 100644
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::setFirstDayOfWeek() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
index 5aae101c335f7..a7efe5ad98d3d 100644
--- a/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
+++ b/ext/intl/tests/calendar_setFirstDayOfWeek_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_setLenient_error.phpt b/ext/intl/tests/calendar_setLenient_error.phpt
index 63051c86a9763..a43fee9113df3 100644
--- a/ext/intl/tests/calendar_setLenient_error.phpt
+++ b/ext/intl/tests/calendar_setLenient_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt
index e2566085310ce..69577e701f9e9 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::setMinimalDaysInFirstWeek() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
index 05c6cb8e904da..8d4cf161eac12 100644
--- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
+++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
index 45f34911a1d33..40224bed152f4 100644
--- a/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
+++ b/ext/intl/tests/calendar_setSkipped_RepeatedWallTimeOption_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTimeZone_basic.phpt b/ext/intl/tests/calendar_setTimeZone_basic.phpt
index 7e52589b81b3e..dadd6187de8d4 100644
--- a/ext/intl/tests/calendar_setTimeZone_basic.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::setTimeZone() basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTimeZone_error.phpt b/ext/intl/tests/calendar_setTimeZone_error.phpt
index 0890d160c813a..3327787801638 100644
--- a/ext/intl/tests/calendar_setTimeZone_error.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTimeZone_error2.phpt b/ext/intl/tests/calendar_setTimeZone_error2.phpt
index 5474161e65b25..216310618cb6b 100644
--- a/ext/intl/tests/calendar_setTimeZone_error2.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_error2.phpt
@@ -3,7 +3,7 @@ IntlCalendar::setTimeZone(): valid time zones for DateTime but not ICU
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTimeZone_variation1.phpt b/ext/intl/tests/calendar_setTimeZone_variation1.phpt
index 3c3dd3bdd86c5..dc9dd2091b1af 100644
--- a/ext/intl/tests/calendar_setTimeZone_variation1.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_variation1.phpt
@@ -3,7 +3,7 @@ IntlCalendar::setTimeZone() variation with NULL arg
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTimeZone_variation2.phpt b/ext/intl/tests/calendar_setTimeZone_variation2.phpt
index 3789f032e2139..52e3839114900 100644
--- a/ext/intl/tests/calendar_setTimeZone_variation2.phpt
+++ b/ext/intl/tests/calendar_setTimeZone_variation2.phpt
@@ -3,7 +3,7 @@ IntlCalendar::setTimeZone(): different ways to specify time zone
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTime_basic.phpt b/ext/intl/tests/calendar_setTime_basic.phpt
index 075ecaabb5290..850022683e4b0 100644
--- a/ext/intl/tests/calendar_setTime_basic.phpt
+++ b/ext/intl/tests/calendar_setTime_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_setTime_error.phpt b/ext/intl/tests/calendar_setTime_error.phpt
index 64a2cdfb82163..4d7287fd0ad58 100644
--- a/ext/intl/tests/calendar_setTime_error.phpt
+++ b/ext/intl/tests/calendar_setTime_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_set_basic.phpt b/ext/intl/tests/calendar_set_basic.phpt
index 93378a7b3fc3e..8cf3246e24258 100644
--- a/ext/intl/tests/calendar_set_basic.phpt
+++ b/ext/intl/tests/calendar_set_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_set_error.phpt b/ext/intl/tests/calendar_set_error.phpt
index 1ebd40164b9ad..228b38f86eeee 100644
--- a/ext/intl/tests/calendar_set_error.phpt
+++ b/ext/intl/tests/calendar_set_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_set_variation1.phpt b/ext/intl/tests/calendar_set_variation1.phpt
index 6a78cf213c03b..15943cb263845 100644
--- a/ext/intl/tests/calendar_set_variation1.phpt
+++ b/ext/intl/tests/calendar_set_variation1.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_toDateTime_basic.phpt b/ext/intl/tests/calendar_toDateTime_basic.phpt
index ad9b7c9eb6e69..4e591330050ba 100644
--- a/ext/intl/tests/calendar_toDateTime_basic.phpt
+++ b/ext/intl/tests/calendar_toDateTime_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::toDateTime(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/calendar_toDateTime_error.phpt b/ext/intl/tests/calendar_toDateTime_error.phpt
index 8a707b45075ff..37f27a66cbb0a 100644
--- a/ext/intl/tests/calendar_toDateTime_error.phpt
+++ b/ext/intl/tests/calendar_toDateTime_error.phpt
@@ -3,7 +3,7 @@ IntlCalendar::toDateTime(): bad arguments
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/cpbi_clone_equality.phpt b/ext/intl/tests/cpbi_clone_equality.phpt
index 66cd96bbb93fe..458046ae7d58e 100644
--- a/ext/intl/tests/cpbi_clone_equality.phpt
+++ b/ext/intl/tests/cpbi_clone_equality.phpt
@@ -3,7 +3,7 @@ IntlCodePointBreakIterator: clone and equality
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt b/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt
index a1c33cf230ef1..049eaea6f9e2d 100644
--- a/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt
+++ b/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt
@@ -3,7 +3,7 @@ IntlCodepointBreakIterator::getLastCodePoint(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/cpbi_parts_iterator.phpt b/ext/intl/tests/cpbi_parts_iterator.phpt
index 329c88c8b9eb7..5708a6d4f97c3 100644
--- a/ext/intl/tests/cpbi_parts_iterator.phpt
+++ b/ext/intl/tests/cpbi_parts_iterator.phpt
@@ -3,7 +3,7 @@ IntlCodepointBreakIterator's part iterator
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
index 928c30b9222b8..2a51b6f42d6dc 100644
--- a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
+++ b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt
@@ -3,7 +3,7 @@ IntlDateFormatter::__construct(): bad timezone or calendar
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_formatObject_error.phpt b/ext/intl/tests/dateformat_formatObject_error.phpt
index 69788fb96ef7e..29a8798e799ed 100644
--- a/ext/intl/tests/dateformat_formatObject_error.phpt
+++ b/ext/intl/tests/dateformat_formatObject_error.phpt
@@ -3,7 +3,7 @@ IntlDateFormatter::formatObject(): error conditions
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt
index 72e78af5f3f0c..a1b7716a314e7 100644
--- a/ext/intl/tests/dateformat_setTimeZone_error.phpt
+++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt
@@ -3,7 +3,7 @@ IntlDateFormatter::setTimeZone() bad args
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar___construct_basic.phpt b/ext/intl/tests/gregoriancalendar___construct_basic.phpt
index dc8eedc43541a..757603f632086 100644
--- a/ext/intl/tests/gregoriancalendar___construct_basic.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_basic.phpt
@@ -3,7 +3,7 @@ IntlGregorianCalendar::__construct(): basic
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar___construct_error.phpt b/ext/intl/tests/gregoriancalendar___construct_error.phpt
index 92a7e5c30436c..2bc87c723d89b 100644
--- a/ext/intl/tests/gregoriancalendar___construct_error.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_error.phpt
@@ -3,7 +3,7 @@ IntlGregorianCalendar::__construct(): bad arguments
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar___construct_variant1.phpt b/ext/intl/tests/gregoriancalendar___construct_variant1.phpt
index 86274c34bfdb5..22dae52d77d28 100644
--- a/ext/intl/tests/gregoriancalendar___construct_variant1.phpt
+++ b/ext/intl/tests/gregoriancalendar___construct_variant1.phpt
@@ -3,7 +3,7 @@ IntlGregorianCalendar::__construct(): argument variants
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
index 3fe4faf46417e..0f1106c635a36 100644
--- a/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_getGregorianChange_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt b/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt
index 98c11e41b1fed..671278ec968e6 100644
--- a/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt
+++ b/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt
@@ -3,7 +3,7 @@ IntlGregorianCalendar::get/setGregorianChange(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt
index 31c80247860e8..5df80c4b674fa 100644
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt
@@ -3,7 +3,7 @@ IntlGregorianCalendar::isLeapYear(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
index 9cee3881f3f18..e00944ab99c4c 100644
--- a/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
+++ b/ext/intl/tests/gregoriancalendar_isLeapYear_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/idn_uts46_basic.phpt b/ext/intl/tests/idn_uts46_basic.phpt
index 492dbec7ed291..17edfb6d3a3df 100644
--- a/ext/intl/tests/idn_uts46_basic.phpt
+++ b/ext/intl/tests/idn_uts46_basic.phpt
@@ -2,10 +2,10 @@
 IDN UTS #46 API basic tests
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl'))
-		die('skip');
-	if (!defined('INTL_IDNA_VARIANT_UTS46'))
-		die('skip no UTS #46 API');
+    if (!extension_loaded('intl'))
+        die('skip');
+    if (!defined('INTL_IDNA_VARIANT_UTS46'))
+        die('skip no UTS #46 API');
 --FILE--
 <?php
 $utf8dn = "www.fußball.com";
diff --git a/ext/intl/tests/idn_uts46_errors.phpt b/ext/intl/tests/idn_uts46_errors.phpt
index 35aa1cb073869..f766f60d885c8 100644
--- a/ext/intl/tests/idn_uts46_errors.phpt
+++ b/ext/intl/tests/idn_uts46_errors.phpt
@@ -2,10 +2,10 @@
 IDN UTS #46 API error tests
 --SKIPIF--
 <?php
-	if (!extension_loaded('intl'))
-		die('skip');
-	if (!defined('INTL_IDNA_VARIANT_UTS46'))
-		die('skip no UTS #46 API');
+    if (!extension_loaded('intl'))
+        die('skip');
+    if (!defined('INTL_IDNA_VARIANT_UTS46'))
+        die('skip no UTS #46 API');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_bug70484.phpt b/ext/intl/tests/msgfmt_bug70484.phpt
index 660fc92f3b229..8a407f3d4e3e7 100644
--- a/ext/intl/tests/msgfmt_bug70484.phpt
+++ b/ext/intl/tests/msgfmt_bug70484.phpt
@@ -3,7 +3,7 @@ Bug #70484 selectordinal doesn't work with named parameters
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/msgfmt_format_datetime.phpt b/ext/intl/tests/msgfmt_format_datetime.phpt
index e110ff0e96f79..5514a9466cf7f 100644
--- a/ext/intl/tests/msgfmt_format_datetime.phpt
+++ b/ext/intl/tests/msgfmt_format_datetime.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_error1.phpt b/ext/intl/tests/msgfmt_format_error1.phpt
index 4523613c777f8..712758e70f8b6 100644
--- a/ext/intl/tests/msgfmt_format_error1.phpt
+++ b/ext/intl/tests/msgfmt_format_error1.phpt
@@ -3,7 +3,7 @@ MessageFormatter::format() insufficient numeric arguments
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_error2.phpt b/ext/intl/tests/msgfmt_format_error2.phpt
index 487f760b528f3..5985c67dc6c98 100644
--- a/ext/intl/tests/msgfmt_format_error2.phpt
+++ b/ext/intl/tests/msgfmt_format_error2.phpt
@@ -3,7 +3,7 @@ MessageFormatter::format() inconsistent types in named argument
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_error3.phpt b/ext/intl/tests/msgfmt_format_error3.phpt
index 2df598ce5b268..d1e11d11a2e88 100644
--- a/ext/intl/tests/msgfmt_format_error3.phpt
+++ b/ext/intl/tests/msgfmt_format_error3.phpt
@@ -3,7 +3,7 @@ MessageFormatter::format() given negative arg key
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_error4.phpt b/ext/intl/tests/msgfmt_format_error4.phpt
index 96b1f39b0b7ed..fc7b27f5517ff 100644
--- a/ext/intl/tests/msgfmt_format_error4.phpt
+++ b/ext/intl/tests/msgfmt_format_error4.phpt
@@ -3,7 +3,7 @@ MessageFormatter::format() invalid UTF-8 for arg key or value
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_error5.phpt b/ext/intl/tests/msgfmt_format_error5.phpt
index 5ec5ddf18996a..e3ba570824c2b 100644
--- a/ext/intl/tests/msgfmt_format_error5.phpt
+++ b/ext/intl/tests/msgfmt_format_error5.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_error6.phpt b/ext/intl/tests/msgfmt_format_error6.phpt
index 968701b7114c2..0df279f5c5c73 100644
--- a/ext/intl/tests/msgfmt_format_error6.phpt
+++ b/ext/intl/tests/msgfmt_format_error6.phpt
@@ -3,7 +3,7 @@ MessageFormatter::format() invalid type for key not in pattern
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt
index f891e973c04e1..8b7812e5768a2 100644
--- a/ext/intl/tests/msgfmt_format_mixed_params.phpt
+++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt
@@ -3,7 +3,7 @@ MessageFormatter::format(): mixed named and numeric parameters
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
index b24ae829bcc1c..669d2def437b2 100644
--- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
+++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_format_subpatterns.phpt b/ext/intl/tests/msgfmt_format_subpatterns.phpt
index 50970f0b9e3f8..901ba30fe0f9e 100644
--- a/ext/intl/tests/msgfmt_format_subpatterns.phpt
+++ b/ext/intl/tests/msgfmt_format_subpatterns.phpt
@@ -3,7 +3,7 @@ msgfmt_format() with subpatterns
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/msgfmt_format_subpatterns_named.phpt b/ext/intl/tests/msgfmt_format_subpatterns_named.phpt
index 7b56ccb4cc7a0..242c6f76f2359 100644
--- a/ext/intl/tests/msgfmt_format_subpatterns_named.phpt
+++ b/ext/intl/tests/msgfmt_format_subpatterns_named.phpt
@@ -3,7 +3,7 @@ msgfmt_format() with named subpatterns
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 
diff --git a/ext/intl/tests/msgfmt_millisecond_dates.phpt b/ext/intl/tests/msgfmt_millisecond_dates.phpt
index 2a5723f2e0f92..c9aefbc7d68a0 100644
--- a/ext/intl/tests/msgfmt_millisecond_dates.phpt
+++ b/ext/intl/tests/msgfmt_millisecond_dates.phpt
@@ -3,7 +3,7 @@ MessageFrormatter parses and formats dates with millisecond precision
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt
index 86fda51d41243..a5d1061b7797a 100644
--- a/ext/intl/tests/msgfmt_setPattern_cache.phpt
+++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt
@@ -3,7 +3,7 @@ MessageFormatter::setPattern() invalidates arg types cache
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/rbbiter___construct_basic.phpt b/ext/intl/tests/rbbiter___construct_basic.phpt
index def14d25da907..b94c7c7b5b0d8 100644
--- a/ext/intl/tests/rbbiter___construct_basic.phpt
+++ b/ext/intl/tests/rbbiter___construct_basic.phpt
@@ -3,7 +3,7 @@ IntlRuleBasedBreakIterator::__construct: basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.default_locale", "pt_PT");
diff --git a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
index 4592a62eb9c65..986c8f840ec6c 100644
--- a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
+++ b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt
@@ -3,7 +3,7 @@ IntlRuleBasedBreakIterator::getRuleStatusVec(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
index 44da765292669..e7a6240095864 100644
--- a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
+++ b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt
@@ -3,7 +3,7 @@ IntlRuleBasedBreakIterator::getRuleStatus(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/spoofchecker_007.phpt b/ext/intl/tests/spoofchecker_007.phpt
index 0514fe1b321dd..d9ea4529a701b 100644
--- a/ext/intl/tests/spoofchecker_007.phpt
+++ b/ext/intl/tests/spoofchecker_007.phpt
@@ -3,10 +3,10 @@ spoofchecker with restriction level
 --SKIPIF--
 <?php if(!extension_loaded('intl') || !class_exists("Spoofchecker")) print 'skip'; ?>
 <?php
-	$r = new ReflectionClass("SpoofChecker");
-	if (false === $r->getConstant("SINGLE_SCRIPT_RESTRICTIVE")) {
-		die("skip Incompatible ICU version");
-	}
+    $r = new ReflectionClass("SpoofChecker");
+    if (false === $r->getConstant("SINGLE_SCRIPT_RESTRICTIVE")) {
+        die("skip Incompatible ICU version");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic.phpt
index ccf923f42ab7e..72808c4b471bd 100644
--- a/ext/intl/tests/timezone_IDforWindowsID_basic.phpt
+++ b/ext/intl/tests/timezone_IDforWindowsID_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getIDForWindowsID basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled'); ?>
+    die('skip intl extension not enabled'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '52') < 0)die('skip for ICU >= 52'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
 --FILE--
diff --git a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
index 5008c2b66ab95..064c5826d8743 100644
--- a/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
+++ b/ext/intl/tests/timezone_IDforWindowsID_basic2.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getIDForWindowsID basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled'); ?>
+    die('skip intl extension not enabled'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php
diff --git a/ext/intl/tests/timezone_clone_basic.phpt b/ext/intl/tests/timezone_clone_basic.phpt
index 4a5a58f7182f5..49025c839173c 100644
--- a/ext/intl/tests/timezone_clone_basic.phpt
+++ b/ext/intl/tests/timezone_clone_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone clone handler: basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_clone_error.phpt b/ext/intl/tests/timezone_clone_error.phpt
index 8df6a8ffe368f..728b7443054bd 100644
--- a/ext/intl/tests/timezone_clone_error.phpt
+++ b/ext/intl/tests/timezone_clone_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone clone handler: error test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt b/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt
index 7a7eef0a72f1e..66dbb35c6efb2 100644
--- a/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt
+++ b/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::countEquivalentIDs(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_countEquivalentIDs_error.phpt b/ext/intl/tests/timezone_countEquivalentIDs_error.phpt
index 6629f74ba6809..94498db012d3f 100644
--- a/ext/intl/tests/timezone_countEquivalentIDs_error.phpt
+++ b/ext/intl/tests/timezone_countEquivalentIDs_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::countEquivalentIDs(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createDefault_basic.phpt b/ext/intl/tests/timezone_createDefault_basic.phpt
index 0a188df11eff9..042bd541c4539 100644
--- a/ext/intl/tests/timezone_createDefault_basic.phpt
+++ b/ext/intl/tests/timezone_createDefault_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createDefault(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createEnumeration_basic.phpt b/ext/intl/tests/timezone_createEnumeration_basic.phpt
index 4500aef976117..7321e93bd29a7 100644
--- a/ext/intl/tests/timezone_createEnumeration_basic.phpt
+++ b/ext/intl/tests/timezone_createEnumeration_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createEnumeration(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createEnumeration_error.phpt b/ext/intl/tests/timezone_createEnumeration_error.phpt
index 4e190129d47a0..2aff323ce3a30 100644
--- a/ext/intl/tests/timezone_createEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createEnumeration_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createEnumeration(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createEnumeration_variation1.phpt b/ext/intl/tests/timezone_createEnumeration_variation1.phpt
index 19a5521a68e8d..fa58d029eb380 100644
--- a/ext/intl/tests/timezone_createEnumeration_variation1.phpt
+++ b/ext/intl/tests/timezone_createEnumeration_variation1.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createEnumeration(): variant with offset
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createEnumeration_variation2.phpt b/ext/intl/tests/timezone_createEnumeration_variation2.phpt
index c0355213223c7..488f6cb428c20 100644
--- a/ext/intl/tests/timezone_createEnumeration_variation2.phpt
+++ b/ext/intl/tests/timezone_createEnumeration_variation2.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createEnumeration(): variant with country
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt
index 985957d3ca3a9..070ee1a631612 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createTimeZoneIDEnumeration(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
index 3bf7c9a670ff8..3395f845d29ed 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createTimeZoneIDEnumeration(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt
index 84711ff57f845..b6a74ce741cf6 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createTimeZoneIDEnumeration(): variant without offset
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt
index 4d37fe3e64321..ea37fafb261b2 100644
--- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt
+++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createTimeZoneIDEnumeration(): variant without region
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createTimeZone_basic.phpt b/ext/intl/tests/timezone_createTimeZone_basic.phpt
index e58d7749d97d8..9195ed496c5dc 100644
--- a/ext/intl/tests/timezone_createTimeZone_basic.phpt
+++ b/ext/intl/tests/timezone_createTimeZone_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createTimeZone(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_createTimeZone_error.phpt b/ext/intl/tests/timezone_createTimeZone_error.phpt
index a06f26b128241..a17e2d1ee38fa 100644
--- a/ext/intl/tests/timezone_createTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_createTimeZone_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::createTimeZone(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_equals_basic.phpt b/ext/intl/tests/timezone_equals_basic.phpt
index 20703f5494b14..4b79655c816b0 100644
--- a/ext/intl/tests/timezone_equals_basic.phpt
+++ b/ext/intl/tests/timezone_equals_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone equals handler: basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_equals_error.phpt b/ext/intl/tests/timezone_equals_error.phpt
index 3d489d14a6f9a..ced7a3386bee3 100644
--- a/ext/intl/tests/timezone_equals_error.phpt
+++ b/ext/intl/tests/timezone_equals_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone equals handler: error test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt b/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt
index b15edc030d8bd..e17147060d99c 100644
--- a/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt
+++ b/ext/intl/tests/timezone_fromDateTimeZone_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::fromDateTimeZone(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_fromDateTimeZone_error.phpt b/ext/intl/tests/timezone_fromDateTimeZone_error.phpt
index 54a70d1f17b84..dbb4543b9b0e0 100644
--- a/ext/intl/tests/timezone_fromDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_fromDateTimeZone_error.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getCanonicalID_basic.phpt b/ext/intl/tests/timezone_getCanonicalID_basic.phpt
index 1ed775ac52a87..c2d393ff80b32 100644
--- a/ext/intl/tests/timezone_getCanonicalID_basic.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getCanonicalID: basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getCanonicalID_error.phpt b/ext/intl/tests/timezone_getCanonicalID_error.phpt
index c1f7b6927a0ef..706ddb6dbf26a 100644
--- a/ext/intl/tests/timezone_getCanonicalID_error.phpt
+++ b/ext/intl/tests/timezone_getCanonicalID_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getCanonicalID(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getDSTSavings_basic.phpt b/ext/intl/tests/timezone_getDSTSavings_basic.phpt
index 6828d9bc083bd..c659dd97b3f95 100644
--- a/ext/intl/tests/timezone_getDSTSavings_basic.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getDSTSavings(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getDSTSavings_error.phpt b/ext/intl/tests/timezone_getDSTSavings_error.phpt
index fe59f3cae4435..d6879597c3e25 100644
--- a/ext/intl/tests/timezone_getDSTSavings_error.phpt
+++ b/ext/intl/tests/timezone_getDSTSavings_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getDSTSavings(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getDisplayName_basic.phpt b/ext/intl/tests/timezone_getDisplayName_basic.phpt
index 57fab259663a9..d6d032f8d11fb 100644
--- a/ext/intl/tests/timezone_getDisplayName_basic.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getDisplayName(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getDisplayName_error.phpt b/ext/intl/tests/timezone_getDisplayName_error.phpt
index 41131e0fe32a4..b38e305e6d3ea 100644
--- a/ext/intl/tests/timezone_getDisplayName_error.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getDisplayName(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getDisplayName_variant1.phpt b/ext/intl/tests/timezone_getDisplayName_variant1.phpt
index ebfb32cee4f89..684afcf109e7a 100644
--- a/ext/intl/tests/timezone_getDisplayName_variant1.phpt
+++ b/ext/intl/tests/timezone_getDisplayName_variant1.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getDisplayName(): daylight parameter effect
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getEquivalentID_basic.phpt b/ext/intl/tests/timezone_getEquivalentID_basic.phpt
index 45e0783a0630e..0230c3632f6a3 100644
--- a/ext/intl/tests/timezone_getEquivalentID_basic.phpt
+++ b/ext/intl/tests/timezone_getEquivalentID_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getEquivalentID(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getEquivalentID_error.phpt b/ext/intl/tests/timezone_getEquivalentID_error.phpt
index 12afaee2fab44..34da68842ec3b 100644
--- a/ext/intl/tests/timezone_getEquivalentID_error.phpt
+++ b/ext/intl/tests/timezone_getEquivalentID_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getEquivalentID(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt b/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt
index f7f7a47311228..65f369ab3a2e8 100644
--- a/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt
+++ b/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getErrorCode/Message(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 /* INF being an invalid offset depends on UB in float->int cast behavior. */
 $arch = php_uname('m');
 if ($arch != 'x86_64' && $arch != 'i386')
diff --git a/ext/intl/tests/timezone_getErrorCode_error.phpt b/ext/intl/tests/timezone_getErrorCode_error.phpt
index c20e3c666a020..c44a9107261fd 100644
--- a/ext/intl/tests/timezone_getErrorCode_error.phpt
+++ b/ext/intl/tests/timezone_getErrorCode_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getErrorCode(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getErrorMessage_error.phpt b/ext/intl/tests/timezone_getErrorMessage_error.phpt
index 9cd26d4f4545b..fb252415c848f 100644
--- a/ext/intl/tests/timezone_getErrorMessage_error.phpt
+++ b/ext/intl/tests/timezone_getErrorMessage_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getErrorMessage(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getGMT_basic.phpt b/ext/intl/tests/timezone_getGMT_basic.phpt
index 7004b2dd6049f..8eecf720c9aef 100644
--- a/ext/intl/tests/timezone_getGMT_basic.phpt
+++ b/ext/intl/tests/timezone_getGMT_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getGMT(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getID_error.phpt b/ext/intl/tests/timezone_getID_error.phpt
index da79d7c1bb7ea..5ec090159c6b4 100644
--- a/ext/intl/tests/timezone_getID_error.phpt
+++ b/ext/intl/tests/timezone_getID_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getID(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getOffset_basic.phpt b/ext/intl/tests/timezone_getOffset_basic.phpt
index 3dbf5b1ce4b36..3c37ff30ef34c 100644
--- a/ext/intl/tests/timezone_getOffset_basic.phpt
+++ b/ext/intl/tests/timezone_getOffset_basic.phpt
@@ -5,7 +5,7 @@ date.timezone=Atlantic/Azores
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getOffset_error.phpt b/ext/intl/tests/timezone_getOffset_error.phpt
index 639b690595e71..d236c15170420 100644
--- a/ext/intl/tests/timezone_getOffset_error.phpt
+++ b/ext/intl/tests/timezone_getOffset_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getOffset(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 
 /* INF being an invalid offset depends on UB in float->int cast behavior. */
 $arch = php_uname('m');
diff --git a/ext/intl/tests/timezone_getRawOffset_basic.phpt b/ext/intl/tests/timezone_getRawOffset_basic.phpt
index bfbf2710cac34..6f85e9fc9c6f2 100644
--- a/ext/intl/tests/timezone_getRawOffset_basic.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getRawOffset(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getRawOffset_error.phpt b/ext/intl/tests/timezone_getRawOffset_error.phpt
index 612fa9b39d58d..3c9c463ec757f 100644
--- a/ext/intl/tests/timezone_getRawOffset_error.phpt
+++ b/ext/intl/tests/timezone_getRawOffset_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getRawOffset(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getRegion_basic.phpt b/ext/intl/tests/timezone_getRegion_basic.phpt
index 7d23b7f96db40..7aa88d655a5f6 100644
--- a/ext/intl/tests/timezone_getRegion_basic.phpt
+++ b/ext/intl/tests/timezone_getRegion_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getRegion(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getRegion_error.phpt b/ext/intl/tests/timezone_getRegion_error.phpt
index 28fd73c1a7015..be8e40d2226e0 100644
--- a/ext/intl/tests/timezone_getRegion_error.phpt
+++ b/ext/intl/tests/timezone_getRegion_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getRegion(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getTZData_basic.phpt b/ext/intl/tests/timezone_getTZData_basic.phpt
index e3b8e71122256..d1670a0eab63d 100644
--- a/ext/intl/tests/timezone_getTZData_basic.phpt
+++ b/ext/intl/tests/timezone_getTZData_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getTZDataVersion: basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_getUnknown_basic.phpt b/ext/intl/tests/timezone_getUnknown_basic.phpt
index 9277f39911ded..d2efa466ada61 100644
--- a/ext/intl/tests/timezone_getUnknown_basic.phpt
+++ b/ext/intl/tests/timezone_getUnknown_basic.phpt
@@ -3,7 +3,7 @@ IntlCalendar::getUnknown(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_hasSameRules_basic.phpt b/ext/intl/tests/timezone_hasSameRules_basic.phpt
index 89650245543d1..b112c507f0822 100644
--- a/ext/intl/tests/timezone_hasSameRules_basic.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::hasSameRules(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_hasSameRules_error.phpt b/ext/intl/tests/timezone_hasSameRules_error.phpt
index c087e1ac5bf88..a3f59f73ea246 100644
--- a/ext/intl/tests/timezone_hasSameRules_error.phpt
+++ b/ext/intl/tests/timezone_hasSameRules_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::hasSameRules(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt
index f27ee72097ef8..20f3b620aa7e2 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_basic.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::toDateTimeZone(): basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_toDateTimeZone_error.phpt b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
index fc2552e690015..83c422a143623 100644
--- a/ext/intl/tests/timezone_toDateTimeZone_error.phpt
+++ b/ext/intl/tests/timezone_toDateTimeZone_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::toDateTimeZone(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_useDaylightTime_basic.phpt b/ext/intl/tests/timezone_useDaylightTime_basic.phpt
index 7db7f80fdee86..f8c325cd335a8 100644
--- a/ext/intl/tests/timezone_useDaylightTime_basic.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::useDaylightTime: basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_useDaylightTime_error.phpt b/ext/intl/tests/timezone_useDaylightTime_error.phpt
index 6f702848a94ee..72cebfe7e59f3 100644
--- a/ext/intl/tests/timezone_useDaylightTime_error.phpt
+++ b/ext/intl/tests/timezone_useDaylightTime_error.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::useDaylightTime(): errors
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled');
+    die('skip intl extension not enabled');
 --FILE--
 <?php
 ini_set("intl.error_level", E_WARNING);
diff --git a/ext/intl/tests/timezone_windowsID_basic.phpt b/ext/intl/tests/timezone_windowsID_basic.phpt
index edf2fd5a47eb8..4acd4c92d3dce 100644
--- a/ext/intl/tests/timezone_windowsID_basic.phpt
+++ b/ext/intl/tests/timezone_windowsID_basic.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getWindowsID basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled'); ?>
+    die('skip intl extension not enabled'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '52') < 0)die('skip for ICU >= 52'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '58.1') >= 0) die('skip for ICU <= 57.1'); ?>
 --FILE--
diff --git a/ext/intl/tests/timezone_windowsID_basic2.phpt b/ext/intl/tests/timezone_windowsID_basic2.phpt
index 7c00b646b6484..32f80596c4bfe 100644
--- a/ext/intl/tests/timezone_windowsID_basic2.phpt
+++ b/ext/intl/tests/timezone_windowsID_basic2.phpt
@@ -3,7 +3,7 @@ IntlTimeZone::getWindowsID basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('intl'))
-	die('skip intl extension not enabled'); ?>
+    die('skip intl extension not enabled'); ?>
 <?php if (version_compare(INTL_ICU_VERSION, '58.1') < 0) die('skip for ICU >= 58.1'); ?>
 --FILE--
 <?php
diff --git a/ext/json/tests/bug41403.phpt b/ext/json/tests/bug41403.phpt
index 23a5124a7739c..4ce7faa352e58 100644
--- a/ext/json/tests/bug41403.phpt
+++ b/ext/json/tests/bug41403.phpt
@@ -3,7 +3,7 @@ Bug #41403 (json_decode cannot decode floats if localeconv decimal_point is not
 --SKIPIF--
 <?php
 if (setlocale(LC_NUMERIC, "de_DE") === false) {
-	die("skip no de_DE locale");
+    die("skip no de_DE locale");
 }
 ?>
 --INI--
diff --git a/ext/json/tests/bug42785.phpt b/ext/json/tests/bug42785.phpt
index 7c39f4c8e2992..698f193a70881 100644
--- a/ext/json/tests/bug42785.phpt
+++ b/ext/json/tests/bug42785.phpt
@@ -5,7 +5,7 @@ serialize_precision=-1
 --SKIPIF--
 <?php
 if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1", "ISO8859-1")) {
-	die("skip locale needed for this test is not supported on this platform");
+    die("skip locale needed for this test is not supported on this platform");
 }
 ?>
 --FILE--
diff --git a/ext/ldap/tests/ldap_exop_refresh.phpt b/ext/ldap/tests/ldap_exop_refresh.phpt
index b90a92bc00a65..b7e7835f384cc 100644
--- a/ext/ldap/tests/ldap_exop_refresh.phpt
+++ b/ext/ldap/tests/ldap_exop_refresh.phpt
@@ -6,12 +6,12 @@ Emmanuel Dreyfus <manu@netbsd.org>
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifbindfailure.inc'); ?>
 <?php
-	$link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
-	$r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees'));
-	$info = ldap_get_entries($link, $r)[0];
-	if (!isset($info['dynamicsubtrees'])) {
-		die("skip Overlay DDS not available");
-	}
+    $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version);
+    $r = ldap_read($link, '', 'objectClass=*', array('dynamicsubtrees'));
+    $info = ldap_get_entries($link, $r)[0];
+    if (!isset($info['dynamicsubtrees'])) {
+        die("skip Overlay DDS not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_option_reqcert_basic.phpt
index e774a0e03f898..56f77f920e490 100644
--- a/ext/ldap/tests/ldap_option_reqcert_basic.phpt
+++ b/ext/ldap/tests/ldap_option_reqcert_basic.phpt
@@ -4,8 +4,8 @@ ldap_option_reqcert_basic() - Basic test to check if PHP can connect to a LDAP s
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	require_once __DIR__ .'/skipifbindfailure.inc';
+    require_once __DIR__ .'/skipif.inc';
+    require_once __DIR__ .'/skipifbindfailure.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_option_reqcert_error.phpt b/ext/ldap/tests/ldap_option_reqcert_error.phpt
index 50e542a08032d..17fba4bc23c50 100644
--- a/ext/ldap/tests/ldap_option_reqcert_error.phpt
+++ b/ext/ldap/tests/ldap_option_reqcert_error.phpt
@@ -4,8 +4,8 @@ ldap_option_reqcert_error() - A test to check if ldap can't connect to a LDAP se
 Edwin Hoksberg <edwin@edwinhoksberg.nl>
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	require_once __DIR__ .'/skipifbindfailure.inc';
+    require_once __DIR__ .'/skipif.inc';
+    require_once __DIR__ .'/skipifbindfailure.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_sasl_bind_basic.phpt b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
index 3ab977b8543e2..3c4eb1b137917 100644
--- a/ext/ldap/tests/ldap_sasl_bind_basic.phpt
+++ b/ext/ldap/tests/ldap_sasl_bind_basic.phpt
@@ -7,11 +7,11 @@ Patrick Allaert <patrickallaert@php.net>
 <?php require_once('skipif.inc'); ?>
 <?php if (!function_exists("ldap_sasl_bind")) die("skip LDAP extension not compiled with SASL support"); ?>
 <?php
-	require "connect.inc";
-	$link = @fsockopen($host, $port);
-	if (!$link) {
-		die("skip no server listening");
-	}
+    require "connect.inc";
+    $link = @fsockopen($host, $port);
+    if (!$link) {
+        die("skip no server listening");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
index eff51c785eb54..646a7f2ed8950 100644
--- a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
+++ b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt
@@ -5,12 +5,12 @@ Chad Sikorra <Chad.Sikorra@gmail.com>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php
-	require "connect.inc";
-	$link = ldap_connect($host, $port);
-	ldap_get_option($link, LDAP_OPT_X_TLS_PACKAGE, $package);
-	if ($package != 'OpenSSL') {
-		die("skip OpenSSL required for CRL check options, got: $package");
-	}
+    require "connect.inc";
+    $link = ldap_connect($host, $port);
+    ldap_get_option($link, LDAP_OPT_X_TLS_PACKAGE, $package);
+    if ($package != 'OpenSSL') {
+        die("skip OpenSSL required for CRL check options, got: $package");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
index 9027a4628f5e6..6344637d33e69 100644
--- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
+++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt
@@ -6,14 +6,14 @@ Patrick Allaert <patrickallaert@php.net>
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php
-	if (!function_exists("ldap_set_rebind_proc")) {
-		die("skip ldap_set_rebind_proc() does not exist");
-	}
-	require "connect.inc";
-	$link = @fsockopen($host, $port);
-	if (!$link) {
-		die("skip no server listening");
-	}
+    if (!function_exists("ldap_set_rebind_proc")) {
+        die("skip ldap_set_rebind_proc() does not exist");
+    }
+    require "connect.inc";
+    $link = @fsockopen($host, $port);
+    if (!$link) {
+        die("skip no server listening");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/mbstring/tests/bug52681.phpt b/ext/mbstring/tests/bug52681.phpt
index dc1914d118765..c2f9abad76226 100644
--- a/ext/mbstring/tests/bug52681.phpt
+++ b/ext/mbstring/tests/bug52681.phpt
@@ -3,10 +3,10 @@ Bug #52681 (mb_send_mail() appends an extra MIME-Version header)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
index eb251efd7bf81..cecd1c35393be 100644
--- a/ext/mbstring/tests/htmlent.phpt
+++ b/ext/mbstring/tests/htmlent.phpt
@@ -2,8 +2,8 @@
 HTML input/output
 --SKIPIF--
 <?php
-	ini_set('include_path', __DIR__);
-	extension_loaded('mbstring') or die('skip mbstring not available');
+    ini_set('include_path', __DIR__);
+    extension_loaded('mbstring') or die('skip mbstring not available');
 ?>
 --INI--
 output_buffering=4096
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
index 283ff11d6baab..96eecbb625601 100644
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ b/ext/mbstring/tests/mb_send_mail01.phpt
@@ -3,10 +3,10 @@ mb_send_mail() test 1 (lang=neutral)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
index 06b85c691f5bd..026d794e40e05 100644
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ b/ext/mbstring/tests/mb_send_mail02.phpt
@@ -3,10 +3,10 @@ mb_send_mail() test 2 (lang=Japanese)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
index 3d5ffd5659535..acc152f720363 100644
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ b/ext/mbstring/tests/mb_send_mail03.phpt
@@ -3,10 +3,10 @@ mb_send_mail() test 3 (lang=English)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("english")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
index 2eccb87189aaa..9e68128140731 100644
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ b/ext/mbstring/tests/mb_send_mail04.phpt
@@ -3,10 +3,10 @@ mb_send_mail() test 4 (lang=German)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("german")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
index 53d97ef3d18b2..f4c07e26f8b2b 100644
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ b/ext/mbstring/tests/mb_send_mail05.phpt
@@ -3,13 +3,13 @@ mb_send_mail() test 5 (lang=Simplified Chinese)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('GB2312')) {
-	die("skip GB2312 encoding is not available on this platform");
+    die("skip GB2312 encoding is not available on this platform");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
index 44a877aaee528..521a976ca39c5 100644
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ b/ext/mbstring/tests/mb_send_mail06.phpt
@@ -3,13 +3,13 @@ mb_send_mail() test 6 (lang=Traditional Chinese)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('BIG5')) {
-	die("skip BIG5 encoding is not available on this platform");
+    die("skip BIG5 encoding is not available on this platform");
 }
 ?>
 --INI--
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
index 9640abc1e88a0..eb702b690ae4e 100644
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ b/ext/mbstring/tests/mb_send_mail07.phpt
@@ -3,13 +3,13 @@ mb_send_mail() test 7 (lang=Korean)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!function_exists("mb_send_mail") || !mb_language("Korean")) {
-	die("skip mb_send_mail() not available");
+    die("skip mb_send_mail() not available");
 }
 if (!@mb_internal_encoding('ISO-2022-KR')) {
-	die("skip ISO-2022-KR encoding is not available on this platform");
+    die("skip ISO-2022-KR encoding is not available on this platform");
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt
index 0960da7a98c11..322cbb2ee3d01 100644
--- a/ext/mysqli/tests/002.phpt
+++ b/ext/mysqli/tests/002.phpt
@@ -53,7 +53,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index faf3407bd7364..56a26602dfc03 100644
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -79,7 +79,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index 0c246e0b2b28b..22a7712dbac3a 100644
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -57,7 +57,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt
index 2dffee80c2022..ce0a9a886071e 100644
--- a/ext/mysqli/tests/005.phpt
+++ b/ext/mysqli/tests/005.phpt
@@ -47,7 +47,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt
index 5e0443a9fb741..534ef4261fc47 100644
--- a/ext/mysqli/tests/006.phpt
+++ b/ext/mysqli/tests/006.phpt
@@ -52,7 +52,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt
index b510d8d8a32d8..7e71476a3a969 100644
--- a/ext/mysqli/tests/007.phpt
+++ b/ext/mysqli/tests/007.phpt
@@ -52,7 +52,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt
index 412c3641e5a8a..37b75bb5b9835 100644
--- a/ext/mysqli/tests/008.phpt
+++ b/ext/mysqli/tests/008.phpt
@@ -52,7 +52,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt
index 187ac3f9a35ec..f245c71f5dcdb 100644
--- a/ext/mysqli/tests/009.phpt
+++ b/ext/mysqli/tests/009.phpt
@@ -2,12 +2,12 @@
 mysqli fetch bigint values (ok to fail with 4.1.x)
 --SKIPIF--
 <?php
-	if (PHP_INT_SIZE == 8) {
-		echo 'skip test valid only for 32bit systems';
-		exit;
-	}
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    if (PHP_INT_SIZE == 8) {
+        echo 'skip test valid only for 32bit systems';
+        exit;
+    }
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
@@ -85,10 +85,10 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint"))
-	printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt
index 4da24b680add6..9ddac0931fce6 100644
--- a/ext/mysqli/tests/010.phpt
+++ b/ext/mysqli/tests/010.phpt
@@ -55,7 +55,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt
index 4be6fe62c59d7..db327e2d32782 100644
--- a/ext/mysqli/tests/011.phpt
+++ b/ext/mysqli/tests/011.phpt
@@ -52,7 +52,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt
index c2981a206cfa6..89303e57891cc 100644
--- a/ext/mysqli/tests/012.phpt
+++ b/ext/mysqli/tests/012.phpt
@@ -51,7 +51,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt
index 21cb6a949e873..c8aaa73d8427b 100644
--- a/ext/mysqli/tests/013.phpt
+++ b/ext/mysqli/tests/013.phpt
@@ -60,7 +60,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index cb100001c5498..bc5d906d934ad 100644
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -2,16 +2,16 @@
 mysqli autocommit/commit/rollback
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	require_once("connect.inc");
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    require_once("connect.inc");
 
-	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-	if (!$link)
-		die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+    if (!$link)
+        die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    if (!have_innodb($link))
+        die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -78,7 +78,7 @@ mysqli autocommit/commit/rollback
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 Num_of_rows=1
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index 099fcff24eca3..a179e8ec5a4d9 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -2,15 +2,15 @@
 mysqli autocommit/commit/rollback with innodb
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	require_once('connect.inc');
-	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    require_once('connect.inc');
+    if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+        die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    if (!have_innodb($link))
+        die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -76,7 +76,7 @@ mysqli autocommit/commit/rollback with innodb
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 array(2) {
diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt
index d35b162cd714f..6d64a17601477 100644
--- a/ext/mysqli/tests/019.phpt
+++ b/ext/mysqli/tests/019.phpt
@@ -62,7 +62,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS insert_read"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index f1409248c2901..a2a8782f0fd5e 100644
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -74,7 +74,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index 3fa3b9a5cc967..fd2d4f0e2b68d 100644
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -45,7 +45,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index d12ba4aff9ecf..d591e5bae1349 100644
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -50,7 +50,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index 7c22704d441d7..a23e6e15ecfb1 100644
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -59,7 +59,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index 5be231c27d0f3..dec1e284be43b 100644
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -59,7 +59,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index 6e300890d7df3..62b1590d29b67 100644
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -64,7 +64,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index 1db5f5af84496..7f9a9bd4b8c53 100644
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -51,7 +51,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index 0ed2517227df2..769f3753f4066 100644
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -33,7 +33,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt
index 660950d6f1e9d..ea7d13bc9bf9a 100644
--- a/ext/mysqli/tests/032.phpt
+++ b/ext/mysqli/tests/032.phpt
@@ -33,7 +33,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS general_test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt
index af6d81d64e1b9..04fa7023bef31 100644
--- a/ext/mysqli/tests/036.phpt
+++ b/ext/mysqli/tests/036.phpt
@@ -2,12 +2,12 @@
 function test: mysqli_insert_id()
 --SKIPIF--
 <?php
-	if (PHP_INT_SIZE == 8) {
-		echo 'skip test valid only for 32bit systems';
-		exit;
-	}
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    if (PHP_INT_SIZE == 8) {
+        echo 'skip test valid only for 32bit systems';
+        exit;
+    }
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
@@ -49,7 +49,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS t036"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt
index 7c6f72cb69a7b..93b2ceace61d7 100644
--- a/ext/mysqli/tests/037.phpt
+++ b/ext/mysqli/tests/037.phpt
@@ -39,7 +39,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt
index 63d7e3ee326d3..9719d93049d74 100644
--- a/ext/mysqli/tests/038.phpt
+++ b/ext/mysqli/tests/038.phpt
@@ -39,7 +39,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt
index 782cbe57ade5f..04d839408e707 100644
--- a/ext/mysqli/tests/040.phpt
+++ b/ext/mysqli/tests/040.phpt
@@ -38,7 +38,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt
index 645a82e419691..d64739d79ed8b 100644
--- a/ext/mysqli/tests/041.phpt
+++ b/ext/mysqli/tests/041.phpt
@@ -29,7 +29,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt
index 8b46049cb8f1d..3545ed06c1a76 100644
--- a/ext/mysqli/tests/042.phpt
+++ b/ext/mysqli/tests/042.phpt
@@ -55,7 +55,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt
index 2e265d7c51772..adcf502dc72ee 100644
--- a/ext/mysqli/tests/043.phpt
+++ b/ext/mysqli/tests/043.phpt
@@ -47,7 +47,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_update"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt
index af38b6786dea5..8486f1003e665 100644
--- a/ext/mysqli/tests/045.phpt
+++ b/ext/mysqli/tests/045.phpt
@@ -2,20 +2,20 @@
 mysqli_stmt_bind_result (SHOW)
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	require_once("connect.inc");
-	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+    require_once("connect.inc");
+    $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
-	$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
-	mysqli_stmt_execute($stmt);
+    $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
+    mysqli_stmt_execute($stmt);
 
-	if (!$stmt->field_count) {
-		printf("skip SHOW command is not supported in prepared statements.");
-	}
-	$stmt->close();
-	mysqli_close($link);
+    if (!$stmt->field_count) {
+        printf("skip SHOW command is not supported in prepared statements.");
+    }
+    $stmt->close();
+    mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt
index 0a64386db2573..998136dee143a 100644
--- a/ext/mysqli/tests/046.phpt
+++ b/ext/mysqli/tests/046.phpt
@@ -41,7 +41,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt
index 4a2c9590cfd6b..376bcb59c5078 100644
--- a/ext/mysqli/tests/047.phpt
+++ b/ext/mysqli/tests/047.phpt
@@ -52,7 +52,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_affected"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt
index 20271e43fb828..be5f5a79f1809 100644
--- a/ext/mysqli/tests/048.phpt
+++ b/ext/mysqli/tests/048.phpt
@@ -47,7 +47,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt
index 7c4f149c4870c..7d968a18b2ec3 100644
--- a/ext/mysqli/tests/057.phpt
+++ b/ext/mysqli/tests/057.phpt
@@ -68,7 +68,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_store_result"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt
index 596b28569ec3e..541be1ede402c 100644
--- a/ext/mysqli/tests/058.phpt
+++ b/ext/mysqli/tests/058.phpt
@@ -55,7 +55,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt
index c7f3877201185..7168f6f8fafd3 100644
--- a/ext/mysqli/tests/059.phpt
+++ b/ext/mysqli/tests/059.phpt
@@ -48,7 +48,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS mbind"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt
index 22732f4ef1973..c5a77ec16d37a 100644
--- a/ext/mysqli/tests/060.phpt
+++ b/ext/mysqli/tests/060.phpt
@@ -49,7 +49,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt
index 0b15b2ea856d7..76a40c704e2bd 100644
--- a/ext/mysqli/tests/061.phpt
+++ b/ext/mysqli/tests/061.phpt
@@ -5,15 +5,15 @@ local infile handler
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_local_infile_handler'))
-	die("skip - function not available.");
+    die("skip - function not available.");
 
 $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 if (!$link)
-	die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Can't connect [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 include_once("local_infile_tools.inc");
 if ($msg = check_local_infile_support($link, $engine))
-	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+    die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt
index 2733cdafb0273..9b18d33459fea 100644
--- a/ext/mysqli/tests/065.phpt
+++ b/ext/mysqli/tests/065.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_set_charset')) {
-	die('skip mysqli_set_charset() not available');
+    die('skip mysqli_set_charset() not available');
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt
index 678457e93430d..535d01d22434b 100644
--- a/ext/mysqli/tests/066.phpt
+++ b/ext/mysqli/tests/066.phpt
@@ -37,7 +37,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt
index 1560f76522bfe..a8874ffef4417 100644
--- a/ext/mysqli/tests/067.phpt
+++ b/ext/mysqli/tests/067.phpt
@@ -2,19 +2,19 @@
 function test: nested selects (cursors)
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	require_once("connect.inc");
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    require_once("connect.inc");
 
-	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die("skip Cannot connect to check required version");
+    if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+        die("skip Cannot connect to check required version");
 
-	/* skip cursor test for server versions < 50009 */
-	if (mysqli_get_server_version($link) < 50009) {
-			die(sprintf("skip Server doesn't support cursors (%s)",
-					mysqli_get_server_version($link)));
-	}
-	mysqli_close($link);
+    /* skip cursor test for server versions < 50009 */
+    if (mysqli_get_server_version($link) < 50009) {
+            die(sprintf("skip Server doesn't support cursors (%s)",
+                    mysqli_get_server_version($link)));
+    }
+    mysqli_close($link);
 ?>
 --FILE--
 <?php
@@ -69,8 +69,8 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 for ($i =0; $i < 3; $i++) {
-	if (!mysqli_query($link, sprintf("DROP TABLE IF EXISTS cursor%d", $i)))
-		printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    if (!mysqli_query($link, sprintf("DROP TABLE IF EXISTS cursor%d", $i)))
+        printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 }
 
 mysqli_close($link);
diff --git a/ext/mysqli/tests/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt
index 974ad87b78dac..af41924c3735f 100644
--- a/ext/mysqli/tests/bug32405.phpt
+++ b/ext/mysqli/tests/bug32405.phpt
@@ -38,7 +38,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_users"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt
index 60ed3f8d1ad83..9157a13b9ab32 100644
--- a/ext/mysqli/tests/bug34810.phpt
+++ b/ext/mysqli/tests/bug34810.phpt
@@ -54,7 +54,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_warnings"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug35103.phpt b/ext/mysqli/tests/bug35103.phpt
index 7a990eacbf648..95f65320f9e03 100644
--- a/ext/mysqli/tests/bug35103.phpt
+++ b/ext/mysqli/tests/bug35103.phpt
@@ -58,7 +58,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bint") || !mysqli_query($link, "DROP TABLE IF EXISTS test_buint"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt
index a722179896813..578f905f352c7 100644
--- a/ext/mysqli/tests/bug35517.phpt
+++ b/ext/mysqli/tests/bug35517.phpt
@@ -41,7 +41,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS temp"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug36949.phpt b/ext/mysqli/tests/bug36949.phpt
index 5805a6510004d..7033eef23cc9e 100644
--- a/ext/mysqli/tests/bug36949.phpt
+++ b/ext/mysqli/tests/bug36949.phpt
@@ -54,7 +54,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS my_time"))
-	printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt
index 13d939608d522..8345b4b82f881 100644
--- a/ext/mysqli/tests/bug37090.phpt
+++ b/ext/mysqli/tests/bug37090.phpt
@@ -5,7 +5,7 @@ Bug #37090 (mysqli_set_charset return code)
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_charset')) {
-	die('skip mysqli_set_charset() not available');
+    die('skip mysqli_set_charset() not available');
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt
index 6f4de58a6673a..e188d83666c1a 100644
--- a/ext/mysqli/tests/bug42548.phpt
+++ b/ext/mysqli/tests/bug42548.phpt
@@ -6,10 +6,10 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50000) {
-	die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt
index ba7d0ca49d938..430a32856e1b2 100644
--- a/ext/mysqli/tests/bug44897.phpt
+++ b/ext/mysqli/tests/bug44897.phpt
@@ -5,16 +5,16 @@ Bug #44879 (failed to prepare statement)
 require_once('skipif.inc');
 
 if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
-	die("skip: only available in mysqlnd");
+    die("skip: only available in mysqlnd");
 
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50000) {
-	die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --FILE--
@@ -78,7 +78,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_query($link, "DROP PROCEDURE IF EXISTS p");
 
diff --git a/ext/mysqli/tests/bug45289.phpt b/ext/mysqli/tests/bug45289.phpt
index 65b7ebd707c71..8604fc72609c7 100644
--- a/ext/mysqli/tests/bug45289.phpt
+++ b/ext/mysqli/tests/bug45289.phpt
@@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 [004] [%s
diff --git a/ext/mysqli/tests/bug46614.phpt b/ext/mysqli/tests/bug46614.phpt
index 2cdefbf4a316b..e451abda9ed90 100644
--- a/ext/mysqli/tests/bug46614.phpt
+++ b/ext/mysqli/tests/bug46614.phpt
@@ -5,7 +5,7 @@ Bug #46614 (Extended MySQLi class gives incorrect empty() result)
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined("MYSQLI_ASYNC")) {
-	die("skip mysqlnd only");
+    die("skip mysqlnd only");
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug47050.phpt b/ext/mysqli/tests/bug47050.phpt
index ac305b07d2524..1dd8f73a699ef 100644
--- a/ext/mysqli/tests/bug47050.phpt
+++ b/ext/mysqli/tests/bug47050.phpt
@@ -5,7 +5,7 @@ Bug #47050 (mysqli_poll() modifies improper variables)
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!defined("MYSQLI_ASYNC")) {
-	die("skip mysqlnd only");
+    die("skip mysqlnd only");
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt
index 3c7e09f17e389..2d994f559e5e7 100644
--- a/ext/mysqli/tests/bug48909.phpt
+++ b/ext/mysqli/tests/bug48909.phpt
@@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done
diff --git a/ext/mysqli/tests/bug49027.phpt b/ext/mysqli/tests/bug49027.phpt
index 4aa546cd2630e..6a459ed4acb37 100644
--- a/ext/mysqli/tests/bug49027.phpt
+++ b/ext/mysqli/tests/bug49027.phpt
@@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 array(1) {
diff --git a/ext/mysqli/tests/bug49442.phpt b/ext/mysqli/tests/bug49442.phpt
index 22ff7552b7eba..13ddf7b72154d 100644
--- a/ext/mysqli/tests/bug49442.phpt
+++ b/ext/mysqli/tests/bug49442.phpt
@@ -7,12 +7,12 @@ require_once('skipifconnectfailure.inc');
 
 $link = mysqli_init();
 if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 }
 
 include_once("local_infile_tools.inc");
 if ($msg = check_local_infile_support($link, $engine))
-	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+    die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug51647.phpt b/ext/mysqli/tests/bug51647.phpt
index ecae650c1ba28..8cc15e325e1ea 100644
--- a/ext/mysqli/tests/bug51647.phpt
+++ b/ext/mysqli/tests/bug51647.phpt
@@ -10,33 +10,33 @@ if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
     die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
 
 if ($IS_MYSQLND && !extension_loaded("openssl"))
-	die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
+    die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
 
 if (!($link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
-	die(sprintf("skip Connect failed, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Connect failed, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (false === strpos($link->host_info, 'TCP/IP'))
-	die(sprintf("skip SSL only supported on TCP/IP"));
+    die(sprintf("skip SSL only supported on TCP/IP"));
 
 $row = NULL;
 if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"')) {
-	$row = $res->fetch_row();
+    $row = $res->fetch_row();
 } else {
-	if ($link->errno == 1064 && ($res = $link->query("SHOW VARIABLES"))) {
-		while ($row = $res->fetch_row())
-			if ($row[0] == 'have_ssl')
-				break;
-	} else {
-		die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
-	}
+    if ($link->errno == 1064 && ($res = $link->query("SHOW VARIABLES"))) {
+        while ($row = $res->fetch_row())
+            if ($row[0] == 'have_ssl')
+                break;
+    } else {
+        die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
+    }
 }
 
 
 if (empty($row))
-	die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
 
 if (($row[1] == 'NO') || ($row[1] == 'DISABLED'))
-	die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error));
 
 $link->close();
 ?>
diff --git a/ext/mysqli/tests/bug52891.phpt b/ext/mysqli/tests/bug52891.phpt
index f0692556399f6..2c4e19ca4c21b 100644
--- a/ext/mysqli/tests/bug52891.phpt
+++ b/ext/mysqli/tests/bug52891.phpt
@@ -5,7 +5,7 @@ Bug #52891 (Wrong data inserted with mysqli/mysqlnd when using bind_param,value
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$IS_MYSQLND) {
-	die("skip: test applies only to mysqlnd");
+    die("skip: test applies only to mysqlnd");
 }
 ?>
 --FILE--
@@ -100,16 +100,16 @@ if (!$IS_MYSQLND) {
 require_once('connect.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket);
+    printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket);
 }
 
 if (!mysqli_query($link, 'DROP TABLE IF EXISTS tuint')) {
-	printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 }
 
 if (!mysqli_query($link, 'DROP TABLE IF EXISTS tsint')) {
-	printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 }
 
 mysqli_close($link);
diff --git a/ext/mysqli/tests/bug53503.phpt b/ext/mysqli/tests/bug53503.phpt
index b71afe28c7e3c..0b187102f7550 100644
--- a/ext/mysqli/tests/bug53503.phpt
+++ b/ext/mysqli/tests/bug53503.phpt
@@ -6,11 +6,11 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die("skip Cannot connect to MySQL");
+    die("skip Cannot connect to MySQL");
 
 include_once("local_infile_tools.inc");
 if ($msg = check_local_infile_support($link, $engine))
-	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+    die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
 
 mysqli_close($link);
 
diff --git a/ext/mysqli/tests/bug55283.phpt b/ext/mysqli/tests/bug55283.phpt
index 023b9f424d022..379cab0db31f8 100644
--- a/ext/mysqli/tests/bug55283.phpt
+++ b/ext/mysqli/tests/bug55283.phpt
@@ -10,33 +10,33 @@ if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
     die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
 
 if ($IS_MYSQLND && !extension_loaded("openssl"))
-	die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
+    die("skip PHP streams lack support for SSL. mysqli is compiled to use mysqlnd which uses PHP streams in turn.");
 
 if (!($link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)))
-	die(sprintf("skip Connect failed, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Connect failed, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (false === strpos($link->host_info, 'TCP/IP'))
-	die(sprintf("skip SSL only supported on TCP/IP"));
+    die(sprintf("skip SSL only supported on TCP/IP"));
 
 $row = NULL;
 if ($res = $link->query('SHOW VARIABLES LIKE "have_ssl"')) {
-	$row = $res->fetch_row();
+    $row = $res->fetch_row();
 } else {
-	if ($link->errno == 1064 && ($res = $link->query("SHOW VARIABLES"))) {
-		while ($row = $res->fetch_row())
-			if ($row[0] == 'have_ssl')
-				break;
-	} else {
-		die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
-	}
+    if ($link->errno == 1064 && ($res = $link->query("SHOW VARIABLES"))) {
+        while ($row = $res->fetch_row())
+            if ($row[0] == 'have_ssl')
+                break;
+    } else {
+        die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
+    }
 }
 
 
 if (empty($row))
-	die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Failed to test for MySQL SSL support, [%d] %s", $link->errno, $link->error));
 
 if (($row[1] == 'NO') || ($row[1] == 'DISABLED'))
-	die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip MySQL has no SSL support, [%d] %s", $link->errno, $link->error));
 
 $link->close();
 ?>
diff --git a/ext/mysqli/tests/bug67839.phpt b/ext/mysqli/tests/bug67839.phpt
index b4e92d839f03d..4391d74add2ef 100644
--- a/ext/mysqli/tests/bug67839.phpt
+++ b/ext/mysqli/tests/bug67839.phpt
@@ -2,8 +2,8 @@
 mysqli_float_handling - ensure 4 byte float is handled correctly
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --INI--
 precision=5
diff --git a/ext/mysqli/tests/bug68077.phpt b/ext/mysqli/tests/bug68077.phpt
index 8e5ccfb410e65..2be4fe97aa84a 100644
--- a/ext/mysqli/tests/bug68077.phpt
+++ b/ext/mysqli/tests/bug68077.phpt
@@ -5,14 +5,14 @@ Bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$IS_MYSQLND) {
-	die("skip: test applies only to mysqlnd");
+    die("skip: test applies only to mysqlnd");
 }
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die("skip Cannot connect to MySQL");
+    die("skip Cannot connect to MySQL");
 
 include_once("local_infile_tools.inc");
 if ($msg = check_local_infile_support($link, $engine))
-	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+    die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug69899.phpt b/ext/mysqli/tests/bug69899.phpt
index da69e3c629f04..13c0c953818d5 100644
--- a/ext/mysqli/tests/bug69899.phpt
+++ b/ext/mysqli/tests/bug69899.phpt
@@ -12,7 +12,7 @@ require_once __DIR__ . '/skipif.inc';
 require_once __DIR__ . '/skipifconnectfailure.inc';
 require_once __DIR__ . '/connect.inc';
 if (!$IS_MYSQLND) {
-	die('skip mysqlnd only');
+    die('skip mysqlnd only');
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug70384.phpt b/ext/mysqli/tests/bug70384.phpt
index 5489905a0a67b..1bc0e7a97f76d 100644
--- a/ext/mysqli/tests/bug70384.phpt
+++ b/ext/mysqli/tests/bug70384.phpt
@@ -2,19 +2,19 @@
 mysqli_float_handling - ensure 4 byte float is handled correctly
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	if (@$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-		if ($link->server_version < 50709) {
-			die("skip MySQL 5.7.9+ needed. Found [".
-				intval(substr($link->server_version."", -5, 1)).
-				".".
-				intval(substr($link->server_version."", -4, 2)).
-				".".
-				intval(substr($link->server_version."", -2, 2)).
-				"]");
-		}
-	}
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    if (@$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+        if ($link->server_version < 50709) {
+            die("skip MySQL 5.7.9+ needed. Found [".
+                intval(substr($link->server_version."", -5, 1)).
+                ".".
+                intval(substr($link->server_version."", -4, 2)).
+                ".".
+                intval(substr($link->server_version."", -2, 2)).
+                "]");
+        }
+    }
 ?>
 --FILE--
 <?php
@@ -55,7 +55,7 @@ mysqli_float_handling - ensure 4 byte float is handled correctly
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 OK
diff --git a/ext/mysqli/tests/bug70949.phpt b/ext/mysqli/tests/bug70949.phpt
index b9ad29b6b82ef..24c729c670ae4 100644
--- a/ext/mysqli/tests/bug70949.phpt
+++ b/ext/mysqli/tests/bug70949.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 }
 ?>
 --FILE--
@@ -51,7 +51,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS bug70949"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug71863.phpt b/ext/mysqli/tests/bug71863.phpt
index 18465e996b92b..1490f9fe9691f 100644
--- a/ext/mysqli/tests/bug71863.phpt
+++ b/ext/mysqli/tests/bug71863.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 if (!$IS_MYSQLND) {
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/bug72701.phpt b/ext/mysqli/tests/bug72701.phpt
index 2145de9b48da1..b2944f02039d7 100644
--- a/ext/mysqli/tests/bug72701.phpt
+++ b/ext/mysqli/tests/bug72701.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
 if ("127.0.0.1" != $host && "localhost" != $host) {
-	die("skip require 127.0.0.1 connection");
+    die("skip require 127.0.0.1 connection");
 }
 
 ?>
diff --git a/ext/mysqli/tests/bug76386.phpt b/ext/mysqli/tests/bug76386.phpt
index 6173ebad8cd6c..f6fe13c917151 100644
--- a/ext/mysqli/tests/bug76386.phpt
+++ b/ext/mysqli/tests/bug76386.phpt
@@ -7,11 +7,11 @@ require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die("skip Cannot connect to check required version");
+    die("skip Cannot connect to check required version");
 
 /* Fractional seconds are supported with servers >= 5.6.4. */
 if (mysqli_get_server_version($link) < 50604) {
-	die(sprintf("skip Server doesn't support fractional seconds in timestamp (%s)", mysqli_get_server_version($link)));
+    die(sprintf("skip Server doesn't support fractional seconds in timestamp (%s)", mysqli_get_server_version($link)));
 }
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/bug77956.phpt b/ext/mysqli/tests/bug77956.phpt
index d4bc06f93be52..c76e1021e1586 100644
--- a/ext/mysqli/tests/bug77956.phpt
+++ b/ext/mysqli/tests/bug77956.phpt
@@ -7,12 +7,12 @@ require_once('skipifconnectfailure.inc');
 
 $link = mysqli_init();
 if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 }
 
 require_once('local_infile_tools.inc');
 if ($msg = check_local_infile_support($link, $engine))
-	die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
+    die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));
 
 ?>
 --INI--
diff --git a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt
index 9c94aa6dfb97e..452cb7d8f730e 100644
--- a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt
+++ b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt
@@ -26,7 +26,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(false)
diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt
index b3f6580baea01..3205e7cb2b8e2 100644
--- a/ext/mysqli/tests/mysqli_affected_rows.phpt
+++ b/ext/mysqli/tests/mysqli_affected_rows.phpt
@@ -2,8 +2,8 @@
 mysqli_affected_rows()
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
@@ -119,7 +119,7 @@ mysqli_affected_rows()
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
index 384ecd5e62d03..5e2e0bba8a09e 100644
--- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
+++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt
@@ -2,8 +2,8 @@
 mysqli->affected_rows
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
@@ -113,7 +113,7 @@ mysqli->affected_rows
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 Property access is not allowed yet
diff --git a/ext/mysqli/tests/mysqli_auth_pam.phpt b/ext/mysqli/tests/mysqli_auth_pam.phpt
index a20851a4db7f9..7d23ee5782571 100644
--- a/ext/mysqli/tests/mysqli_auth_pam.phpt
+++ b/ext/mysqli/tests/mysqli_auth_pam.phpt
@@ -6,22 +6,22 @@ require_once('skipif.inc');
 require_once('connect.inc');
 
 if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 }
 
 if ($link->server_version < 50500)
-	die(sprintf("SKIP Needs MySQL 5.5 or newer, found MySQL %s\n", $link->server_info));
+    die(sprintf("SKIP Needs MySQL 5.5 or newer, found MySQL %s\n", $link->server_info));
 
 if (!$res = $link->query("SHOW PLUGINS"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 $have_pam = false;
 while ($row = $res->fetch_assoc()) {
-	if (isset($row['Name']) && ('mysql_clear_password' == $row['Name'])) {
-		$have_pam = true;
-		break;
-	}
+    if (isset($row['Name']) && ('mysql_clear_password' == $row['Name'])) {
+        $have_pam = true;
+        break;
+    }
 }
 $res->close();
 
@@ -33,22 +33,22 @@ mysqli_query($link, 'DROP USER pamtest');
 mysqli_query($link, 'DROP USER pamtest@localhost');
 
 if (!mysqli_query($link, 'CREATE USER pamtest@"%" IDENTIFIED WITH mysql_clear_password') ||
-	!mysqli_query($link, 'CREATE USER pamtest@"localhost" IDENTIFIED WITH mysql_clear_password')) {
-	printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
-	mysqli_close($link);
-	die("skip CREATE USER failed");
+    !mysqli_query($link, 'CREATE USER pamtest@"localhost" IDENTIFIED WITH mysql_clear_password')) {
+    printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
+    mysqli_close($link);
+    die("skip CREATE USER failed");
 }
 
 if (!$link->query("CREATE TABLE test (id INT)") || !$link->query("INSERT INTO test(id) VALUES (1)"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 
 
 if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pamtest@'%%'", $db)) ||
-	!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pamtest@'localhost'", $db))) {
-	printf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link));
-	mysqli_close($link);
-	die("skip GRANT failed");
+    !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pamtest@'localhost'", $db))) {
+    printf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link));
+    mysqli_close($link);
+    die("skip GRANT failed");
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt
index af3142ea44ad2..9bfec89b27095 100644
--- a/ext/mysqli/tests/mysqli_autocommit.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit.phpt
@@ -2,17 +2,17 @@
 mysqli_autocommit()
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('connect.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('connect.inc');
+    require_once('skipifconnectfailure.inc');
 
-	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-		die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-			$host, $user, $db, $port, $socket));
-	}
+    if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
+        die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+            $host, $user, $db, $port, $socket));
+    }
 
-	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    if (!have_innodb($link))
+        die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -130,7 +130,7 @@ mysqli_autocommit()
     print "done!";
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
index 13e8fb0744c54..1030bedbb3777 100644
--- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
@@ -2,18 +2,18 @@
 mysqli->autocommit()
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	require_once('connect.inc');
-
-	if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
-		printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-			$host, $user, $db, $port, $socket);
-		exit(1);
-	}
-
-	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    require_once('connect.inc');
+
+    if (!$link = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
+        printf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+            $host, $user, $db, $port, $socket);
+        exit(1);
+    }
+
+    if (!have_innodb($link))
+        die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -133,7 +133,7 @@ mysqli->autocommit()
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 my_mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_begin_transaction.phpt b/ext/mysqli/tests/mysqli_begin_transaction.phpt
index e4c87ed9db75a..fa8d88908cc4b 100644
--- a/ext/mysqli/tests/mysqli_begin_transaction.phpt
+++ b/ext/mysqli/tests/mysqli_begin_transaction.phpt
@@ -7,10 +7,10 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -96,7 +96,7 @@ if (!have_innodb($link))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 NULL
diff --git a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
index 8fe529236b54b..383a7a1cf869b 100644
--- a/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_insert_id.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$IS_MYSQLND) {
-	die("skip Might hit known and open bugs http://bugs.mysql.com/bug.php?id=30472, http://bugs.mysql.com/bug.php?id=45184");
+    die("skip Might hit known and open bugs http://bugs.mysql.com/bug.php?id=30472, http://bugs.mysql.com/bug.php?id=45184");
 }
 ?>
 --FILE--
@@ -58,7 +58,7 @@ if (!$IS_MYSQLND) {
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
index c6bc2e9ee9561..70c119b554c25 100644
--- a/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_locks_temporary.phpt
@@ -100,7 +100,7 @@ die("skip - is the server still buggy?");
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_change_user_new.phpt b/ext/mysqli/tests/mysqli_change_user_new.phpt
index a9744ce98044c..bff89fb8ddd96 100644
--- a/ext/mysqli/tests/mysqli_change_user_new.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_new.phpt
@@ -6,11 +6,11 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 
 if (mysqli_get_server_version($link) < 50600)
-	die("SKIP For MySQL >= 5.6.0");
+    die("SKIP For MySQL >= 5.6.0");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_change_user_old.phpt b/ext/mysqli/tests/mysqli_change_user_old.phpt
index 550ff18a2b850..bc7dec03e6994 100644
--- a/ext/mysqli/tests/mysqli_change_user_old.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_old.phpt
@@ -6,11 +6,11 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 
 if (mysqli_get_server_version($link) >= 50600)
-	die("SKIP For MySQL < 5.6.0");
+    die("SKIP For MySQL < 5.6.0");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_change_user_oo.phpt b/ext/mysqli/tests/mysqli_change_user_oo.phpt
index bae4f8c858115..c0b4cb93681a6 100644
--- a/ext/mysqli/tests/mysqli_change_user_oo.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_oo.phpt
@@ -7,11 +7,11 @@ require_once('skipifconnectfailure.inc');
 
 require_once('table.inc');
 if (!$IS_MYSQLND && (mysqli_get_server_version($link) < 50118 && mysqli_get_server_version($link) > 50100)) {
-	die("skip Your MySQL Server version has a known bug that will cause a crash");
+    die("skip Your MySQL Server version has a known bug that will cause a crash");
 }
 
 if (mysqli_get_server_version($link) >= 50600)
-	die("SKIP For MySQL < 5.6.0");
+    die("SKIP For MySQL < 5.6.0");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
index 184dd23aa6573..d420e060d9c43 100644
--- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
@@ -6,10 +6,10 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -63,7 +63,7 @@ if (!have_innodb($link))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_change_user_set_names.phpt b/ext/mysqli/tests/mysqli_change_user_set_names.phpt
index 2a1d726fb4c98..f818dea7dab98 100644
--- a/ext/mysqli/tests/mysqli_change_user_set_names.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_set_names.phpt
@@ -6,19 +6,19 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!$res = mysqli_query($link, 'SELECT version() AS server_version'))
-	die(sprintf("skip [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
+    die(sprintf("skip [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
 
 $tmp = mysqli_fetch_assoc($res);
 mysqli_free_result($res);
 $version = explode('.', $tmp['server_version']);
 if (empty($version))
-	die(sprintf("skip Cannot determine server version, we need MySQL Server 4.1+ for the test!"));
+    die(sprintf("skip Cannot determine server version, we need MySQL Server 4.1+ for the test!"));
 
 if ($version[0] <= 4 && $version[1] < 1)
-	die(sprintf("skip We need MySQL Server 4.1+ for the test!"));
+    die(sprintf("skip We need MySQL Server 4.1+ for the test!"));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index a0d9c19928d5d..65be8a0408afd 100644
--- a/ext/mysqli/tests/mysqli_character_set.phpt
+++ b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_set_charset')) {
-	die('skip mysqli_set_charset() not available');
+    die('skip mysqli_set_charset() not available');
 }
 ?>
 --FILE--
@@ -100,7 +100,7 @@ if (!function_exists('mysqli_set_charset')) {
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
index fc5253a8074c9..2a61af45edb67 100644
--- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
+++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt
@@ -2,8 +2,8 @@
 mysqli_chararcter_set_name(), mysql_client_encoding() [alias]
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
index 40666a65bede5..393e06ebaad2b 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt
@@ -2,8 +2,8 @@
 Interface of the class mysqli_stmt
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt
index 0aedb50bb2272..045d2b18c3de9 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$TEST_EXPERIMENTAL)
-	die("skip - experimental (= unsupported) feature");
+    die("skip - experimental (= unsupported) feature");
 ?>
 --FILE--
 <?php
@@ -90,7 +90,7 @@ if (!$TEST_EXPERIMENTAL)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Warning: Wrong parameter count for mysqli_warning::mysqli_warning() in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt
index a85b96229864b..273412de0bb4f 100644
--- a/ext/mysqli/tests/mysqli_commit.phpt
+++ b/ext/mysqli/tests/mysqli_commit.phpt
@@ -7,10 +7,10 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -61,7 +61,7 @@ if (!have_innodb($link))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt
index e2b8a25fd33ca..6377fdf5a91c8 100644
--- a/ext/mysqli/tests/mysqli_commit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_commit_oo.phpt
@@ -7,10 +7,10 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -100,7 +100,7 @@ if (!have_innodb($link))
     print "done!";
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_connect_attr.phpt b/ext/mysqli/tests/mysqli_connect_attr.phpt
index 694dc72dab548..7d586a694d9aa 100644
--- a/ext/mysqli/tests/mysqli_connect_attr.phpt
+++ b/ext/mysqli/tests/mysqli_connect_attr.phpt
@@ -6,10 +6,10 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
-	die("skip: test applies only to mysqlnd");
+    die("skip: test applies only to mysqlnd");
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die("skip Cannot connect to the server");
+    die("skip Cannot connect to the server");
 
 /* skip test if the server version does not have session_connect_attrs table yet*/
 if (!$res = mysqli_query($link, "select count(*) as count from information_schema.tables where table_schema='performance_schema' and table_name='session_connect_attrs';"))
diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
index 8b5886bba28cf..9387dd2c48942 100644
--- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt
@@ -2,12 +2,12 @@
 new mysqli()
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	if (!get_current_user())
-		die('skip: get_current_user() not supported');
-	if (stristr(mysqli_get_client_info(), 'mysqlnd'))
-		die("skip: test for libmysql (different error output when using php streams");
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    if (!get_current_user())
+        die('skip: get_current_user() not supported');
+    if (stristr(mysqli_get_client_info(), 'mysqlnd'))
+        die("skip: test for libmysql (different error output when using php streams");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt
index d0fd7699283db..5334999cac190 100644
--- a/ext/mysqli/tests/mysqli_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek.phpt
@@ -61,7 +61,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_data_seek(): Argument #2 ($offset) must be greater than or equal to 0
diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
index 1a60d64a98333..d1939bafa2858 100644
--- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt
+++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt
@@ -72,7 +72,7 @@ require_once('skipifconnectfailure.inc');
     print "done!";
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_result object is already closed
diff --git a/ext/mysqli/tests/mysqli_debug.phpt b/ext/mysqli/tests/mysqli_debug.phpt
index 14c95c2de35be..1646dd9f3aa3a 100644
--- a/ext/mysqli/tests/mysqli_debug.phpt
+++ b/ext/mysqli/tests/mysqli_debug.phpt
@@ -6,13 +6,13 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
- 	die("skip: mysqli_debug() not available");
+    die("skip: mysqli_debug() not available");
 
 if (!defined('MYSQLI_DEBUG_TRACE_ENABLED'))
-	die("skip: can't say for sure if mysqli_debug works");
+    die("skip: can't say for sure if mysqli_debug works");
 
 if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
-	die("skip: debug functionality not enabled");
+    die("skip: debug functionality not enabled");
 ?>
 --FILE--
 <?php
@@ -59,7 +59,7 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 done%s
diff --git a/ext/mysqli/tests/mysqli_debug_append.phpt b/ext/mysqli/tests/mysqli_debug_append.phpt
index b246fed9e25b8..65496fdf6e99c 100644
--- a/ext/mysqli/tests/mysqli_debug_append.phpt
+++ b/ext/mysqli/tests/mysqli_debug_append.phpt
@@ -6,16 +6,16 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
- 	die("skip: mysqli_debug() not available");
+    die("skip: mysqli_debug() not available");
 
 if (!defined('MYSQLI_DEBUG_TRACE_ENABLED'))
-	die("skip: can't say for sure if mysqli_debug works");
+    die("skip: can't say for sure if mysqli_debug works");
 
 if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
-	die("skip: debug functionality not enabled");
+    die("skip: debug functionality not enabled");
 
 if (!$IS_MYSQLND)
-	die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
+    die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
 
 if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test is not for Windows platforms");
 ?>
@@ -88,7 +88,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip this test is not for Windows platfo
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 done%s
diff --git a/ext/mysqli/tests/mysqli_debug_control_string.phpt b/ext/mysqli/tests/mysqli_debug_control_string.phpt
index 7a59c7b4e00f0..bd17e138795af 100644
--- a/ext/mysqli/tests/mysqli_debug_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_control_string.phpt
@@ -6,16 +6,16 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
- 	die("skip: mysqli_debug() not available");
+    die("skip: mysqli_debug() not available");
 
 if (!defined('MYSQLI_DEBUG_TRACE_ENABLED'))
-	die("skip: can't say for sure if mysqli_debug works");
+    die("skip: can't say for sure if mysqli_debug works");
 
 if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
-	die("skip: debug functionality not enabled");
+    die("skip: debug functionality not enabled");
 
 if (!$IS_MYSQLND)
-	die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
+    die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt
index 6afea2f866674..6df6e0aef34a7 100644
--- a/ext/mysqli/tests/mysqli_debug_ini.phpt
+++ b/ext/mysqli/tests/mysqli_debug_ini.phpt
@@ -6,22 +6,22 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
- 	die("skip mysqli_debug() not available");
+    die("skip mysqli_debug() not available");
 
 if (!defined('MYSQLI_DEBUG_TRACE_ENABLED'))
-	die("skip: can't say for sure if mysqli_debug works");
+    die("skip: can't say for sure if mysqli_debug works");
 
 if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
-	die("skip: debug functionality not enabled");
+    die("skip: debug functionality not enabled");
 
 require_once('connect.inc');
 if (!$IS_MYSQLND)
-	die("skip needs mysqlnd");
+    die("skip needs mysqlnd");
 
 if (!$fp = @fopen('/tmp/mysqli_debug_phpt.trace', 'w'))
-	die("skip PHP cannot create a file in /tmp/mysqli_debug_phpt");
+    die("skip PHP cannot create a file in /tmp/mysqli_debug_phpt");
 else
-	fclose($fp);
+    fclose($fp);
 @unlink("/tmp/mysqli_debug_phpt.trace");
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
index 5e2be2ac5dea4..54026193169ba 100644
--- a/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_control_string.phpt
@@ -6,16 +6,16 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_debug'))
- 	die("skip: mysqli_debug() not available");
+    die("skip: mysqli_debug() not available");
 
 if (!defined('MYSQLI_DEBUG_TRACE_ENABLED'))
-	die("skip: can't say for sure if mysqli_debug works");
+    die("skip: can't say for sure if mysqli_debug works");
 
 if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
-	die("skip: debug functionality not enabled");
+    die("skip: debug functionality not enabled");
 
 if (!$IS_MYSQLND)
-	die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
+    die("SKIP Libmysql feature not sufficiently spec'd in MySQL C API documentation");
 ?>
 --FILE--
 <?php
@@ -222,7 +222,7 @@ if (!$IS_MYSQLND)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 [083][control string 'n:O,%smysqli_debug_phpt.trace'] Trace file has not been written.
diff --git a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
index a99df69359116..0d963d2370188 100644
--- a/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
+++ b/ext/mysqli/tests/mysqli_debug_mysqlnd_only.phpt
@@ -7,16 +7,16 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!function_exists('mysqli_debug'))
- 	die("skip mysqli_debug() not available");
+    die("skip mysqli_debug() not available");
 
 if (!defined('MYSQLI_DEBUG_TRACE_ENABLED'))
-	die("skip: can't say for sure if mysqli_debug works");
+    die("skip: can't say for sure if mysqli_debug works");
 
 if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
-	die("skip: debug functionality not enabled");
+    die("skip: debug functionality not enabled");
 
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 ?>
 --FILE--
 <?php
@@ -125,7 +125,7 @@ if (!$IS_MYSQLND)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
index fe51b6141d8d6..54edb67a07355 100644
--- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_disable_reads_from_master')) {
-	die("skip mysqli_disable_reads_from_master() not available");
+    die("skip mysqli_disable_reads_from_master() not available");
 }
 ?>
 --FILE--
@@ -39,7 +39,7 @@ if (!function_exists('mysqli_disable_reads_from_master')) {
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Warning: mysqli_disable_reads_from_master(): mysqli object is already closed in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
index d6e3088bc2d57..9c74b9592c21c 100644
--- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
+++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_enable_reads_from_master')) {
-	die("skip function mysqli_enable_reads_from_master() not available\n");
+    die("skip function mysqli_enable_reads_from_master() not available\n");
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_expire_password.phpt b/ext/mysqli/tests/mysqli_expire_password.phpt
index 788a3571c5e28..b11856d60dfca 100644
--- a/ext/mysqli/tests/mysqli_expire_password.phpt
+++ b/ext/mysqli/tests/mysqli_expire_password.phpt
@@ -6,45 +6,45 @@ require_once('skipif.inc');
 require_once('connect.inc');
 
 if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 }
 
 if ($link->server_version < 50610)
-	die(sprintf("SKIP Needs MySQL 5.6.10 or newer, found MySQL %s\n", $link->server_info));
+    die(sprintf("SKIP Needs MySQL 5.6.10 or newer, found MySQL %s\n", $link->server_info));
 
 if  (!$IS_MYSQLND && (mysqli_get_client_version() < 50610)) {
-	die(sprintf("SKIP Needs libmysql 5.6.10 or newer, found  %s\n", mysqli_get_client_version()));
+    die(sprintf("SKIP Needs libmysql 5.6.10 or newer, found  %s\n", mysqli_get_client_version()));
 }
 
 mysqli_query($link, 'DROP USER expiretest');
 mysqli_query($link, 'DROP USER expiretest@localhost');
 
 if (!mysqli_query($link, 'CREATE USER expiretest@"%"') ||
-	!mysqli_query($link, 'CREATE USER expiretest@"localhost"')) {
-	printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
-	mysqli_close($link);
-	die("skip CREATE USER failed");
+    !mysqli_query($link, 'CREATE USER expiretest@"localhost"')) {
+    printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
+    mysqli_close($link);
+    die("skip CREATE USER failed");
 }
 
 if (!mysqli_query($link, 'ALTER USER expiretest@"%" PASSWORD EXPIRE') ||
-	!mysqli_query($link, 'ALTER USER expiretest@"localhost" PASSWORD EXPIRE')) {
-	printf("skip Cannot modify second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
-	mysqli_close($link);
-	die("skip ALTER USER failed");
+    !mysqli_query($link, 'ALTER USER expiretest@"localhost" PASSWORD EXPIRE')) {
+    printf("skip Cannot modify second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
+    mysqli_close($link);
+    die("skip ALTER USER failed");
 }
 
 if (!$link->query("DROP TABLE IF EXISTS test") ||
-	!$link->query("CREATE TABLE test (id INT)") || !$link->query("INSERT INTO test(id) VALUES (1)"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    !$link->query("CREATE TABLE test (id INT)") || !$link->query("INSERT INTO test(id) VALUES (1)"))
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 
 
 if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'%%'", $db)) ||
-	!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'localhost'", $db))) {
-	printf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link));
-	mysqli_close($link);
-	die("skip GRANT failed");
+    !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'localhost'", $db))) {
+    printf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link));
+    mysqli_close($link);
+    die("skip GRANT failed");
 }
 ?>
 --FILE--
@@ -117,9 +117,9 @@ if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO expiretest@'%
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
-	mysqli_query($link, 'DROP USER expiretest');
-	mysqli_query($link, 'DROP USER expiretest@localhost');
+    require_once("clean_table.inc");
+    mysqli_query($link, 'DROP USER expiretest');
+    mysqli_query($link, 'DROP USER expiretest@localhost');
 ?>
 --EXPECTF--
 Warning: mysqli%sconnect(): (HY000/1862): %s in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_explain_metadata.phpt b/ext/mysqli/tests/mysqli_explain_metadata.phpt
index 45a567dd9f0c2..ade3e93fa7ba4 100644
--- a/ext/mysqli/tests/mysqli_explain_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_explain_metadata.phpt
@@ -156,7 +156,7 @@ if (!$IS_MYSQLND)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt
index 7c962790c6f86..ae99c2ca87571 100644
--- a/ext/mysqli/tests/mysqli_fetch_all.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all.phpt
@@ -5,7 +5,7 @@ mysqli_fetch_all()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_fetch_all'))
-	die("skip: function only available with mysqlnd");
+    die("skip: function only available with mysqlnd");
 ?>
 --FILE--
 <?php
@@ -312,7 +312,7 @@ if (!function_exists('mysqli_fetch_all'))
 ?>
 --CLEAN--
 <?php
-	// require_once("clean_table.inc");
+    // require_once("clean_table.inc");
 ?>
 --EXPECT--
 [005]
diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
index ff56ad1a9e98a..358dc2ae8b1aa 100644
--- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_fetch_all'))
-	die("skip: function only available with mysqlnd");
+    die("skip: function only available with mysqlnd");
 ?>
 --FILE--
 <?php
@@ -307,7 +307,7 @@ if (!function_exists('mysqli_fetch_all'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 [005]
diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
index defa5a541efe3..cbb3367dd0a1e 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt
@@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 [002]
diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
index 33330074df11b..d3e8c138b0ced 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt
@@ -108,7 +108,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
index e4e39b9dc7601..6bf2b0f4c02df 100644
--- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt
@@ -278,7 +278,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 [005]
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
index 62f2bf05e4662..de19f9a878ae6 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt
@@ -62,7 +62,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 [005]
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
index cc60a01b83a66..d59cd82128e02 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_bit.phpt
@@ -2,14 +2,14 @@
 mysqli_fetch_assoc() - BIT
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	require_once('connect.inc');
-	require_once('table.inc');
-	if (mysqli_get_server_version($link) < 50003)
-		// b'001' syntax not supported before 5.0.3
-		die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
+    require_once('connect.inc');
+    require_once('table.inc');
+    if (mysqli_get_server_version($link) < 50003)
+        // b'001' syntax not supported before 5.0.3
+        die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
 ?>
 --FILE--
 <?php
@@ -107,7 +107,7 @@ mysqli_fetch_assoc() - BIT
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
index d74fb4827010d..225a5c03d82e5 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt
@@ -2,35 +2,35 @@
 mysqli_fetch_assoc() - utf8
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	require_once("connect.inc");
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    require_once("connect.inc");
 
-	if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die("skip Cannot connect to server to check charsets");
+    if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+        die("skip Cannot connect to server to check charsets");
 
-	if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UTF8'"))
-		die("skip Cannot run SHOW CHARACTER SET to check charsets");
+    if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UTF8'"))
+        die("skip Cannot run SHOW CHARACTER SET to check charsets");
 
-	if (!$tmp = mysqli_fetch_assoc($res))
-		die("skip Looks like UTF8 is not available on the server");
+    if (!$tmp = mysqli_fetch_assoc($res))
+        die("skip Looks like UTF8 is not available on the server");
 
-	if (strtolower($tmp['Charset']) !== 'utf8')
-		die("skip Not sure if UTF8 is available, canceling the test");
+    if (strtolower($tmp['Charset']) !== 'utf8')
+        die("skip Not sure if UTF8 is available, canceling the test");
 
-	mysqli_free_result($res);
+    mysqli_free_result($res);
 
-	if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UCS2'"))
-		die("skip Cannot run SHOW CHARACTER SET to check charsets");
+    if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'UCS2'"))
+        die("skip Cannot run SHOW CHARACTER SET to check charsets");
 
-	if (!$tmp = mysqli_fetch_assoc($res))
-		die("skip Looks like UCS2 is not available on the server");
+    if (!$tmp = mysqli_fetch_assoc($res))
+        die("skip Looks like UCS2 is not available on the server");
 
-	if (strtolower($tmp['Charset']) !== 'ucs2')
-		die("skip Not sure if UCS2 is available, canceling the test");
+    if (strtolower($tmp['Charset']) !== 'ucs2')
+        die("skip Not sure if UCS2 is available, canceling the test");
 
-	mysqli_free_result($res);
-	mysqli_close($link);
+    mysqli_free_result($res);
+    mysqli_close($link);
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
index b3c218b2808ee..11c1928545c99 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt
@@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
index b6968ccbaead6..6d53211697d46 100644
--- a/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_assoc_zerofill.phpt
@@ -71,7 +71,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt
index f70f422534aad..2018d75755051 100644
--- a/ext/mysqli/tests/mysqli_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field.phpt
@@ -78,7 +78,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
index b8544d87f40bf..4a4d240be3721 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt
@@ -41,7 +41,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_fetch_field_direct(): Argument #2 ($offset) must be greater than or equal to 0
diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
index 9c7992570184f..1f94eefd388d5 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt
@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
index 14ca304aa42b8..7dff325623ddb 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt
@@ -7,10 +7,10 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+        die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (mysqli_get_server_version($link) < 50041)
-	die("skip: Due to many MySQL Server differences, the test requires 5.0.41+");
+    die("skip: Due to many MySQL Server differences, the test requires 5.0.41+");
 
 mysqli_close($link);
 ?>
@@ -219,7 +219,7 @@ mysqli_close($link);
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
index c5aa09c10927a..d655e05a9c1da 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt
@@ -66,7 +66,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
index 074d9ccd1c0d7..dcfbbaaace4b0 100644
--- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt
@@ -109,7 +109,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt
index 114029ac101ca..7cfad35f87389 100644
--- a/ext/mysqli/tests/mysqli_fetch_fields.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt
@@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt
index 371b300b17110..a1e4f50dbdfb9 100644
--- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt
@@ -37,7 +37,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(false)
diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
index 1de60e0363061..6c117afc59371 100644
--- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt
@@ -33,10 +33,10 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 NULL
diff --git a/ext/mysqli/tests/mysqli_fetch_object.phpt b/ext/mysqli/tests/mysqli_fetch_object.phpt
index 443b2663c7447..a234aee4c8a5c 100644
--- a/ext/mysqli/tests/mysqli_fetch_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object.phpt
@@ -139,7 +139,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Exception: Too few arguments to function mysqli_fetch_object_construct::__construct(), 0 passed and exactly 2 expected
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
index 9aac03195ba01..979c523199716 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt
@@ -45,7 +45,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 No exception with PHP:
diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
index 75e62fd9406f8..5a89d6d3f1253 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt
@@ -19,7 +19,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 %s(6) "object"
diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
index 674c68a4fd806..b00c485950004 100644
--- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt
@@ -128,7 +128,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt
index a1a891d7029e6..09ae78aba6b1d 100644
--- a/ext/mysqli/tests/mysqli_fetch_row.phpt
+++ b/ext/mysqli/tests/mysqli_fetch_row.phpt
@@ -33,7 +33,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 [004]
diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt
index 26d1b8b1089f4..ca40616547a34 100644
--- a/ext/mysqli/tests/mysqli_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_field_count.phpt
@@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc');
     print "done!";
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 int(0)
diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt
index 1f5a6ee8fba74..0a0b02273efc8 100644
--- a/ext/mysqli/tests/mysqli_field_seek.phpt
+++ b/ext/mysqli/tests/mysqli_field_seek.phpt
@@ -119,7 +119,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_field_seek(): Argument #2 ($field_nr) must be greater than or equal to 0
diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt
index 3575d17d8b5a5..79cfc04885191 100644
--- a/ext/mysqli/tests/mysqli_field_tell.phpt
+++ b/ext/mysqli/tests/mysqli_field_tell.phpt
@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 int(0)
diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt
index 594e30178e969..ca5eb6230facf 100644
--- a/ext/mysqli/tests/mysqli_fork.phpt
+++ b/ext/mysqli/tests/mysqli_fork.phpt
@@ -6,17 +6,17 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('pcntl_fork'))
-	die("skip Process Control Functions not available");
+    die("skip Process Control Functions not available");
 
 if (!function_exists('posix_getpid'))
-	die("skip POSIX functions not available");
+    die("skip POSIX functions not available");
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -228,10 +228,10 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS messages"))
-	printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt
index 3956021615084..8f81fffab4d57 100644
--- a/ext/mysqli/tests/mysqli_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_free_result.phpt
@@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 a
diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt
index 88aa0e471d3b9..68ee608028e5a 100644
--- a/ext/mysqli/tests/mysqli_get_charset.phpt
+++ b/ext/mysqli/tests/mysqli_get_charset.phpt
@@ -5,7 +5,7 @@ mysqli_get_charset()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_charset'))
-	die("skip: function not available");
+    die("skip: function not available");
 ?>
 --FILE--
 <?php
@@ -98,7 +98,7 @@ if (!function_exists('mysqli_get_charset'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt
index 9ef1cc444898c..78f3d05b39c27 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt
@@ -5,7 +5,7 @@ mysqli_get_client_stats()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
index ec4ebe7cfbc6e..92a779b31f483 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
@@ -5,7 +5,7 @@ mysqli_get_client_stats() - implicit_free_result
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
index 6cd49a2c1514b..e648d6695d6a6 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_off.phpt
@@ -5,7 +5,7 @@ mysqli_get_client_stats() - php_ini setting
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
index c9107115d3ead..ce7a5e3267a13 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
@@ -5,7 +5,7 @@ mysqli_get_client_stats() - PS
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
index 0e7f57bab1119..ef1ea86e50d1d 100644
--- a/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
+++ b/ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
@@ -8,7 +8,7 @@ mysqlnd.collect_memory_statistics="1"
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_client_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
index 24e871bf143e0..8c14ff2f1543b 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt
@@ -8,7 +8,7 @@ mysqlnd.collect_memory_statistics="1"
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_connection_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --FILE--
@@ -73,7 +73,7 @@ if (!function_exists('mysqli_get_connection_stats')) {
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
index 8002c045bfa7b..d2b087ce9aa57 100644
--- a/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
+++ b/ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
@@ -8,7 +8,7 @@ mysqlnd.collect_memory_statistics="0"
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_get_connection_stats')) {
-	die("skip only available with mysqlnd");
+    die("skip only available with mysqlnd");
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt
index a26daa9ce1ca2..4d9087860fb21 100644
--- a/ext/mysqli/tests/mysqli_get_host_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_host_info.phpt
@@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt
index 33e816f2e8a84..88cfd47ee19e8 100644
--- a/ext/mysqli/tests/mysqli_get_server_info.phpt
+++ b/ext/mysqli/tests/mysqli_get_server_info.phpt
@@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt
index 23356db4e6bfe..f81baa4177cca 100644
--- a/ext/mysqli/tests/mysqli_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_get_warnings.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$TEST_EXPERIMENTAL)
-	die("skip - experimental (= unsupported) feature");
+    die("skip - experimental (= unsupported) feature");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt
index 431be0d293249..0c45a4a67699b 100644
--- a/ext/mysqli/tests/mysqli_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id.phpt
@@ -126,7 +126,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
index 16797aa94b370..b3f36d4cb0ccc 100644
--- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt
+++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt
@@ -95,7 +95,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_insert_id_var"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
index 69f781f48a10b..105b3276d3bb4 100644
--- a/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
+++ b/ext/mysqli/tests/mysqli_insert_packet_overflow.phpt
@@ -6,14 +6,14 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("SKIP [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("SKIP [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 
 $max_len = pow(2, 24);
 if (!$res = mysqli_query($link, "SHOW GLOBAL VARIABLES LIKE 'max_allowed_packet'"))
-	die(sprintf("SKIP [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
+    die(sprintf("SKIP [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
 
 if (!mysqli_query($link, "SET NAMES 'latin1'"))
-	die(sprintf("SKIP [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
+    die(sprintf("SKIP [%d] %s\n", mysqli_errno($link), mysqli_error($link)));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt
index 563a6ba19c64f..d1301ac550fa6 100644
--- a/ext/mysqli/tests/mysqli_kill.phpt
+++ b/ext/mysqli/tests/mysqli_kill.phpt
@@ -77,7 +77,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_kill(): Argument #2 ($connection_id) must be greater than 0
diff --git a/ext/mysqli/tests/mysqli_last_insert_id.phpt b/ext/mysqli/tests/mysqli_last_insert_id.phpt
index b0c453d08e794..0598f29b740d9 100644
--- a/ext/mysqli/tests/mysqli_last_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_last_insert_id.phpt
@@ -176,7 +176,7 @@ API vs. SQL LAST_INSERT_ID()
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 API: %d, SQL: %d
diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt
index 36a477fcf3de6..aaa4f65f28856 100644
--- a/ext/mysqli/tests/mysqli_more_results.phpt
+++ b/ext/mysqli/tests/mysqli_more_results.phpt
@@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 [004]
diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt
index 843298140ba70..0cc260a557935 100644
--- a/ext/mysqli/tests/mysqli_multi_query.phpt
+++ b/ext/mysqli/tests/mysqli_multi_query.phpt
@@ -111,7 +111,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 [006] 3
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
index 159d7d9853d42..ec424e44bda98 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout.phpt
@@ -6,8 +6,8 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$IS_MYSQLND)
-	/* The libmysql read_timeout limit default is 365 * 24 * 3600 seconds. It cannot be altered through PHP API calls */
-	die("skip mysqlnd only test");
+    /* The libmysql read_timeout limit default is 365 * 24 * 3600 seconds. It cannot be altered through PHP API calls */
+    die("skip mysqlnd only test");
 ?>
 --INI--
 default_socket_timeout=60
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
index 403662829a711..a4459992d887d 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_long.phpt
@@ -6,14 +6,14 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND) {
-	die("skip: test applies only to mysqlnd");
+    die("skip: test applies only to mysqlnd");
 }
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50011) {
-	die(sprintf('skip Needs MySQL 5.0.12+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.0.12+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
index 011df0e7628af..5ba35270281c5 100644
--- a/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
+++ b/ext/mysqli/tests/mysqli_mysqlnd_read_timeout_zero.phpt
@@ -6,14 +6,14 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND) {
-	die("skip: test applies only to mysqlnd");
+    die("skip: test applies only to mysqlnd");
 }
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50011) {
-	die(sprintf('skip Needs MySQL 5.0.12+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.0.12+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --INI--
diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt
index 62b743014f3d0..425260b92657d 100644
--- a/ext/mysqli/tests/mysqli_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_next_result.phpt
@@ -64,7 +64,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt
index e1d61cf7853d4..083ccef4bfb90 100644
--- a/ext/mysqli/tests/mysqli_num_fields.phpt
+++ b/ext/mysqli/tests/mysqli_num_fields.phpt
@@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_result object is already closed
diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt
index 04a5dec59aadc..f617757d37820 100644
--- a/ext/mysqli/tests/mysqli_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_num_rows.phpt
@@ -71,7 +71,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_result object is already closed
diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt
index 089f230538d01..fe591c2fe72d9 100644
--- a/ext/mysqli/tests/mysqli_options_init_command.phpt
+++ b/ext/mysqli/tests/mysqli_options_init_command.phpt
@@ -69,7 +69,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Warning: mysqli_real_connect(): (%s/%d): %s in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
index 91bd38553c24c..0b7f8df703fae 100644
--- a/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
+++ b/ext/mysqli/tests/mysqli_options_int_and_float_native.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 ?>
 --FILE--
 <?php
@@ -102,7 +102,7 @@ if (!$IS_MYSQLND)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt
index 5d9591e0dc4eb..8866409efeb5f 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256.phpt
@@ -10,43 +10,43 @@ phpinfo(INFO_MODULES);
 $tmp = ob_get_contents();
 ob_end_clean();
 if (!stristr($tmp, "auth_plugin_sha256_password"))
-	die("skip SHA256 auth plugin not built-in to mysqlnd");
+    die("skip SHA256 auth plugin not built-in to mysqlnd");
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+        die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (mysqli_get_server_version($link) < 50606)
-	die("skip: SHA-256 requires MySQL 5.6.6+");
+    die("skip: SHA-256 requires MySQL 5.6.6+");
 
 if (!($res = $link->query("SHOW PLUGINS"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 $found = false;
 while ($row = $res->fetch_assoc()) {
-	if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
-		$found = true;
-		break;
-	}
+    if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
+        $found = true;
+        break;
+    }
 }
 if (!$found)
-	die("skip SHA-256 server plugin unavailable");
+    die("skip SHA-256 server plugin unavailable");
 
 if (!($res = $link->query("SHOW STATUS LIKE 'Rsa_public_key'"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 if (!($row = $res->fetch_assoc())) {
-	die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
 }
 
 if (strlen($row['Value']) < 100) {
-	die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
 }
 
 if (!$link->query("SET @@session.old_passwords=2")) {
-	die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
 }
 
 $link->query('DROP USER shatest');
@@ -54,24 +54,24 @@ $link->query("DROP USER shatest@localhost");
 
 
 if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
-	!$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
-	die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
+    !$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
+    die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-	!$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
-	die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+    die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query("DROP TABLE IF EXISTS test") ||
-	!$link->query("CREATE TABLE test (id INT)") ||
-	!$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    !$link->query("CREATE TABLE test (id INT)") ||
+    !$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 
 if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) ||
-	!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
-	die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
+    !$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
+    die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
 }
 
 $link->close();
@@ -104,9 +104,9 @@ $link->close();
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
-	$link->query('DROP USER shatest');
-	$link->query('DROP USER shatest@localhost');
+    require_once("clean_table.inc");
+    $link->query('DROP USER shatest');
+    $link->query('DROP USER shatest@localhost');
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
index 7799effe229e0..86e27fbaff7d9 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
@@ -10,56 +10,56 @@ phpinfo(INFO_MODULES);
 $tmp = ob_get_contents();
 ob_end_clean();
 if (!stristr($tmp, "auth_plugin_sha256_password"))
-	die("skip SHA256 auth plugin not built-in to mysqlnd");
+    die("skip SHA256 auth plugin not built-in to mysqlnd");
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+        die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (mysqli_get_server_version($link) < 50606)
-	die("skip: SHA-256 requires MySQL 5.6.6+");
+    die("skip: SHA-256 requires MySQL 5.6.6+");
 
 if (!($res = $link->query("SHOW PLUGINS"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 $found = false;
 while ($row = $res->fetch_assoc()) {
-	if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
-		$found = true;
-		break;
-	}
+    if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
+        $found = true;
+        break;
+    }
 }
 if (!$found)
-	die("skip SHA-256 server plugin unavailable");
+    die("skip SHA-256 server plugin unavailable");
 
 if (!($res = $link->query("SHOW STATUS LIKE 'Rsa_public_key'"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 if (!($row = $res->fetch_assoc())) {
-	die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
 }
 
 $key = $row['Value'];
 if (strlen($key) < 100) {
-	die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
 }
 
 /* date changes may give false positive */
 $file = "test_sha256_ini";
 if ((file_exists($file) && !unlink($file)) || !($fp = @fopen($file, "w"))) {
-	die(sprintf("skip Cannot create RSA pub key file '%s'", $file));
+    die(sprintf("skip Cannot create RSA pub key file '%s'", $file));
 }
 $key = str_replace("A", "a", $key);
 $key = str_replace("M", "m", $key);
 if (strlen($key) != fwrite($fp, $key)) {
-	die(sprintf("skip Failed to create pub key file"));
+    die(sprintf("skip Failed to create pub key file"));
 }
 
 
 if (!$link->query("SET @@session.old_passwords=2")) {
-	die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
 }
 
 $link->query('DROP USER shatest');
@@ -67,24 +67,24 @@ $link->query("DROP USER shatest@localhost");
 
 
 if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
-	!$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
-	die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
+    !$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
+    die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-	!$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
-	die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+    die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query("DROP TABLE IF EXISTS test") ||
-	!$link->query("CREATE TABLE test (id INT)") ||
-	!$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    !$link->query("CREATE TABLE test (id INT)") ||
+    !$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 
 if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) ||
-	!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
-	die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
+    !$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
+    die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
 }
 
 $link->close();
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
index e6c65bef9d2b2..9b5639ff9a7ad 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
@@ -10,53 +10,53 @@ phpinfo(INFO_MODULES);
 $tmp = ob_get_contents();
 ob_end_clean();
 if (!stristr($tmp, "auth_plugin_sha256_password"))
-	die("skip SHA256 auth plugin not built-in to mysqlnd");
+    die("skip SHA256 auth plugin not built-in to mysqlnd");
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+        die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (mysqli_get_server_version($link) < 50606)
-	die("skip: SHA-256 requires MySQL 5.6.6+");
+    die("skip: SHA-256 requires MySQL 5.6.6+");
 
 if (!($res = $link->query("SHOW PLUGINS"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 $found = false;
 while ($row = $res->fetch_assoc()) {
-	if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
-		$found = true;
-		break;
-	}
+    if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
+        $found = true;
+        break;
+    }
 }
 if (!$found)
-	die("skip SHA-256 server plugin unavailable");
+    die("skip SHA-256 server plugin unavailable");
 
 if (!($res = $link->query("SHOW STATUS LIKE 'Rsa_public_key'"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 if (!($row = $res->fetch_assoc())) {
-	die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
 }
 
 if (strlen($row['Value']) < 100) {
-	die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
 }
 
 /* date changes may give false positive */
 $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd"));
 if ((file_exists($file) && !unlink($file)) || !($fp = @fopen($file, "w"))) {
-	die(sprintf("skip Cannot create RSA pub key file '%s'", $file));
+    die(sprintf("skip Cannot create RSA pub key file '%s'", $file));
 }
 if (strlen($row['Value']) != fwrite($fp, $row['Value'])) {
-	die(sprintf("skip Failed to create pub key file"));
+    die(sprintf("skip Failed to create pub key file"));
 }
 
 
 if (!$link->query("SET @@session.old_passwords=2")) {
-	die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
 }
 
 $link->query('DROP USER shatest');
@@ -64,24 +64,24 @@ $link->query("DROP USER shatest@localhost");
 
 
 if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
-	!$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
-	die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
+    !$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
+    die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-	!$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
-	die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+    die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query("DROP TABLE IF EXISTS test") ||
-	!$link->query("CREATE TABLE test (id INT)") ||
-	!$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    !$link->query("CREATE TABLE test (id INT)") ||
+    !$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 
 if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) ||
-	!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
-	die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
+    !$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
+    die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
 }
 
 $link->close();
@@ -121,11 +121,11 @@ $link->close();
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
-	$link->query('DROP USER shatest');
-	$link->query('DROP USER shatest@localhost');
-	$file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd"));
-	@unlink($file);
+    require_once("clean_table.inc");
+    $link->query('DROP USER shatest');
+    $link->query('DROP USER shatest@localhost');
+    $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd"));
+    @unlink($file);
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
index 2397c82cac9cd..b664179265fdd 100644
--- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
+++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
@@ -10,53 +10,53 @@ phpinfo(INFO_MODULES);
 $tmp = ob_get_contents();
 ob_end_clean();
 if (!stristr($tmp, "auth_plugin_sha256_password"))
-	die("skip SHA256 auth plugin not built-in to mysqlnd");
+    die("skip SHA256 auth plugin not built-in to mysqlnd");
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
+        die(printf("skip: [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (mysqli_get_server_version($link) < 50606)
-	die("skip: SHA-256 requires MySQL 5.6.6+");
+    die("skip: SHA-256 requires MySQL 5.6.6+");
 
 if (!($res = $link->query("SHOW PLUGINS"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 $found = false;
 while ($row = $res->fetch_assoc()) {
-	if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
-		$found = true;
-		break;
-	}
+    if (($row['Name'] == 'sha256_password') && ($row['Status'] == 'ACTIVE')) {
+        $found = true;
+        break;
+    }
 }
 if (!$found)
-	die("skip SHA-256 server plugin unavailable");
+    die("skip SHA-256 server plugin unavailable");
 
 if (!($res = $link->query("SHOW STATUS LIKE 'Rsa_public_key'"))) {
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 }
 
 if (!($row = $res->fetch_assoc())) {
-	die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Failed to check RSA pub key, [%d] %s\n", $link->errno, $link->error));
 }
 
 if (strlen($row['Value']) < 100) {
-	die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
+    die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
 }
 
 /* date changes may give false positive */
 $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd"));
 if ((file_exists($file) && !unlink($file)) || !($fp = @fopen($file, "w"))) {
-	die(sprintf("skip Cannot create RSA pub key file '%s'", $file));
+    die(sprintf("skip Cannot create RSA pub key file '%s'", $file));
 }
 if (strlen($row['Value']) != fwrite($fp, $row['Value'])) {
-	die(sprintf("skip Failed to create pub key file"));
+    die(sprintf("skip Failed to create pub key file"));
 }
 
 
 if (!$link->query("SET @@session.old_passwords=2")) {
-	die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
 }
 
 $link->query('DROP USER shatest');
@@ -64,24 +64,24 @@ $link->query("DROP USER shatest@localhost");
 
 
 if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
-	!$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
-	die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
+    !$link->query('CREATE USER shatest@"localhost" IDENTIFIED WITH sha256_password')) {
+    die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-	!$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
-	die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+    die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
 if (!$link->query("DROP TABLE IF EXISTS test") ||
-	!$link->query("CREATE TABLE test (id INT)") ||
-	!$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
-	die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
+    !$link->query("CREATE TABLE test (id INT)") ||
+    !$link->query("INSERT INTO test(id) VALUES (1), (2), (3)"))
+    die(sprintf("SKIP [%d] %s\n", $link->errno, $link->error));
 
 
 if (!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'%%'", $db)) ||
-	!$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
-	die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
+    !$link->query(sprintf("GRANT SELECT ON TABLE %s.test TO shatest@'localhost'", $db))) {
+    die(sprintf("skip Cannot grant SELECT to user [%d] %s", mysqli_errno($link), mysqli_error($link)));
 }
 
 $link->close();
@@ -165,13 +165,13 @@ $link->close();
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
-	$link->query('DROP USER shatest');
-	$link->query('DROP USER shatest@localhost');
-	$file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd"));
-	@unlink($file);
-	$file_wrong = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_wrong" , @date("Ymd"));
-	@unlink($file_wrong);
+    require_once("clean_table.inc");
+    $link->query('DROP USER shatest');
+    $link->query('DROP USER shatest@localhost');
+    $file = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_" , @date("Ymd"));
+    @unlink($file);
+    $file_wrong = sprintf("%s%s%s_%s", sys_get_temp_dir(), DIRECTORY_SEPARATOR, "test_sha256_wrong" , @date("Ymd"));
+    @unlink($file_wrong);
 ?>
 --EXPECTF--
 Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
index f6ee6aa5a07aa..f48222c425336 100644
--- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt
+++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt
@@ -2,41 +2,41 @@
 Persistent connections and mysqli.max_links
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	require_once('table.inc');
-
-	mysqli_query($link, 'DROP USER pcontest');
-	mysqli_query($link, 'DROP USER pcontest@localhost');
-
-	if (!mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') ||
-		!mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) {
-		printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
-		mysqli_close($link);
-		die("skip CREATE USER failed");
-	}
-
-	// we might be able to specify the host using CURRENT_USER(), but...
-	if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) ||
-		!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) {
-		printf("skip Cannot GRANT SELECT to second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
-		mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest');
-		mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost');
-		mysqli_query($link, 'DROP USER pcontest@localhost');
-		mysqli_query($link, 'DROP USER pcontest');
-		mysqli_close($link);
-		die("skip GRANT failed");
-	}
-
-	if (!($link_pcontest = @my_mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) {
-		mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest');
-		mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost');
-		mysqli_query($link, 'DROP USER pcontest@localhost');
-		mysqli_query($link, 'DROP USER pcontest');
-		mysqli_close($link);
-		die("skip CONNECT using new user failed");
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    require_once('table.inc');
+
+    mysqli_query($link, 'DROP USER pcontest');
+    mysqli_query($link, 'DROP USER pcontest@localhost');
+
+    if (!mysqli_query($link, 'CREATE USER pcontest@"%" IDENTIFIED BY "pcontest"') ||
+        !mysqli_query($link, 'CREATE USER pcontest@localhost IDENTIFIED BY "pcontest"')) {
+        printf("skip Cannot create second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
+        mysqli_close($link);
+        die("skip CREATE USER failed");
+    }
+
+    // we might be able to specify the host using CURRENT_USER(), but...
+    if (!mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'%%'", $db)) ||
+        !mysqli_query($link, sprintf("GRANT SELECT ON TABLE %s.test TO pcontest@'localhost'", $db))) {
+        printf("skip Cannot GRANT SELECT to second DB user [%d] %s", mysqli_errno($link), mysqli_error($link));
+        mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest');
+        mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost');
+        mysqli_query($link, 'DROP USER pcontest@localhost');
+        mysqli_query($link, 'DROP USER pcontest');
+        mysqli_close($link);
+        die("skip GRANT failed");
     }
-	mysqli_close($link);
+
+    if (!($link_pcontest = @my_mysqli_connect($host, 'pcontest', 'pcontest', $db, $port, $socket))) {
+        mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest');
+        mysqli_query($link, 'REVOKE ALL PRIVILEGES, GRANT OPTION FROM pcontest@localhost');
+        mysqli_query($link, 'DROP USER pcontest@localhost');
+        mysqli_query($link, 'DROP USER pcontest');
+        mysqli_close($link);
+        die("skip CONNECT using new user failed");
+    }
+    mysqli_close($link);
 ?>
 --INI--
 mysqli.allow_persistent=1
diff --git a/ext/mysqli/tests/mysqli_poll.phpt b/ext/mysqli/tests/mysqli_poll.phpt
index d5527fcf02c06..c786a8166b305 100644
--- a/ext/mysqli/tests/mysqli_poll.phpt
+++ b/ext/mysqli/tests/mysqli_poll.phpt
@@ -7,7 +7,7 @@ require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
+    die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_poll_kill.phpt b/ext/mysqli/tests/mysqli_poll_kill.phpt
index 8ac3dc2bd1857..1cd18cc45ca81 100644
--- a/ext/mysqli/tests/mysqli_poll_kill.phpt
+++ b/ext/mysqli/tests/mysqli_poll_kill.phpt
@@ -7,7 +7,7 @@ require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
+    die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
index 1813a72a27237..44397ca37c190 100644
--- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
+++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt
@@ -7,7 +7,7 @@ require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
+    die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
 ?>
 --FILE--
 <?php
@@ -165,10 +165,10 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS bogus"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_query($link, "DROP PROCEDURE IF EXISTS p");
 
diff --git a/ext/mysqli/tests/mysqli_poll_reference.phpt b/ext/mysqli/tests/mysqli_poll_reference.phpt
index bf79c13a27b68..ca084aa63c64b 100644
--- a/ext/mysqli/tests/mysqli_poll_reference.phpt
+++ b/ext/mysqli/tests/mysqli_poll_reference.phpt
@@ -7,13 +7,13 @@ require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
+    die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die("skip cannot connect");
+    die("skip cannot connect");
 
 if (mysqli_get_server_version($link) < 50012)
-	die("skip Test needs SQL function SLEEP() available as of MySQL 5.0.12");
+    die("skip Test needs SQL function SLEEP() available as of MySQL 5.0.12");
 
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt
index 16d208efcca8b..f6676396e53a1 100644
--- a/ext/mysqli/tests/mysqli_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_prepare.phpt
@@ -106,10 +106,10 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test2"))
-	printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c003] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt
index b3269689c1b19..90fc24cf9c852 100644
--- a/ext/mysqli/tests/mysqli_query.phpt
+++ b/ext/mysqli/tests/mysqli_query.phpt
@@ -107,7 +107,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 @mysqli_query($link, "DROP FUNCTION IF EXISTS f");
 @mysqli_query($link, 'DROP PROCEDURE IF EXISTS p');
diff --git a/ext/mysqli/tests/mysqli_query_iterators.phpt b/ext/mysqli/tests/mysqli_query_iterators.phpt
index cb567affc2878..3ad35363b9c40 100644
--- a/ext/mysqli/tests/mysqli_query_iterators.phpt
+++ b/ext/mysqli/tests/mysqli_query_iterators.phpt
@@ -69,7 +69,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 --- Testing default ---
diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
index 4a77ac91c8ef3..566dc9dc27239 100644
--- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt
@@ -6,10 +6,10 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50000) {
-	die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --FILE--
@@ -157,7 +157,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 @mysqli_query($link, "DROP PROCEDURE IS EXISTS p");
 
diff --git a/ext/mysqli/tests/mysqli_query_unicode.phpt b/ext/mysqli/tests/mysqli_query_unicode.phpt
index 6959346107bde..b62418508f106 100644
--- a/ext/mysqli/tests/mysqli_query_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_query_unicode.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 require_once('table.inc');
 if (!$res = mysqli_query($link, "SHOW CHARACTER SET LIKE 'utf8'"))
-	die("skip UTF8 chatset seems not available");
+    die("skip UTF8 chatset seems not available");
 mysqli_free_result($res);
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
index a7245e384e1ce..d49c01d3b7aef 100644
--- a/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
+++ b/ext/mysqli/tests/mysqli_real_connect_pconn.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 ?>
 --INI--
 mysqli.allow_local_infile=1
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
index e6b60997c9a03..2dec713db2bb9 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_big5.phpt
@@ -8,11 +8,11 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-		mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
+        mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (!mysqli_set_charset($link, 'big5'))
-	die(sprintf("skip Cannot set charset 'big5'"));
+    die(sprintf("skip Cannot set charset 'big5'"));
 mysqli_close($link);
 ?>
 --FILE--
@@ -71,7 +71,7 @@ mysqli_error($link));
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
index 34c4faa98a87d..9af4ade589442 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_eucjpms.phpt
@@ -8,11 +8,11 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-		mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
+        mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (!mysqli_set_charset($link, 'eucjpms'))
-	die(sprintf("skip Cannot set charset 'eucjpms'"));
+    die(sprintf("skip Cannot set charset 'eucjpms'"));
 mysqli_close($link);
 ?>
 --FILE--
@@ -64,7 +64,7 @@ mysqli_error($link));
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
index c9482cc6e1ed9..c79302d4027b8 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_euckr.phpt
@@ -8,11 +8,11 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-		mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
+        mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (!mysqli_set_charset($link, 'euckr'))
-	die(sprintf("skip Cannot set charset 'euckr'"));
+    die(sprintf("skip Cannot set charset 'euckr'"));
 mysqli_close($link);
 ?>
 --FILE--
@@ -63,7 +63,7 @@ mysqli_error($link));
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
index d85649757e8d5..d84944b4bd21b 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gb2312.phpt
@@ -8,11 +8,11 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-		mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
+        mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (!mysqli_set_charset($link, 'gb2312'))
-	die(sprintf("skip Cannot set charset 'gb2312'"));
+    die(sprintf("skip Cannot set charset 'gb2312'"));
 mysqli_close($link);
 ?>
 --FILE--
@@ -64,7 +64,7 @@ mysqli_error($link));
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
index 2f08d5c37fac8..4da0d8a232914 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_gbk.phpt
@@ -7,11 +7,11 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-		mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
+        mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (!mysqli_set_charset($link, 'gbk'))
-	die(sprintf("skip Cannot set charset 'gbk'"));
+    die(sprintf("skip Cannot set charset 'gbk'"));
 
 mysqli_close($link);
 ?>
@@ -64,7 +64,7 @@ mysqli_error($link));
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 bool(true)
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
index c577215357e31..034a3bd607bab 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_sjis.phpt
@@ -7,11 +7,11 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
-		mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect to MySQL, [%d] %s\n",
+        mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (!mysqli_set_charset($link, 'sjis'))
-	die(sprintf("skip Cannot set charset 'sjis'"));
+    die(sprintf("skip Cannot set charset 'sjis'"));
 mysqli_close($link);
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
index 78a3ece11b15f..4bb5ef79690f5 100644
--- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt
@@ -71,7 +71,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt
index 45df8a9edcd9c..4b429940d7d0b 100644
--- a/ext/mysqli/tests/mysqli_real_query.phpt
+++ b/ext/mysqli/tests/mysqli_real_query.phpt
@@ -87,7 +87,7 @@ if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 @mysqli_query($link, "DROP PROCEDURE IF EXISTS p");
 @mysqli_query($link, "DROP FUNCTION IF EXISTS f");
diff --git a/ext/mysqli/tests/mysqli_reap_async_query.phpt b/ext/mysqli/tests/mysqli_reap_async_query.phpt
index 223befe9bc8fc..b93996ef38b64 100644
--- a/ext/mysqli/tests/mysqli_reap_async_query.phpt
+++ b/ext/mysqli/tests/mysqli_reap_async_query.phpt
@@ -7,7 +7,7 @@ require_once('connect.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$IS_MYSQLND)
-	die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
+    die("skip mysqlnd only feature, compile PHP using --with-mysqli=mysqlnd");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_reconnect.phpt b/ext/mysqli/tests/mysqli_reconnect.phpt
index dde2d7c261a51..d473211b58c55 100644
--- a/ext/mysqli/tests/mysqli_reconnect.phpt
+++ b/ext/mysqli/tests/mysqli_reconnect.phpt
@@ -5,7 +5,7 @@ Trying implicit reconnect after wait_timeout and KILL using mysqli_ping()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (stristr(mysqli_get_client_info(), 'mysqlnd'))
-	die("skip: test for libmysql");
+    die("skip: test for libmysql");
 ?>
 --INI--
 mysqli.reconnect=1
diff --git a/ext/mysqli/tests/mysqli_release_savepoint.phpt b/ext/mysqli/tests/mysqli_release_savepoint.phpt
index cbadb8a95cea0..44c33b39c2283 100644
--- a/ext/mysqli/tests/mysqli_release_savepoint.phpt
+++ b/ext/mysqli/tests/mysqli_release_savepoint.phpt
@@ -7,10 +7,10 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -61,7 +61,7 @@ if (!have_innodb($link))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_release_savepoint(): Argument #2 ($name) cannot be empty
diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt
index 4ad70a4eb9d8d..5aa695f8f2ae1 100644
--- a/ext/mysqli/tests/mysqli_report.phpt
+++ b/ext/mysqli/tests/mysqli_report.phpt
@@ -281,7 +281,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_report_new.phpt b/ext/mysqli/tests/mysqli_report_new.phpt
index af951739c24b9..305d70108379c 100644
--- a/ext/mysqli/tests/mysqli_report_new.phpt
+++ b/ext/mysqli/tests/mysqli_report_new.phpt
@@ -6,11 +6,11 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 
 if (mysqli_get_server_version($link) < 50600)
-	die("SKIP For MySQL >= 5.6.0");
+    die("SKIP For MySQL >= 5.6.0");
 
 ?>
 --FILE--
@@ -41,7 +41,7 @@ if (mysqli_get_server_version($link) < 50600)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Warning: mysqli_change_user(): (%d/%d): Access denied for user '%s'@'%s' (using password: %s) in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
index 7103adfdb2a5f..7f0295dd44c71 100644
--- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt
+++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt
@@ -6,11 +6,11 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("SKIP Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 
 if (mysqli_get_server_version($link) >= 50600)
-	die("SKIP For MySQL < 5.6.0");
+    die("SKIP For MySQL < 5.6.0");
 ?>
 --FILE--
 <?php
@@ -105,7 +105,7 @@ if (mysqli_get_server_version($link) >= 50600)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Warning: mysqli_multi_query(): (%d/%d): You have an error in your SQL syntax; check the manual that corresponds to your %s server version for the right syntax to use near 'BAR; FOO' at line 1 in %s on line %d
diff --git a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt
index 938f6e65dc38f..6be779f33134b 100644
--- a/ext/mysqli/tests/mysqli_result_invalid_mode.phpt
+++ b/ext/mysqli/tests/mysqli_result_invalid_mode.phpt
@@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_result::__construct(): Argument #2 ($result_mode) must be either MYSQLI_STORE_RESULT or MYSQLI_USE_RESULT
diff --git a/ext/mysqli/tests/mysqli_result_references.phpt b/ext/mysqli/tests/mysqli_result_references.phpt
index f917d00ed3bd6..2e97cd45d795a 100644
--- a/ext/mysqli/tests/mysqli_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_result_references.phpt
@@ -78,7 +78,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 array(7) refcount(2){
diff --git a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
index a5c68ca73f049..8c3c65f609182 100644
--- a/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_result_references_mysqlnd.phpt
@@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$IS_MYSQLND)
-	die("skip Test for mysqlnd only");
+    die("skip Test for mysqlnd only");
 require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt
index 51060d6287a90..17f7aed05e9b4 100644
--- a/ext/mysqli/tests/mysqli_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_rollback.phpt
@@ -2,15 +2,15 @@
 mysqli_rollback()
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	require_once('connect.inc');
-	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-		die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    require_once('connect.inc');
+    if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+        die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-	if (!have_innodb($link))
-		die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    if (!have_innodb($link))
+        die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -58,7 +58,7 @@ mysqli_rollback()
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_savepoint.phpt b/ext/mysqli/tests/mysqli_savepoint.phpt
index b3b616a70ee69..ebe27686aca87 100644
--- a/ext/mysqli/tests/mysqli_savepoint.phpt
+++ b/ext/mysqli/tests/mysqli_savepoint.phpt
@@ -7,10 +7,10 @@ require_once('skipifconnectfailure.inc');
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!have_innodb($link))
-	die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
+    die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
@@ -50,7 +50,7 @@ if (!have_innodb($link))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_savepoint(): Argument #2 ($name) cannot be empty
diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt
index 4e257bd0a11d8..0289e7733e5cc 100644
--- a/ext/mysqli/tests/mysqli_send_query.phpt
+++ b/ext/mysqli/tests/mysqli_send_query.phpt
@@ -5,11 +5,11 @@ mysqli_send_query()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_send_query')) {
-	die("skip mysqli_send_query() not available");
+    die("skip mysqli_send_query() not available");
 }
 require_once('connect.inc');
 if (!$TEST_EXPERIMENTAL)
-	die("skip - experimental (= unsupported) feature");
+    die("skip - experimental (= unsupported) feature");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt
index cd30913661f52..30bbb1410f6ca 100644
--- a/ext/mysqli/tests/mysqli_set_charset.phpt
+++ b/ext/mysqli/tests/mysqli_set_charset.phpt
@@ -6,41 +6,41 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_set_charset'))
- 	die("skip Function not available");
+    die("skip Function not available");
 
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
-	die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
 if (!($res = mysqli_query($link, 'SELECT version() AS server_version')) ||
-		!($tmp = mysqli_fetch_assoc($res))) {
-	mysqli_close($link);
-	die(sprintf("skip Cannot check server version, [%d] %s\n",
-	mysqli_errno($link), mysqli_error($link)));
+        !($tmp = mysqli_fetch_assoc($res))) {
+    mysqli_close($link);
+    die(sprintf("skip Cannot check server version, [%d] %s\n",
+    mysqli_errno($link), mysqli_error($link)));
 }
 mysqli_free_result($res);
 $version = explode('.', $tmp['server_version']);
 if (empty($version)) {
-	mysqli_close($link);
-	die(sprintf("skip Cannot check server version, based on '%s'",
-		$tmp['server_version']));
+    mysqli_close($link);
+    die(sprintf("skip Cannot check server version, based on '%s'",
+        $tmp['server_version']));
 }
 
 if ($version[0] <= 4 && $version[1] < 1) {
-	mysqli_close($link);
-	die(sprintf("skip Requires MySQL Server 4.1+\n"));
+    mysqli_close($link);
+    die(sprintf("skip Requires MySQL Server 4.1+\n"));
 }
 
 if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STORE_RESULT)) &&
-		(mysqli_num_rows($res) == 1)) ||
-		(($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin2"', MYSQLI_STORE_RESULT)) &&
-		(mysqli_num_rows($res) == 1))
-		) {
-	// ok, required latin1 or latin2 are available
-	mysqli_close($link);
+        (mysqli_num_rows($res) == 1)) ||
+        (($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin2"', MYSQLI_STORE_RESULT)) &&
+        (mysqli_num_rows($res) == 1))
+        ) {
+    // ok, required latin1 or latin2 are available
+    mysqli_close($link);
 } else {
-	die(sprintf("skip Requires character set latin1 or latin2\n"));
-	mysqli_close($link);
+    die(sprintf("skip Requires character set latin1 or latin2\n"));
+    mysqli_close($link);
 }
 ?>
 --FILE--
@@ -113,7 +113,7 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt
index d8272828097b4..e871d0ff3e593 100644
--- a/ext/mysqli/tests/mysqli_sqlstate.phpt
+++ b/ext/mysqli/tests/mysqli_sqlstate.phpt
@@ -29,7 +29,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 %s(5) "00000"
diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt
index 6ccfb4359df3d..2ad705bda45bf 100644
--- a/ext/mysqli/tests/mysqli_ssl_set.phpt
+++ b/ext/mysqli/tests/mysqli_ssl_set.phpt
@@ -5,7 +5,7 @@ mysqli_ssl_set() - test is a stub!
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_ssl_set'))
-	die("skip function not available");
+    die("skip function not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
index e3cf5dcbbc52c..de4f73bc18ce6 100644
--- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt
@@ -236,7 +236,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 [009] [%d] (error message varies with the MySQL Server version, check the error code)
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
index 5c246aaff8195..aea6c91ad00de 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt
@@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt_attr_get(): Argument #2 ($attr) must be one of MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH, MYSQLI_STMT_ATTR_PREFETCH_ROWS, or STMT_ATTR_CURSOR_TYPE
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
index 80956e854f61e..9ef46151f90c7 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt
@@ -22,7 +22,7 @@ die("SKIP: prefetch isn't supported at the moment");
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
index a22704af509bb..16d789f37f7fd 100644
--- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt
@@ -238,7 +238,7 @@ require_once("connect.inc");
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 Error: mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
index 9479d233a950c..75351b0983c8e 100644
--- a/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_big_prepare.phpt
@@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
index 9345bb5a0e619..237b722646750 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt
@@ -412,7 +412,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 The number of variables must match the number of parameters in the prepared statement
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
index e1e600229ca01..4db8db655ea32 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_call_user_func.phpt
@@ -325,7 +325,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 Regular, procedural, using variables
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
index 9b70f23639192..b3a4bfe223625 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt
@@ -63,7 +63,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Test 1:
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
index 38f25336250c7..b622f254d1ed5 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt
@@ -200,7 +200,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
index b69dfe686e73d..617e6e2cb0bad 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt
@@ -120,7 +120,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
index 99f2c8ef77122..5c4d43375de0d 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt
@@ -308,7 +308,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
index ecad1393531f5..f24c5856ed04e 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt
@@ -152,7 +152,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
index 05e75f7e23498..8ac3a049a16b8 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt
@@ -242,7 +242,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 plain vanilla...
diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
index a49d0d0ed994f..00dcae479cc1a 100644
--- a/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_bind_result_zerofill.phpt
@@ -90,7 +90,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt
index dd27da85ab188..ba0dcd7140d5a 100644
--- a/ext/mysqli/tests/mysqli_stmt_close.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_close.phpt
@@ -77,7 +77,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
index ffd5960c06bfa..a16aa631e4a6e 100644
--- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt
@@ -82,7 +82,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
index 2f18c6371fd73..14f1ebbe506ed 100644
--- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt
@@ -60,7 +60,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS type_change"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 mysqli_close($link);
 ?>
diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt
index b5d741cd6e062..b65770c444c63 100644
--- a/ext/mysqli/tests/mysqli_stmt_errno.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt
@@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is already closed
diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt
index c8012b3434b54..0bf93edaa972f 100644
--- a/ext/mysqli/tests/mysqli_stmt_error.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_error.phpt
@@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is already closed
diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt
index 1d1307e4b9551..a939a93d31e25 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt
@@ -5,10 +5,10 @@ mysqli_stmt_execute()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 40100) {
-	die(sprintf('skip Needs MySQL 4.1+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 4.1+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --FILE--
@@ -133,7 +133,7 @@ if (mysqli_get_server_version($link) <= 40100) {
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
index 33e6cd1c8b021..b26c16f98ae7c 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
@@ -6,10 +6,10 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) <= 50000) {
-	die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --FILE--
@@ -188,7 +188,7 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
    printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
-	printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+    printf("[c002] Cannot drop table, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
 @mysqli_query($link, 'DROP PROCEDURE IF EXISTS p');
 
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
index f322a1a76c36f..86a703c6412b9 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_next_result.phpt
@@ -6,10 +6,10 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) < 50503) {
-	die(sprintf('skip Needs MySQL 5.5.3+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.5.3+, found version %d.', mysqli_get_server_version($link)));
 }
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
index 7cbbc74988e9b..667268b3aa1ef 100644
--- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc_out.phpt
@@ -6,14 +6,14 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
+    die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
 }
 if (mysqli_get_server_version($link) < 50503) {
-	die(sprintf('skip Needs MySQL 5.5.3+, found version %d.', mysqli_get_server_version($link)));
+    die(sprintf('skip Needs MySQL 5.5.3+, found version %d.', mysqli_get_server_version($link)));
 }
 /*
 if ($IS_MYSQLND) {
-	die(sprintf("skip WHY ?!"));
+    die(sprintf("skip WHY ?!"));
 }
 */
 ?>
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
index b99a326323bd6..64b4862653ad3 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt
@@ -78,7 +78,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
index 87757dcaa9ab4..1e25a77a6b643 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_bit.phpt
@@ -2,13 +2,13 @@
 Fetching BIT column values using the PS API
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
-	require_once('connect.inc');
-	require_once('table.inc');
-	if (mysqli_get_server_version($link) < 50003)
-		// b'001' syntax not supported before 5.0.3
-		die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
+    require_once('connect.inc');
+    require_once('table.inc');
+    if (mysqli_get_server_version($link) < 50003)
+        // b'001' syntax not supported before 5.0.3
+        die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
 ?>
 --FILE--
 <?php
@@ -66,7 +66,7 @@ Fetching BIT column values using the PS API
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
index 086f4e08d8f18..073a48c228cc5 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt
@@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 OK: 1
diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
index 3d177d903ded4..432d72fe545b1 100644
--- a/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_fetch_geom.phpt
@@ -2,11 +2,11 @@
 mysqli_stmt_fetch - geometry / spatial types
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	if (!defined("MYSQLI_TYPE_GEOMETRY"))
-		die("skip MYSQLI_TYPE_GEOMETRY not defined");
+    if (!defined("MYSQLI_TYPE_GEOMETRY"))
+        die("skip MYSQLI_TYPE_GEOMETRY not defined");
 ?>
 --FILE--
 <?php
@@ -135,7 +135,7 @@ mysqli_stmt_fetch - geometry / spatial types
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt
index 939b3fcf5dc1a..4424248c48f2a 100644
--- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt
@@ -92,7 +92,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt
index 833970a8b5a23..867a8193d4160 100644
--- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt
@@ -72,7 +72,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
index ca0b1ed03682c..2dee92d9ae9d3 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
-	die('skip mysqli_stmt_get_result not available');
+    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -159,7 +159,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
index 2daa325b75762..99fabb89d8fdf 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt
@@ -5,7 +5,7 @@ mysqli_stmt_get_result()
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_stmt_get_result'))
-	die('skip mysqli_stmt_get_result not available');
+    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -141,7 +141,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 array(2) {
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
index c9e00a793d8ec..dace91f4c89e9 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
@@ -2,17 +2,17 @@
 Fetching BIT column values using the PS API
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	if (!function_exists('mysqli_stmt_get_result'))
-		die("skip mysqli_stmt_get_result() not available");
+    if (!function_exists('mysqli_stmt_get_result'))
+        die("skip mysqli_stmt_get_result() not available");
 
-	require_once('connect.inc');
-	require_once('table.inc');
-	if (mysqli_get_server_version($link) < 50003)
-		// b'001' syntax not supported before 5.0.3
-		die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
+    require_once('connect.inc');
+    require_once('table.inc');
+    if (mysqli_get_server_version($link) < 50003)
+        // b'001' syntax not supported before 5.0.3
+        die("skip Syntax used for test not supported with MySQL Server before 5.0.3");
 ?>
 --FILE--
 <?php
@@ -123,7 +123,7 @@ Fetching BIT column values using the PS API
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
index ec313f06aa479..300a1e3397ceb 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
@@ -2,11 +2,11 @@
 mysqli_stmt_get_result() - meta data, field_count()
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	if (!function_exists('mysqli_stmt_get_result'))
-		die('skip mysqli_stmt_get_result not available');
+    if (!function_exists('mysqli_stmt_get_result'))
+        die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -42,7 +42,7 @@ mysqli_stmt_get_result() - meta data, field_count()
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 2 2
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
index 51d2875c96476..2105a590d436c 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
@@ -2,14 +2,14 @@
 mysqli_stmt_get_result - geometry / spatial types
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	if (!function_exists('mysqli_stmt_get_result'))
-		die("skip mysqli_stmt_get_result() not available");
+    if (!function_exists('mysqli_stmt_get_result'))
+        die("skip mysqli_stmt_get_result() not available");
 
-	if (!defined("MYSQLI_TYPE_GEOMETRY"))
-		die("skip MYSQLI_TYPE_GEOMETRY not defined");
+    if (!defined("MYSQLI_TYPE_GEOMETRY"))
+        die("skip MYSQLI_TYPE_GEOMETRY not defined");
 ?>
 --FILE--
 <?php
@@ -137,7 +137,7 @@ mysqli_stmt_get_result - geometry / spatial types
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
index f3810019c4ce0..2fe305ed21ceb 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
-	die('skip mysqli_stmt_get_result not available');
+    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -226,7 +226,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 array(2) {
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
index 0db422c03082c..0c9f0dfe23e7a 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
-	die('skip mysqli_stmt_get_result not available');
+    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -62,7 +62,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 object(stdClass)#%d (13) {
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
index f86b7c6b79cde..f2428aeb92785 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
-	die('skip mysqli_stmt_get_result not available');
+    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -88,7 +88,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
index 8dacc30ce96c8..8c3d6e1e35d60 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!function_exists('mysqli_stmt_get_result'))
-	die('skip mysqli_stmt_get_result not available');
+    die('skip mysqli_stmt_get_result not available');
 ?>
 --FILE--
 <?php
@@ -128,7 +128,7 @@ if (!function_exists('mysqli_stmt_get_result'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_result::data_seek(): Argument #1 ($offset) must be greater than or equal to 0
diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
index 1c2e857775e21..b188ed1d844b1 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
@@ -2,11 +2,11 @@
 mysqli_stmt_get_result - data types
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	require_once('skipifconnectfailure.inc');
+    require_once('skipif.inc');
+    require_once('skipifconnectfailure.inc');
 
-	if (!function_exists('mysqli_stmt_get_result'))
-		die("skip mysqli_stmt_get_result() not available");
+    if (!function_exists('mysqli_stmt_get_result'))
+        die("skip mysqli_stmt_get_result() not available");
 ?>
 --FILE--
 <?php
@@ -250,7 +250,7 @@ mysqli_stmt_get_result - data types
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
index 7e6fe07a14c2c..3787a13386c07 100644
--- a/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_get_warnings.phpt
@@ -8,16 +8,16 @@ require_once('skipifconnectfailure.inc');
 require_once("connect.inc");
 
 if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
+    die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
+        $host, $user, $db, $port, $socket));
 }
 
 if (!mysqli_query($link, "DROP TABLE IF EXISTS test") ||
-	!mysqli_query($link, "CREATE TABLE test(id SMALLINT)"))
-	die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
+    !mysqli_query($link, "CREATE TABLE test(id SMALLINT)"))
+    die(sprintf("skip [%d] %s\n", $link->errno, $link->error));
 
 if (!@mysqli_query($link, "SET sql_mode=''") || !@mysqli_query($link, "INSERT INTO test(id) VALUES (100001)"))
-	die("skip Strict sql mode seems to be active. We won't get a warning to check for.");
+    die("skip Strict sql mode seems to be active. We won't get a warning to check for.");
 
 mysqli_query($link, "DROP TABLE IF EXISTS test");
 ?>
@@ -96,7 +96,7 @@ mysqli_query($link, "DROP TABLE IF EXISTS test");
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt
index 639c95944c3c5..22a21a64d27c1 100644
--- a/ext/mysqli/tests/mysqli_stmt_init.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_init.phpt
@@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
index 092c90c2a92a4..d49bd1b094324 100644
--- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt
@@ -66,7 +66,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_multires.phpt b/ext/mysqli/tests/mysqli_stmt_multires.phpt
index abb9ecbfb2797..73af79e2b166e 100644
--- a/ext/mysqli/tests/mysqli_stmt_multires.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_multires.phpt
@@ -94,10 +94,10 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("connect.inc");
-	if (!$link->query('DROP PROCEDURE IF EXISTS p123')) {
-		printf("[001] [%d] %s\n", $link->error, $link->errno);
-	}
+    require_once("connect.inc");
+    if (!$link->query('DROP PROCEDURE IF EXISTS p123')) {
+        printf("[001] [%d] %s\n", $link->error, $link->errno);
+    }
 ?>
 --EXPECT--
 string(4) "pre:"
diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
index f006b974eb53a..8b932dc053469 100644
--- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt
@@ -102,7 +102,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 run_tests.php don't fool me with your 'ungreedy' expression '.+?'!
diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
index 0d1fa5ca5560d..50886949359fe 100644
--- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt
@@ -53,7 +53,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt
index 14929a9051b68..36ce473f3da1d 100644
--- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt
@@ -39,7 +39,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is already closed
diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt
index 081a5f0855db6..933f0774bf0d7 100644
--- a/ext/mysqli/tests/mysqli_stmt_reset.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt
@@ -97,7 +97,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
index 0c77186efc9a3..250e93ed001ca 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt
@@ -86,7 +86,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
index 877bd0c713769..929e9df645d01 100644
--- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
@@ -225,7 +225,7 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
index b45098d298af0..b9139cb6e1979 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt
@@ -105,7 +105,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt_send_long_data(): Argument #2 ($param_nr) must be greater than or equal to 0
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
index c81e0c5d1a2d8..b191df602254b 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (stristr(mysqli_get_client_info(), 'mysqlnd'))
-	die("skip: test for libmysql");
+    die("skip: test for libmysql");
 ?>
 --FILE--
 <?php
@@ -91,7 +91,7 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd'))
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
index 64643d52f3008..c7376afdd3051 100644
--- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 
 if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
-	die("skip: warnings only available in mysqlnd");
+    die("skip: warnings only available in mysqlnd");
 ?>
 --FILE--
 <?php
@@ -96,7 +96,7 @@ Warning: mysqli_stmt_send_long_data(): There was an error while sending long dat
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 done!
diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
index 959a5f715410e..edad2b9c3f90c 100644
--- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt
@@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt
index e798ce8a3c433..d8f4c4769f78d 100644
--- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt
@@ -77,7 +77,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_stmt object is not fully initialized
diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt
index 7a0157106d057..8d4e72bdf9be2 100644
--- a/ext/mysqli/tests/mysqli_store_result.phpt
+++ b/ext/mysqli/tests/mysqli_store_result.phpt
@@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt
index 8e6cd1e6af805..f72d33cf25ec3 100644
--- a/ext/mysqli/tests/mysqli_thread_id.phpt
+++ b/ext/mysqli/tests/mysqli_thread_id.phpt
@@ -30,7 +30,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt
index ddbd734153eb0..a333891bba211 100644
--- a/ext/mysqli/tests/mysqli_use_result.phpt
+++ b/ext/mysqli/tests/mysqli_use_result.phpt
@@ -52,7 +52,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli_data_seek() cannot be used in MYSQLI_USE_RESULT mode
diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt
index 1c1df0ccdfe58..5ad0e10334917 100644
--- a/ext/mysqli/tests/mysqli_warning_count.phpt
+++ b/ext/mysqli/tests/mysqli_warning_count.phpt
@@ -35,7 +35,7 @@ require_once('skipifconnectfailure.inc');
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECT--
 mysqli object is already closed
diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
index 5e3758be961c1..e33bdb7d3a338 100644
--- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt
+++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt
@@ -6,7 +6,7 @@ require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 if (!$TEST_EXPERIMENTAL)
-	die("skip - experimental (= unsupported) feature");
+    die("skip - experimental (= unsupported) feature");
 ?>
 --FILE--
 <?php
@@ -34,7 +34,7 @@ if (!$TEST_EXPERIMENTAL)
 ?>
 --CLEAN--
 <?php
-	require_once("clean_table.inc");
+    require_once("clean_table.inc");
 ?>
 --EXPECTF--
 Fatal error: Trying to clone an uncloneable object of class mysqli_warning in %s on line %d
diff --git a/ext/oci8/tests/conn_attr_1.phpt b/ext/oci8/tests/conn_attr_1.phpt
index ce23b2b5aace5..bcfb1e8515a56 100644
--- a/ext/oci8/tests/conn_attr_1.phpt
+++ b/ext/oci8/tests/conn_attr_1.phpt
@@ -11,7 +11,7 @@ if ($test_drcp) die("skip output might vary with DRCP");
 
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) && $matches[1] >= 10)) {
-	die("skip expected output only valid when using Oracle 10g or greater database server");
+    die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 ?>
 --FILE--
diff --git a/ext/oci8/tests/conn_attr_2.phpt b/ext/oci8/tests/conn_attr_2.phpt
index 61d59093b150a..0005faa9a35f5 100644
--- a/ext/oci8/tests/conn_attr_2.phpt
+++ b/ext/oci8/tests/conn_attr_2.phpt
@@ -10,7 +10,7 @@ if ($test_drcp) die("skip output might vary with DRCP");
 
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) && $matches[1] >= 10)) {
-	die("skip expected output only valid when using Oracle 10g or greater database server");
+    die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 ?>
 --INI--
diff --git a/ext/oci8/tests/conn_attr_3.phpt b/ext/oci8/tests/conn_attr_3.phpt
index a116be0fab289..bcab76b80c2e4 100644
--- a/ext/oci8/tests/conn_attr_3.phpt
+++ b/ext/oci8/tests/conn_attr_3.phpt
@@ -10,7 +10,7 @@ if ($test_drcp) die("skip output might vary with DRCP");
 
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) && $matches[1] >= 10)) {
-	die("skip expected output only valid when using Oracle 10g or greater database server");
+    die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 ?>
 --FILE--
diff --git a/ext/oci8/tests/conn_attr_5.phpt b/ext/oci8/tests/conn_attr_5.phpt
index 4a58f917d3393..006b49ab1e341 100644
--- a/ext/oci8/tests/conn_attr_5.phpt
+++ b/ext/oci8/tests/conn_attr_5.phpt
@@ -10,7 +10,7 @@ if ($test_drcp) die("skip output might vary with DRCP");
 
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) && $matches[1] >= 10)) {
-	die("skip expected output only valid when using Oracle 10g or greater database server");
+    die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 ?>
 --FILE--
diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt
index 203fd57e92350..57d348082bd95 100644
--- a/ext/oci8/tests/connect_without_oracle_home.phpt
+++ b/ext/oci8/tests/connect_without_oracle_home.phpt
@@ -8,7 +8,7 @@ phpinfo(INFO_MODULES);
 $phpinfo = ob_get_clean();
 $ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
 if ($ov !== 1) {
-	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+    die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!isset($matches[0]) || !($matches[1] == 10 && $matches[2] == 2)) {
diff --git a/ext/oci8/tests/connect_without_oracle_home_11.phpt b/ext/oci8/tests/connect_without_oracle_home_11.phpt
index 85ac993877088..51e5ef38ac54a 100644
--- a/ext/oci8/tests/connect_without_oracle_home_11.phpt
+++ b/ext/oci8/tests/connect_without_oracle_home_11.phpt
@@ -8,7 +8,7 @@ phpinfo(INFO_MODULES);
 $phpinfo = ob_get_clean();
 $ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
 if ($ov != 1) {
-	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+    die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/oci8/tests/edition_1.phpt b/ext/oci8/tests/edition_1.phpt
index b75dfe4350f08..c013a687eb73a 100644
--- a/ext/oci8/tests/edition_1.phpt
+++ b/ext/oci8/tests/edition_1.phpt
@@ -15,7 +15,7 @@ if (!(isset($matches[0]) &&
       (($matches[1] == 11 && $matches[2] >= 2) ||
        ($matches[1] >= 12)
        ))) {
-       	die("skip expected output only valid when using Oracle 11gR2 or greater database server");
+        die("skip expected output only valid when using Oracle 11gR2 or greater database server");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt
index a556fb4a17d8b..4aab1c36bca01 100644
--- a/ext/oci8/tests/edition_2.phpt
+++ b/ext/oci8/tests/edition_2.phpt
@@ -13,7 +13,7 @@ if (!(isset($matches[0]) &&
       (($matches[1] == 11 && $matches[2] >= 2) ||
        ($matches[1] >= 12)
        ))) {
-       	die("skip expected output only valid when using Oracle 11gR2 or greater database server");
+        die("skip expected output only valid when using Oracle 11gR2 or greater database server");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt
index 8c7acd471feaa..cdc79b1057bf3 100644
--- a/ext/oci8/tests/password_new.phpt
+++ b/ext/oci8/tests/password_new.phpt
@@ -16,7 +16,7 @@ if (!(isset($matches_sv[0]) && isset($matches[0])
        && $matches_sv[3] == $matches[3]
        && $matches_sv[4] == $matches[4])) {
            // Avoid diffs due to cross version protocol changes (e.g. like 11.2.0.2-11.2.0.3) and bugs like Oracle bug: 6277160
-       	   die ("skip test only runs when database client libraries and database server are the same version");
+           die ("skip test only runs when database client libraries and database server are the same version");
 }
 
 // This test in Oracle 12c needs a non-CDB or the root container
diff --git a/ext/oci8/tests/pecl_bug16035.phpt b/ext/oci8/tests/pecl_bug16035.phpt
index 2fdef268317ed..37e725a9b7d03 100644
--- a/ext/oci8/tests/pecl_bug16035.phpt
+++ b/ext/oci8/tests/pecl_bug16035.phpt
@@ -8,7 +8,7 @@ phpinfo(INFO_MODULES);
 $phpinfo = ob_get_clean();
 $ov = preg_match('/Compile-time ORACLE_HOME/', $phpinfo);
 if ($ov !== 1) {
-	die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
+    die ("skip Test only valid when OCI8 is built with an ORACLE_HOME");
 }
 ?>
 --ENV--
diff --git a/ext/oci8/tests/refcur_prefetch_1.phpt b/ext/oci8/tests/refcur_prefetch_1.phpt
index 0297401f995dc..5f8fe821d40a6 100644
--- a/ext/oci8/tests/refcur_prefetch_1.phpt
+++ b/ext/oci8/tests/refcur_prefetch_1.phpt
@@ -7,7 +7,7 @@ require(__DIR__."/connect.inc");
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) &&
       ($matches[1] >= 10))) {
-       	die("skip expected output only valid when using Oracle 10g or greater database server");
+        die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/oci8/tests/refcur_prefetch_2.phpt b/ext/oci8/tests/refcur_prefetch_2.phpt
index 69146914a4bf7..de8197a5cb549 100644
--- a/ext/oci8/tests/refcur_prefetch_2.phpt
+++ b/ext/oci8/tests/refcur_prefetch_2.phpt
@@ -7,7 +7,7 @@ require(__DIR__."/connect.inc");
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) &&
       ($matches[1] >= 10))) {
-       	die("skip expected output only valid when using Oracle 10g or greater database server");
+        die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/oci8/tests/refcur_prefetch_3.phpt b/ext/oci8/tests/refcur_prefetch_3.phpt
index bfc2faf5bf097..719f765b4f440 100644
--- a/ext/oci8/tests/refcur_prefetch_3.phpt
+++ b/ext/oci8/tests/refcur_prefetch_3.phpt
@@ -11,7 +11,7 @@ if (!(isset($matches[0]) &&
       (($matches[1] == 11 && $matches[2] >= 2) ||
        ($matches[1] >= 12)
        ))) {
-       	die("skip expected output only valid when using Oracle 11gR2 or greater database server");
+        die("skip expected output only valid when using Oracle 11gR2 or greater database server");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/oci8/tests/refcur_prefetch_4.phpt b/ext/oci8/tests/refcur_prefetch_4.phpt
index 6c0b1b26d077e..64ccfbe166028 100644
--- a/ext/oci8/tests/refcur_prefetch_4.phpt
+++ b/ext/oci8/tests/refcur_prefetch_4.phpt
@@ -7,7 +7,7 @@ require(__DIR__."/connect.inc");
 preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches);
 if (!(isset($matches[0]) &&
       ($matches[1] >= 10))) {
-       	die("skip expected output only valid when using Oracle 10g or greater database server");
+        die("skip expected output only valid when using Oracle 10g or greater database server");
 }
 preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches);
 if (!(isset($matches[0]) &&
diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt
index 9d98d46b08c59..d453efb010bbd 100644
--- a/ext/odbc/tests/bug60616.phpt
+++ b/ext/odbc/tests/bug60616.phpt
@@ -3,9 +3,9 @@ odbc_exec(): Getting accurate unicode data from query
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 <?php
-	if ("unixODBC" != ODBC_TYPE) {
-		die("skip ODBC_TYPE != unixODBC");
-	}
+    if ("unixODBC" != ODBC_TYPE) {
+        die("skip ODBC_TYPE != unixODBC");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/odbc/tests/odbc_data_source_001.phpt b/ext/odbc/tests/odbc_data_source_001.phpt
index 0d7de96f12a60..d92a44252b6f4 100644
--- a/ext/odbc/tests/odbc_data_source_001.phpt
+++ b/ext/odbc/tests/odbc_data_source_001.phpt
@@ -2,10 +2,10 @@
 odbc_data_source(): Basic test
 --SKIPIF--
 <?php
-	include 'skipif.inc';
-	if (odbc_data_source($conn, SQL_FETCH_FIRST) === NULL) {
-		die("skip no data sources defined on this system");
-	}
+    include 'skipif.inc';
+    if (odbc_data_source($conn, SQL_FETCH_FIRST) === NULL) {
+        die("skip no data sources defined on this system");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index b288bcd2d0e4a..95a2f56f80f6a 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -3,9 +3,9 @@ odbc_exec(): Basic test
 --SKIPIF--
 <?php include 'skipif.inc'; ?>
 <?php
-	if ("unixODBC" != ODBC_TYPE) {
-		die("skip ODBC_TYPE != unixODBC");
-	}
+    if ("unixODBC" != ODBC_TYPE) {
+        die("skip ODBC_TYPE != unixODBC");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/opcache/tests/bug78185.phpt b/ext/opcache/tests/bug78185.phpt
index 120f2b61090b8..56c0ae5586f3b 100644
--- a/ext/opcache/tests/bug78185.phpt
+++ b/ext/opcache/tests/bug78185.phpt
@@ -22,17 +22,17 @@ foreach (glob($pattern) as $p) {
 --CLEAN--
 <?php
 if (substr(PHP_OS, 0, 3) !== 'WIN') {
-	$pattern = __DIR__ . '/*/' . __DIR__ . '/*78185.php.bin';
+    $pattern = __DIR__ . '/*/' . __DIR__ . '/*78185.php.bin';
 } else {
-	$pattern = __DIR__ . '/*/*/' . str_replace(':', '', __DIR__) . '/*78185.php.bin';
+    $pattern = __DIR__ . '/*/*/' . str_replace(':', '', __DIR__) . '/*78185.php.bin';
 }
 foreach (glob($pattern) as $p) {
-	unlink($p);
-	$p = dirname($p);
-	while(strlen($p) > strlen(__DIR__)) {
-		rmdir($p);
-		$p = dirname($p);
-	}
+    unlink($p);
+    $p = dirname($p);
+    while(strlen($p) > strlen(__DIR__)) {
+        rmdir($p);
+        $p = dirname($p);
+    }
 }
 ?>
 --EXPECTF--
diff --git a/ext/openssl/tests/openssl_decrypt_ccm.phpt b/ext/openssl/tests/openssl_decrypt_ccm.phpt
index 87b6d4b26465f..067cde083bf21 100644
--- a/ext/openssl/tests/openssl_decrypt_ccm.phpt
+++ b/ext/openssl/tests/openssl_decrypt_ccm.phpt
@@ -3,9 +3,9 @@ openssl_decrypt() with CCM cipher algorithm tests
 --SKIPIF--
 <?php
 if (!extension_loaded("openssl"))
-	die("skip");
+    die("skip");
 if (!in_array('aes-256-ccm', openssl_get_cipher_methods()))
-	die("skip: aes-256-ccm not available");
+    die("skip: aes-256-ccm not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_decrypt_gcm.phpt b/ext/openssl/tests/openssl_decrypt_gcm.phpt
index 5c243a8fad343..223c9e72c4df9 100644
--- a/ext/openssl/tests/openssl_decrypt_gcm.phpt
+++ b/ext/openssl/tests/openssl_decrypt_gcm.phpt
@@ -3,9 +3,9 @@ openssl_decrypt() with GCM cipher algorithm tests
 --SKIPIF--
 <?php
 if (!extension_loaded("openssl"))
-	die("skip");
+    die("skip");
 if (!in_array('aes-128-gcm', openssl_get_cipher_methods()))
-	die("skip: aes-128-gcm not available");
+    die("skip: aes-128-gcm not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_encrypt_gcm.phpt b/ext/openssl/tests/openssl_encrypt_gcm.phpt
index e2be510980768..2b4a31b0f4cff 100644
--- a/ext/openssl/tests/openssl_encrypt_gcm.phpt
+++ b/ext/openssl/tests/openssl_encrypt_gcm.phpt
@@ -3,9 +3,9 @@ openssl_encrypt() with GCM cipher algorithm tests
 --SKIPIF--
 <?php
 if (!extension_loaded("openssl"))
-	die("skip");
+    die("skip");
 if (!in_array('aes-128-gcm', openssl_get_cipher_methods()))
-	die("skip: aes-128-gcm not available");
+    die("skip: aes-128-gcm not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/openssl/tests/openssl_error_string_basic.phpt b/ext/openssl/tests/openssl_error_string_basic.phpt
index 12875392f40a3..b55b7ced44919 100644
--- a/ext/openssl/tests/openssl_error_string_basic.phpt
+++ b/ext/openssl/tests/openssl_error_string_basic.phpt
@@ -154,7 +154,7 @@ expect_openssl_errors('openssl_csr_get_subjec pem', [$err_pem_no_start_line]);
 <?php
 $output_file =  __DIR__ . "/openssl_error_string_basic_output.tmp";
 if (is_file($output_file)) {
-	unlink($output_file);
+    unlink($output_file);
 }
 ?>
 --EXPECT--
diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
index 43d51753a01a2..e7ee13caf6da6 100644
--- a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt
@@ -40,7 +40,7 @@ try {
 <?php
 $pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
 if (file_exists($pkcsfile)) {
-	unlink($pkcsfile);
+    unlink($pkcsfile);
 }
 ?>
 --EXPECTF--
diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
index 92d7f2789ebc7..f65822e535d39 100644
--- a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
+++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt
@@ -23,7 +23,7 @@ var_dump(openssl_pkcs12_export_to_file($cert, '.', $priv, $pass));
 <?php
 $pkcsfile = __DIR__ . "/openssl_pkcs12_export_to_file__pkcsfile.tmp";
 if (file_exists($pkcsfile)) {
-	unlink($pkcsfile);
+    unlink($pkcsfile);
 }
 ?>
 --EXPECTF--
diff --git a/ext/pcntl/tests/001.phpt b/ext/pcntl/tests/001.phpt
index cdfdb0733f9e9..16601cdb51c1f 100644
--- a/ext/pcntl/tests/001.phpt
+++ b/ext/pcntl/tests/001.phpt
@@ -2,8 +2,8 @@
 Test pcntl wait functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip";
-	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
+    if (!extension_loaded("pcntl")) print "skip";
+    elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
     if (PHP_OS == "Darwin") {
         die("skip do not run on darwin");
     }
diff --git a/ext/pcntl/tests/002.phpt b/ext/pcntl/tests/002.phpt
index f93039f41220a..68b264309268a 100644
--- a/ext/pcntl/tests/002.phpt
+++ b/ext/pcntl/tests/002.phpt
@@ -2,11 +2,11 @@
 pcntl: pcntl_sigprocmask(), pcntl_sigwaitinfo(), pcntl_sigtimedwait()
 --SKIPIF--
 <?php
-	if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
-	elseif (!extension_loaded('posix')) die('skip posix extension not available');
-	elseif (!function_exists('pcntl_sigwaitinfo') or !function_exists('pcntl_sigtimedwait')) die('skip required functionality is not available');
-	elseif (!defined('CLD_EXITED')) die('skip CLD_EXITED not defined');
-	elseif (getenv('SKIP_ASAN')) die('skip Fails intermittently under asan/msan');
+    if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
+    elseif (!extension_loaded('posix')) die('skip posix extension not available');
+    elseif (!function_exists('pcntl_sigwaitinfo') or !function_exists('pcntl_sigtimedwait')) die('skip required functionality is not available');
+    elseif (!defined('CLD_EXITED')) die('skip CLD_EXITED not defined');
+    elseif (getenv('SKIP_ASAN')) die('skip Fails intermittently under asan/msan');
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/003.phpt b/ext/pcntl/tests/003.phpt
index 012277d25578e..ebc0bc88e296e 100644
--- a/ext/pcntl/tests/003.phpt
+++ b/ext/pcntl/tests/003.phpt
@@ -2,9 +2,9 @@
 pcntl: SIG_BLOCK, SIG_UNBLOCK, SIG_SETMASK
 --SKIPIF--
 <?php
-	if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
-	elseif (!extension_loaded('posix')) die('skip posix extension not available');
-	elseif (!function_exists('pcntl_sigwaitinfo') or !function_exists('pcntl_sigtimedwait')) die('skip required functionality is not available');
+    if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
+    elseif (!extension_loaded('posix')) die('skip posix extension not available');
+    elseif (!function_exists('pcntl_sigwaitinfo') or !function_exists('pcntl_sigtimedwait')) die('skip required functionality is not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/async_signals.phpt b/ext/pcntl/tests/async_signals.phpt
index 8e30204ab43d3..1b27bfdb6c1c1 100644
--- a/ext/pcntl/tests/async_signals.phpt
+++ b/ext/pcntl/tests/async_signals.phpt
@@ -2,10 +2,10 @@
 Asynchronous signal handling through VM interrupts
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip";
-	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
-	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
-	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
+    if (!extension_loaded("pcntl")) print "skip";
+    elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
+    elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
+    elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/bug73783.phpt b/ext/pcntl/tests/bug73783.phpt
index cf28868086ec0..ada3ba1e1c2f7 100644
--- a/ext/pcntl/tests/bug73783.phpt
+++ b/ext/pcntl/tests/bug73783.phpt
@@ -2,8 +2,8 @@
 Bug #73783: (SIG_IGN needs to be set to prevent syscals from returning early)
 --SKIPIF--
 <?php
-	if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
-	elseif (!extension_loaded('posix')) die('skip posix extension not available');
+    if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
+    elseif (!extension_loaded('posix')) die('skip posix extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_fork_basic.phpt b/ext/pcntl/tests/pcntl_fork_basic.phpt
index 3509e14a7fa2b..41c9e4d5ae59d 100644
--- a/ext/pcntl/tests/pcntl_fork_basic.phpt
+++ b/ext/pcntl/tests/pcntl_fork_basic.phpt
@@ -6,8 +6,8 @@ Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
-	elseif (!extension_loaded('posix')) die('skip posix extension not available');
+    if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
+    elseif (!extension_loaded('posix')) die('skip posix extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_fork_variation.phpt b/ext/pcntl/tests/pcntl_fork_variation.phpt
index 4a83966533417..4a00d18b1c2c6 100644
--- a/ext/pcntl/tests/pcntl_fork_variation.phpt
+++ b/ext/pcntl/tests/pcntl_fork_variation.phpt
@@ -6,8 +6,8 @@ Francesco Fullone ff@ideato.it
 #PHPTestFest Cesena Italia on 2009-06-20
 --SKIPIF--
 <?php
-	if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
-	elseif (!extension_loaded('posix')) die('skip posix extension not available');
+    if (!extension_loaded('pcntl')) die('skip pcntl extension not available');
+    elseif (!extension_loaded('posix')) die('skip posix extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_get_last_error.phpt b/ext/pcntl/tests/pcntl_get_last_error.phpt
index f1a517051c4b3..e2c9c9543bffd 100644
--- a/ext/pcntl/tests/pcntl_get_last_error.phpt
+++ b/ext/pcntl/tests/pcntl_get_last_error.phpt
@@ -2,7 +2,7 @@
 Test pcntl_get_last_error()
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip";
+    if (!extension_loaded("pcntl")) print "skip";
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/pcntl_signal_dispatch.phpt b/ext/pcntl/tests/pcntl_signal_dispatch.phpt
index c64910fb36850..b3cbe3ace942b 100644
--- a/ext/pcntl/tests/pcntl_signal_dispatch.phpt
+++ b/ext/pcntl/tests/pcntl_signal_dispatch.phpt
@@ -2,11 +2,11 @@
 pcnt_signal_dispatch()
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip";
-	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
-	elseif (!function_exists("pcntl_signal_dispatch")) print "skip pcntl_signal_dispatch() not available";
-	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
-	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
+    if (!extension_loaded("pcntl")) print "skip";
+    elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
+    elseif (!function_exists("pcntl_signal_dispatch")) print "skip pcntl_signal_dispatch() not available";
+    elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
+    elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
 ?>
 --FILE--
 <?php
diff --git a/ext/pcntl/tests/signal_closure_handler.phpt b/ext/pcntl/tests/signal_closure_handler.phpt
index 0df0061caa575..ebaf84b5521d4 100644
--- a/ext/pcntl/tests/signal_closure_handler.phpt
+++ b/ext/pcntl/tests/signal_closure_handler.phpt
@@ -2,10 +2,10 @@
 Closures as a signal handler
 --SKIPIF--
 <?php
-	if (!extension_loaded("pcntl")) print "skip";
-	elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
-	elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
-	elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
+    if (!extension_loaded("pcntl")) print "skip";
+    elseif (!function_exists("pcntl_signal")) print "skip pcntl_signal() not available";
+    elseif (!function_exists("posix_kill")) print "skip posix_kill() not available";
+    elseif (!function_exists("posix_getpid")) print "skip posix_getpid() not available";
 ?>
 --FILE--
 <?php
diff --git a/ext/pcre/tests/007.phpt b/ext/pcre/tests/007.phpt
index bc213ad0e09eb..d2bfb7ee6fada 100644
--- a/ext/pcre/tests/007.phpt
+++ b/ext/pcre/tests/007.phpt
@@ -3,7 +3,7 @@ preg_replace_callback() with callback that modifies subject string
 --SKIPIF--
 <?php
 if (@preg_match('/./u', '') === false) {
-	die('skip no utf8 support in PCRE library');
+    die('skip no utf8 support in PCRE library');
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/backtrack_limit.phpt b/ext/pcre/tests/backtrack_limit.phpt
index 3f0d8e64468a0..3b6f7786a2c50 100644
--- a/ext/pcre/tests/backtrack_limit.phpt
+++ b/ext/pcre/tests/backtrack_limit.phpt
@@ -3,7 +3,7 @@ Backtracking limit
 --SKIPIF--
 <?php
 if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
-	die("skip no support for \p support PCRE library");
+    die("skip no support for \p support PCRE library");
 }
 ?>
 --INI--
diff --git a/ext/pcre/tests/bug27103.phpt b/ext/pcre/tests/bug27103.phpt
index 0b706010a04f2..9ba70f7a64428 100644
--- a/ext/pcre/tests/bug27103.phpt
+++ b/ext/pcre/tests/bug27103.phpt
@@ -3,7 +3,7 @@ Bug #27103 (preg_split('//u') incorrectly splits UTF-8 strings into octets)
 --SKIPIF--
 <?php
 if (@preg_match('/./u', '') === false) {
-	die('skip no utf8 support in PCRE library');
+    die('skip no utf8 support in PCRE library');
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/bug72463.phpt b/ext/pcre/tests/bug72463.phpt
index b40a721998398..156b692ab0f84 100644
--- a/ext/pcre/tests/bug72463.phpt
+++ b/ext/pcre/tests/bug72463.phpt
@@ -3,7 +3,7 @@ Bug #72463 mail fails with invalid argument
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == "WIN") {
-	die('skip not for windows');
+    die('skip not for windows');
 }
 ?>
 --INI--
diff --git a/ext/pcre/tests/bug72463_2.phpt b/ext/pcre/tests/bug72463_2.phpt
index 1baeb0f2a1154..3cc87b47ac5a4 100644
--- a/ext/pcre/tests/bug72463_2.phpt
+++ b/ext/pcre/tests/bug72463_2.phpt
@@ -3,7 +3,7 @@ Bug #72463 mail fails with invalid argument
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN") {
-	die('skip windows only');
+    die('skip windows only');
 }
 ?>
 --INI--
diff --git a/ext/pcre/tests/bug76850.phpt b/ext/pcre/tests/bug76850.phpt
index 50c62ad1b335c..acceb2da7185b 100644
--- a/ext/pcre/tests/bug76850.phpt
+++ b/ext/pcre/tests/bug76850.phpt
@@ -2,10 +2,10 @@
 Bug #76850 Exit code mangled by set locale/preg_match
 --SKIPIF--
 <?php
-	$l = setlocale(LC_CTYPE, 0);
-	if ("C" == $l) {
-		die("skip need the current locale to be other than C");
-	}
+    $l = setlocale(LC_CTYPE, 0);
+    if ("C" == $l) {
+        die("skip need the current locale to be other than C");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/pcre/tests/bug76909.phpt b/ext/pcre/tests/bug76909.phpt
index 5109bed3a705a..b2f22381c5228 100644
--- a/ext/pcre/tests/bug76909.phpt
+++ b/ext/pcre/tests/bug76909.phpt
@@ -3,7 +3,7 @@ Bug #76909 preg_match difference between 7.3 and < 7.3
 --SKIPIF--
 <?php
 if(!ini_get("pcre.jit")) {
-	echo "skip JIT is disabled";
+    echo "skip JIT is disabled";
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/bug77193.phpt b/ext/pcre/tests/bug77193.phpt
index 4fdb603b8591a..ddceb6141fefd 100644
--- a/ext/pcre/tests/bug77193.phpt
+++ b/ext/pcre/tests/bug77193.phpt
@@ -2,9 +2,9 @@
 Bug #77193 Infinite loop in preg_replace_callback
 --SKIPIF--
 <?php
-	if (!extension_loaded("filter")) {
-		die("skip need filter extension");
-	}
+    if (!extension_loaded("filter")) {
+        die("skip need filter extension");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/pcre/tests/check_jit_enabled.phpt b/ext/pcre/tests/check_jit_enabled.phpt
index de6e263e7018a..9cd249ea924f5 100644
--- a/ext/pcre/tests/check_jit_enabled.phpt
+++ b/ext/pcre/tests/check_jit_enabled.phpt
@@ -3,7 +3,7 @@ Check for JIT enablement status
 --SKIPIF--
 <?php
 if (ini_get("pcre.jit") === FALSE) {
-	die("skip no jit built");
+    die("skip no jit built");
 }
 --FILE--
 <?php
diff --git a/ext/pcre/tests/errors04.phpt b/ext/pcre/tests/errors04.phpt
index 340b08409872d..9e784deee802d 100644
--- a/ext/pcre/tests/errors04.phpt
+++ b/ext/pcre/tests/errors04.phpt
@@ -3,7 +3,7 @@ Test preg_match_all() function : error conditions - Backtracking limit
 --SKIPIF--
 <?php
 if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
-	die("skip no support for \p support PCRE library");
+    die("skip no support for \p support PCRE library");
 }
 ?>
 --INI--
diff --git a/ext/pcre/tests/errors05.phpt b/ext/pcre/tests/errors05.phpt
index 13fabc4f30f4c..dc60c24938e51 100644
--- a/ext/pcre/tests/errors05.phpt
+++ b/ext/pcre/tests/errors05.phpt
@@ -3,7 +3,7 @@ Test preg_match() function : error conditions - jit stacklimit exhausted
 --SKIPIF--
 <?php
 if (ini_get('pcre.jit') === false) {
-	die("skip no jit built");
+    die("skip no jit built");
 }
 ?>
 --INI--
diff --git a/ext/pcre/tests/invalid_utf8.phpt b/ext/pcre/tests/invalid_utf8.phpt
index f24042a3bdf12..1a5124daaac3b 100644
--- a/ext/pcre/tests/invalid_utf8.phpt
+++ b/ext/pcre/tests/invalid_utf8.phpt
@@ -3,7 +3,7 @@ preg_replace() and invalid UTF8
 --SKIPIF--
 <?php
 if (@preg_match('/./u', '') === false) {
-	die('skip no utf8 support in PCRE library');
+    die('skip no utf8 support in PCRE library');
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/invalid_utf8_offset.phpt b/ext/pcre/tests/invalid_utf8_offset.phpt
index 2b9e7fa239b16..311a6d73d6682 100644
--- a/ext/pcre/tests/invalid_utf8_offset.phpt
+++ b/ext/pcre/tests/invalid_utf8_offset.phpt
@@ -3,7 +3,7 @@ preg_replace() and invalid UTF8 offset
 --SKIPIF--
 <?php
 if (@preg_match('/./u', '') === false) {
-	die('skip no utf8 support in PCRE library');
+    die('skip no utf8 support in PCRE library');
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/pcre_anchored.phpt b/ext/pcre/tests/pcre_anchored.phpt
index c03d13501a7e4..7852cd6d62ff7 100644
--- a/ext/pcre/tests/pcre_anchored.phpt
+++ b/ext/pcre/tests/pcre_anchored.phpt
@@ -3,7 +3,7 @@ A (PCRE_ANCHORED) modifier
 --SKIPIF--
 <?php
 if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
-	die("skip no support for \p support PCRE library");
+    die("skip no support for \p support PCRE library");
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/preg_match_error3.phpt b/ext/pcre/tests/preg_match_error3.phpt
index 8b9d59fc58bd7..cf9c29a112cec 100644
--- a/ext/pcre/tests/preg_match_error3.phpt
+++ b/ext/pcre/tests/preg_match_error3.phpt
@@ -3,7 +3,7 @@ Test preg_match() function : error conditions - jit stacklimit exhausted
 --SKIPIF--
 <?php
 if (ini_get("pcre.jit") === FALSE) {
-	die("skip no jit built");
+    die("skip no jit built");
 }
 ?>
 --INI--
diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt
index ac88e876e698c..e38c4788cb997 100644
--- a/ext/pcre/tests/preg_replace2.phpt
+++ b/ext/pcre/tests/preg_replace2.phpt
@@ -3,7 +3,7 @@ preg_replace()
 --SKIPIF--
 <?php
 if (@preg_match('/./u', '') === false) {
-	die('skip no utf8 support in PCRE library');
+    die('skip no utf8 support in PCRE library');
 }
 ?>
 --FILE--
diff --git a/ext/pcre/tests/recursion_limit.phpt b/ext/pcre/tests/recursion_limit.phpt
index 294931388d6fc..5d08f1771bc27 100644
--- a/ext/pcre/tests/recursion_limit.phpt
+++ b/ext/pcre/tests/recursion_limit.phpt
@@ -3,7 +3,7 @@ PCRE Recursion limit
 --SKIPIF--
 <?php
 if (@preg_match_all('/\p{N}/', '0123456789', $dummy) === false) {
-	die("skip no support for \p support PCRE library");
+    die("skip no support for \p support PCRE library");
 }
 ?>
 --INI--
diff --git a/ext/pdo/tests/bug_44159.phpt b/ext/pdo/tests/bug_44159.phpt
index 5f23f910eb6ec..0e1116d58863e 100644
--- a/ext/pdo/tests/bug_44159.phpt
+++ b/ext/pdo/tests/bug_44159.phpt
@@ -4,9 +4,9 @@ PDO Common: Bug #44159 (Crash: $pdo->setAttribute(PDO::STATEMENT_ATTR_CLASS, NUL
 <?php
 if (!extension_loaded('pdo')) die('skip PDO not available');
 try {
-	$pdo = new PDO("sqlite:".__DIR__."/foo.db");
+    $pdo = new PDO("sqlite:".__DIR__."/foo.db");
 } catch (Exception $e) {
-	die("skip PDP_SQLITE not available");
+    die("skip PDP_SQLITE not available");
 }
 ?>
 --FILE--
diff --git a/ext/pdo/tests/bug_44861.phpt b/ext/pdo/tests/bug_44861.phpt
index 6ca5b175636b6..73c2675c1a333 100644
--- a/ext/pdo/tests/bug_44861.phpt
+++ b/ext/pdo/tests/bug_44861.phpt
@@ -8,12 +8,12 @@ if (false == $dir) die('skip no driver');
 $allowed = array('oci', 'pgsql');
 $ok = false;
 foreach ($allowed as $driver) {
-	if (!strncasecmp(getenv('PDOTEST_DSN'), $driver, strlen($driver))) {
-		$ok = true;
-	}
+    if (!strncasecmp(getenv('PDOTEST_DSN'), $driver, strlen($driver))) {
+        $ok = true;
+    }
 }
 if (!$ok) {
-	die("skip Scrollable cursors not supported");
+    die("skip Scrollable cursors not supported");
 }
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
diff --git a/ext/pdo/tests/bug_47769.phpt b/ext/pdo/tests/bug_47769.phpt
index 2c308d9113213..daac15574a85d 100644
--- a/ext/pdo/tests/bug_47769.phpt
+++ b/ext/pdo/tests/bug_47769.phpt
@@ -3,7 +3,7 @@ PDO Common: Bug #47769 (Strange extends PDO)
 --SKIPIF--
 <?php
 if (!extension_loaded("pdo_sqlite"))
-	die("skip: PDO_SQLite not available");
+    die("skip: PDO_SQLite not available");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo/tests/pdo_017.phpt b/ext/pdo/tests/pdo_017.phpt
index f06ebbdc435fd..cdbcf6a22a565 100644
--- a/ext/pdo/tests/pdo_017.phpt
+++ b/ext/pdo/tests/pdo_017.phpt
@@ -16,10 +16,10 @@ try {
 }
 
 if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
-	require_once(__DIR__ . DIRECTORY_SEPARATOR . '../../pdo_mysql/tests/mysql_pdo_test.inc');
-	if (false === MySQLPDOTest::detect_transactional_mysql_engine($db)) {
-		die('skip your mysql configuration does not support working transactions');
-	}
+    require_once(__DIR__ . DIRECTORY_SEPARATOR . '../../pdo_mysql/tests/mysql_pdo_test.inc');
+    if (false === MySQLPDOTest::detect_transactional_mysql_engine($db)) {
+        die('skip your mysql configuration does not support working transactions');
+    }
 }
 ?>
 --FILE--
diff --git a/ext/pdo/tests/pdo_dsn_containing_credentials.phpt b/ext/pdo/tests/pdo_dsn_containing_credentials.phpt
index 7c67bc32273a4..e3d530ba49ee5 100644
--- a/ext/pdo/tests/pdo_dsn_containing_credentials.phpt
+++ b/ext/pdo/tests/pdo_dsn_containing_credentials.phpt
@@ -8,7 +8,7 @@ if (false == $dir) die('skip no driver');
 
 $driver = substr(getenv('PDOTEST_DSN'), 0, strpos(getenv('PDOTEST_DSN'), ':'));
 if (!in_array($driver, array('mssql','sybase','dblib','firebird','mysql','oci')))
-	die('skip not supported');
+    die('skip not supported');
 
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
diff --git a/ext/pdo_mysql/tests/bug_39858.phpt b/ext/pdo_mysql/tests/bug_39858.phpt
index 9328c0f20d22e..e33415eb675a9 100644
--- a/ext/pdo_mysql/tests/bug_39858.phpt
+++ b/ext/pdo_mysql/tests/bug_39858.phpt
@@ -11,12 +11,12 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 50000)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --XFAIL--
 nextRowset() problem with stored proc & emulation mode & mysqlnd
diff --git a/ext/pdo_mysql/tests/bug_41125.phpt b/ext/pdo_mysql/tests/bug_41125.phpt
index c86cad2b51063..e7db01c8e3218 100644
--- a/ext/pdo_mysql/tests/bug_41125.phpt
+++ b/ext/pdo_mysql/tests/bug_41125.phpt
@@ -10,13 +10,13 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 die("skip $version");
 if ($version < 40100)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_41997.phpt b/ext/pdo_mysql/tests/bug_41997.phpt
index def3d4406dc2c..7ce2e810d43ee 100644
--- a/ext/pdo_mysql/tests/bug_41997.phpt
+++ b/ext/pdo_mysql/tests/bug_41997.phpt
@@ -12,12 +12,12 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 50000)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_42499.phpt b/ext/pdo_mysql/tests/bug_42499.phpt
index 4ad38eeca28ce..7824448c07254 100644
--- a/ext/pdo_mysql/tests/bug_42499.phpt
+++ b/ext/pdo_mysql/tests/bug_42499.phpt
@@ -13,12 +13,12 @@ $stmt = $db->query('SELECT VERSION() as _version');
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 41000)
-	die(sprintf("skip Need MySQL Server 4.1.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 4.1.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 --FILE--
 <?php
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
diff --git a/ext/pdo_mysql/tests/bug_44707.phpt b/ext/pdo_mysql/tests/bug_44707.phpt
index 6bd7114431977..8767cee2616f3 100644
--- a/ext/pdo_mysql/tests/bug_44707.phpt
+++ b/ext/pdo_mysql/tests/bug_44707.phpt
@@ -13,12 +13,12 @@ $stmt = $db->query('SELECT VERSION() as _version');
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 41000)
-	die(sprintf("skip Will work different with MySQL Server < 4.1.0, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Will work different with MySQL Server < 4.1.0, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_61411.phpt b/ext/pdo_mysql/tests/bug_61411.phpt
index 920dc4e06718b..9390e2abffb98 100644
--- a/ext/pdo_mysql/tests/bug_61411.phpt
+++ b/ext/pdo_mysql/tests/bug_61411.phpt
@@ -11,12 +11,12 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 40106)
-	die(sprintf("skip Need MySQL Server 4.1.6+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 4.1.6+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/bug_pecl_7976.phpt b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
index 00446edc470ba..13d4d1b519263 100644
--- a/ext/pdo_mysql/tests/bug_pecl_7976.phpt
+++ b/ext/pdo_mysql/tests/bug_pecl_7976.phpt
@@ -11,12 +11,12 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 50000)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
index 985179b84c54d..3c3b41ad286a9 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_ini.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 /* TODO - fix this limitation */
 if (getenv('PDO_MYSQL_TEST_DSN') !== "mysql:dbname=phptest;unix_socket=/tmp/mysql.sock")
-	die("skip Fix test to run in other environments as well!");
+    die("skip Fix test to run in other environments as well!");
 ?>
 --INI--
 pdo.dsn.mysql="mysql:dbname=phptest;socket=/tmp/mysql.sock"
diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
index 99754c9058307..1838336050a36 100644
--- a/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql___construct_options_libmysql.phpt
@@ -6,7 +6,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (MySQLPDOTest::isPDOMySQLnd())
-	die("skip libmysql only options")
+    die("skip libmysql only options")
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt b/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
index 1337c1ac95df9..73e657fff922b 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_attr_max_buffer_size.phpt
@@ -6,7 +6,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (MySQLPDOTest::isPDOMySQLnd())
-	die("skip PDO::MYSQL_ATTR_MAX_BUFFER_SIZE not supported with mysqlnd");
+    die("skip PDO::MYSQL_ATTR_MAX_BUFFER_SIZE not supported with mysqlnd");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
index 2fc60f9fc2f6b..fb550b1aa2d33 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_begintransaction.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
+    die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
index 9e53f18154bcf..1ff37cc3cc737 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_bit.phpt
@@ -6,7 +6,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (MySQLPDOTest::isPDOMySQLnd())
-	die("skip Known bug - mysqlnd handles BIT incorrectly!");
+    die("skip Known bug - mysqlnd handles BIT incorrectly!");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
index 7ab189fedf8e3..8fcce4cc8454f 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
@@ -4,9 +4,9 @@ PDO MySQL specific class constants
 <?php
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) {
-	/* Need connection to detect library version */
-	require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
-	MySQLPDOTest::skip();
+    /* Need connection to detect library version */
+    require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+    MySQLPDOTest::skip();
 }
 ?>
 --FILE--
diff --git a/ext/pdo_mysql/tests/pdo_mysql_commit.phpt b/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
index 9dec5700b6dd3..506be6475f35c 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_commit.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
+    die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
index 4e3f40d369769..b3069eaf008f3 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
@@ -12,19 +12,19 @@ $stmt = $db->query('SELECT USER() as _user');
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 $tmp = explode('@', $row['_user']);
 if (count($tmp) < 2)
-	die("skip Cannot detect if test is run against local or remote database server");
+    die("skip Cannot detect if test is run against local or remote database server");
 if (($tmp[1] !== 'localhost') && ($tmp[1] !== '127.0.0.1'))
-	die("skip Test cannot be run against remote database server");
+    die("skip Test cannot be run against remote database server");
 
 $stmt = $db->query("SHOW VARIABLES LIKE 'secure_file_priv'");
 if (($row = $stmt->fetch(PDO::FETCH_ASSOC)) && ($row['value'] != '')) {
-	if (!is_writable($row['value']))
-		die("skip secure_file_priv directory not writable: {$row['value']}");
+    if (!is_writable($row['value']))
+        die("skip secure_file_priv directory not writable: {$row['value']}");
 
-	$filename = $row['value'] . DIRECTORY_SEPARATOR  . "pdo_mysql_exec_load_data.csv";
+    $filename = $row['value'] . DIRECTORY_SEPARATOR  . "pdo_mysql_exec_load_data.csv";
 
-	if (file_exists($filename) && !is_writable($filename))
-		die("skip {$filename} not writable");
+    if (file_exists($filename) && !is_writable($filename))
+        die("skip {$filename} not writable");
 }
 
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt b/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt
index 386dfb1e1eb44..80c6a23db8239 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_get_attribute.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
+    die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_interface.phpt b/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
index 4ba236f2a4d3a..e3ca7caa1b6b6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
+    die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
index 1f1e6d9668c15..4c9f60ea1190d 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_default_off.phpt
@@ -6,7 +6,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!MYSQLPDOTest::isPDOMySQLnd())
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt b/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
index 13df9024a230d..06da4a5ed7797 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_local_infile_set_on.phpt
@@ -6,7 +6,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 if (!MYSQLPDOTest::isPDOMySQLnd())
-	die("skip mysqlnd only test");
+    die("skip mysqlnd only test");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
index 368f588cfde0b..a1f1644cf3687 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_multi_stmt_nextrowset.phpt
@@ -9,15 +9,15 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 50000)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 
 if (!MySQLPDOTest::isPDOMySQLnd())
-	die("skip This will not work with libmysql");
+    die("skip This will not work with libmysql");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt b/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt
index c76a7460c9ce2..62214541d71fc 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_prepare_load_data.phpt
@@ -12,9 +12,9 @@ $stmt = $db->query('SELECT USER() as _user');
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 $tmp = explode('@', $row['_user']);
 if (count($tmp) < 2)
-	die("skip Cannot detect if test is run against local or remote database server");
+    die("skip Cannot detect if test is run against local or remote database server");
 if (($tmp[1] !== 'localhost') && ($tmp[1] !== '127.0.0.1'))
-	die("skip Test cannot be run against remote database server");
+    die("skip Test cannot be run against remote database server");
 
 $stmt = $db->query("SHOW VARIABLES LIKE 'secure_file_priv'");
 if (($row = $stmt->fetch(PDO::FETCH_ASSOC)) && ($row['value'] != '')) {
diff --git a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
index 96e77a1326af6..d27aefc6be46a 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_rollback.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
-	die("skip Transactional engine not found");
+    die("skip Transactional engine not found");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
index 9d6ee3d9b8d99..7556bf7e6fb33 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_blobfromsteam.phpt
@@ -8,21 +8,21 @@ MySQLPDOTest::skip();
 
 $tmp = MySQLPDOTest::getTempDir();
 if (!$tmp)
-	die("skip Can't create temporary file");
+    die("skip Can't create temporary file");
 
 $file = $tmp . DIRECTORY_SEPARATOR . 'pdoblob.tst';
 $fp = fopen($file, 'w');
 if (!$fp)
-	die("skip Can't create temporary file");
+    die("skip Can't create temporary file");
 
 if (4 != fwrite($fp, 'test')) {
-	die("skip Can't create temporary file");
+    die("skip Can't create temporary file");
 }
 fclose($fp);
 clearstatcache();
 
 if (!file_exists($file))
-	die("skip Can't create temporary file");
+    die("skip Can't create temporary file");
 
 unlink($file);
 ?>
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
index 31ee2a3e07341..8e9e60b99e3a6 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_fetchobject.phpt
@@ -8,14 +8,14 @@ MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 
 try {
-	$query = "SELECT '', NULL, \"\" FROM DUAL";
-	$stmt = $db->prepare($query);
-	$ok = @$stmt->execute();
+    $query = "SELECT '', NULL, \"\" FROM DUAL";
+    $stmt = $db->prepare($query);
+    $ok = @$stmt->execute();
 } catch (PDOException $e) {
-	die("skip: Test cannot be run with SQL mode ANSI");
+    die("skip: Test cannot be run with SQL mode ANSI");
 }
 if (!$ok)
-	die("skip: Test cannot be run with SQL mode ANSI");
+    die("skip: Test cannot be run with SQL mode ANSI");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
index 3526b35c24611..44f0a0ebb18d2 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_getcolumnmeta.phpt
@@ -11,7 +11,7 @@ $stmt = $db->query('SELECT VERSION() as _version');
 $row = $stmt->fetch(PDO::FETCH_ASSOC);
 $version = ((int)substr($row['_version'], 0, 1) * 10) + (int)substr($row['_version'], 2, 1);
 if ($version < 51)
-	die("skip Test needs MySQL 5.1+");
+    die("skip Test needs MySQL 5.1+");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
index e473d6716ec56..c8f188a738908 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_nextrowset.phpt
@@ -11,15 +11,15 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 50000)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 
 if (!MySQLPDOTest::isPDOMySQLnd())
-	die("skip This will not work with libmysql");
+    die("skip This will not work with libmysql");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
index 13f4f5769a2b8..683c6e0bbee07 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_unbuffered_2050.phpt
@@ -7,7 +7,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (MYSQLPDOTest::isPDOMySQLnd())
-	die("skip libmysql only test");
+    die("skip libmysql only test");
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
index 21fd83f57d779..1c492dfc061cc 100644
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
@@ -12,12 +12,12 @@ $db = MySQLPDOTest::factory();
 $row = $db->query('SELECT VERSION() as _version')->fetch(PDO::FETCH_ASSOC);
 $matches = array();
 if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
-	die(sprintf("skip Cannot determine MySQL Server version\n"));
+    die(sprintf("skip Cannot determine MySQL Server version\n"));
 
 $version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
 if ($version < 50000)
-	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
-		$matches[1], $matches[2], $matches[3], $version));
+    die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
+        $matches[1], $matches[2], $matches[3], $version));
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_odbc/tests/common.phpt b/ext/pdo_odbc/tests/common.phpt
index 5606ad4b86bc9..d3be88d3aad30 100644
--- a/ext/pdo_odbc/tests/common.phpt
+++ b/ext/pdo_odbc/tests/common.phpt
@@ -4,10 +4,10 @@ ODBC
 <?php
 if (!extension_loaded('pdo_odbc')) print 'skip';
 if (substr(PHP_OS, 0, 3) == 'WIN' &&
-	false === getenv('PDOTEST_DSN') &&
-	false === getenv('PDO_ODBC_TEST_DSN') &&
-	!extension_loaded('com_dotnet')) {
-	die('skip - either PDOTEST_DSN or com_dotnet extension is needed to setup the connection');
+    false === getenv('PDOTEST_DSN') &&
+    false === getenv('PDO_ODBC_TEST_DSN') &&
+    !extension_loaded('com_dotnet')) {
+    die('skip - either PDOTEST_DSN or com_dotnet extension is needed to setup the connection');
 }
 --REDIRECTTEST--
 # magic auto-configuration
diff --git a/ext/pdo_pgsql/tests/bug62479.phpt b/ext/pdo_pgsql/tests/bug62479.phpt
index 3e78098d0c8a9..afe8978ec34b2 100644
--- a/ext/pdo_pgsql/tests/bug62479.phpt
+++ b/ext/pdo_pgsql/tests/bug62479.phpt
@@ -19,17 +19,17 @@ $pass = 'testpass';
 
 // Assume that if we can't create or drop a user, this test needs to be skipped
 try {
-	$db->exec("DROP USER IF EXISTS $user");
-	$db->exec("CREATE USER $user WITH PASSWORD '$pass'");
+    $db->exec("DROP USER IF EXISTS $user");
+    $db->exec("CREATE USER $user WITH PASSWORD '$pass'");
 } catch (PDOException $e) {
-	die("skip You need CREATEUSER permissions to run the test");
+    die("skip You need CREATEUSER permissions to run the test");
 }
 
 // Peer authentication might prevent the test from properly running
 try {
-	$testConn = new PDO($dsn, $user, $pass);
+    $testConn = new PDO($dsn, $user, $pass);
 } catch (PDOException $e) {
-	echo "skip ".$e->getMessage();
+    echo "skip ".$e->getMessage();
 }
 
 $db->exec("DROP USER $user");
diff --git a/ext/pdo_pgsql/tests/bug68199.phpt b/ext/pdo_pgsql/tests/bug68199.phpt
index 0c79faeeb963a..25a200365a1a4 100644
--- a/ext/pdo_pgsql/tests/bug68199.phpt
+++ b/ext/pdo_pgsql/tests/bug68199.phpt
@@ -9,7 +9,7 @@ PDOTest::skip();
 
 $db = PDOTest::factory();
 if (version_compare($db->getAttribute(PDO::ATTR_SERVER_VERSION), '9.0.0') < 0) {
-	die("skip Requires 9.0+");
+    die("skip Requires 9.0+");
 }
 
 ?>
diff --git a/ext/pdo_pgsql/tests/bug69362.phpt b/ext/pdo_pgsql/tests/bug69362.phpt
index 1fd4e80e7d669..c1ed7e615f485 100644
--- a/ext/pdo_pgsql/tests/bug69362.phpt
+++ b/ext/pdo_pgsql/tests/bug69362.phpt
@@ -19,17 +19,17 @@ $pass = 'testpass';
 
 // Assume that if we can't create or drop a user, this test needs to be skipped
 try {
-	$db->exec("DROP USER IF EXISTS $user");
-	$db->exec("CREATE USER $user WITH PASSWORD '$pass'");
+    $db->exec("DROP USER IF EXISTS $user");
+    $db->exec("CREATE USER $user WITH PASSWORD '$pass'");
 } catch (PDOException $e) {
-	die("skip You need CREATEUSER permissions to run the test");
+    die("skip You need CREATEUSER permissions to run the test");
 }
 
 // Peer authentication might prevent the test from properly running
 try {
-	$testConn = new PDO($dsn, $user, $pass);
+    $testConn = new PDO($dsn, $user, $pass);
 } catch (PDOException $e) {
-	echo "skip ".$e->getMessage();
+    echo "skip ".$e->getMessage();
 }
 
 $db->exec("DROP USER $user");
diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt
index 0023f9103158c..aca253f7b717a 100644
--- a/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt
+++ b/ext/pdo_sqlite/tests/pdo_sqlite_open_flags.phpt
@@ -20,7 +20,7 @@ var_dump($db->exec('CREATE TABLE test2 (id INT);'));
 <?php
 $filename = __DIR__ . DIRECTORY_SEPARATOR . "pdo_sqlite_open_flags.db";
 if (file_exists($filename)) {
-	unlink($filename);
+    unlink($filename);
 }
 ?>
 --EXPECTF--
diff --git a/ext/phar/tests/024-opcache-win32.phpt b/ext/phar/tests/024-opcache-win32.phpt
index b9d80929cc8b0..7887a24072325 100644
--- a/ext/phar/tests/024-opcache-win32.phpt
+++ b/ext/phar/tests/024-opcache-win32.phpt
@@ -5,8 +5,8 @@ Phar: phar:// include with Opcache
 <?php if (!extension_loaded("phar")) die("skip"); ?>
 <?php if (!extension_loaded('Zend OPcache')) die('skip Zend OPcache extension not available'); ?>
 <?php
-	$cache_dir = dirname(__FILE__) . "/024-file_cache";
-	if (!is_dir($cache_dir) && !mkdir($cache_dir)) die("skip unable to create file_cache dir");
+    $cache_dir = dirname(__FILE__) . "/024-file_cache";
+    if (!is_dir($cache_dir) && !mkdir($cache_dir)) die("skip unable to create file_cache dir");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/bug77022.phpt b/ext/phar/tests/bug77022.phpt
index c287bb339f09b..40d908f1eeb01 100644
--- a/ext/phar/tests/bug77022.phpt
+++ b/ext/phar/tests/bug77022.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar: Bug #77022: PharData always creates new files with mode 0666
 --SKIPIF--
-<?php 
-if (!extension_loaded("phar")) die("skip"); 
+<?php
+if (!extension_loaded("phar")) die("skip");
 if (defined("PHP_WINDOWS_VERSION_MAJOR")) die("skip not for Windows")
 ?>
 --FILE--
diff --git a/ext/phar/tests/bug79082.phpt b/ext/phar/tests/bug79082.phpt
index 9ced140b28f91..512c4fb95c48c 100644
--- a/ext/phar/tests/bug79082.phpt
+++ b/ext/phar/tests/bug79082.phpt
@@ -1,8 +1,8 @@
 --TEST--
 Phar: Bug #79082: Files added to tar with Phar::buildFromIterator have all-access permissions
 --SKIPIF--
-<?php 
-if (!extension_loaded("phar")) die("skip"); 
+<?php
+if (!extension_loaded("phar")) die("skip");
 if (defined("PHP_WINDOWS_VERSION_MAJOR")) die("skip not for Windows")
 ?>
 --FILE--
diff --git a/ext/phar/tests/phar_buildfromdirectory2-win.phpt b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
index e67d03638805e..99d1ee7a060b3 100644
--- a/ext/phar/tests/phar_buildfromdirectory2-win.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2-win.phpt
@@ -2,8 +2,8 @@
 Phar::buildFromDirectory() - non-directory passed as first parameter
 --SKIPIF--
 <?php
-	if (!extension_loaded("phar")) die("skip");
-	if (substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only test");
+    if (!extension_loaded("phar")) die("skip");
+    if (substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only test");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt
index d02d6146d64cb..0d25a60afad5e 100644
--- a/ext/phar/tests/phar_buildfromdirectory2.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory2.phpt
@@ -2,8 +2,8 @@
 Phar::buildFromDirectory() - non-directory passed as first parameter
 --SKIPIF--
 <?php
-	if (!extension_loaded("phar")) die("skip");
-	if (substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
+    if (!extension_loaded("phar")) die("skip");
+    if (substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
 ?>
 --INI--
 phar.require_hash=0
diff --git a/ext/posix/tests/posix_ctermid.phpt b/ext/posix/tests/posix_ctermid.phpt
index 1d277659c49ec..b6e064801439f 100644
--- a/ext/posix/tests/posix_ctermid.phpt
+++ b/ext/posix/tests/posix_ctermid.phpt
@@ -8,7 +8,7 @@ Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) {
+    if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
     // needed because of #ifdef HAVE_CTERMID in posix.c
diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt
index e630ea852e946..ec8222832f3e7 100644
--- a/ext/posix/tests/posix_getgrgid_basic.phpt
+++ b/ext/posix/tests/posix_getgrgid_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getgrgid() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getgrgid_error.phpt b/ext/posix/tests/posix_getgrgid_error.phpt
index bac9f4f6100ba..46314f9aa43f2 100644
--- a/ext/posix/tests/posix_getgrgid_error.phpt
+++ b/ext/posix/tests/posix_getgrgid_error.phpt
@@ -2,7 +2,7 @@
 Test posix_getgrgid() function : error conditions
 --SKIPIF--
 <?php
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
+    if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getgrnam_basic.phpt b/ext/posix/tests/posix_getgrnam_basic.phpt
index 2408c62850c0c..c75a24c4ebb82 100644
--- a/ext/posix/tests/posix_getgrnam_basic.phpt
+++ b/ext/posix/tests/posix_getgrnam_basic.phpt
@@ -2,8 +2,8 @@
 Test posix_getgrnam() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
-	if (!posix_getgroups()) die('skip - groups unavailable (ci)');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!posix_getgroups()) die('skip - groups unavailable (ci)');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt
index 7a877d7663ba3..e6e00fd6b17dc 100644
--- a/ext/posix/tests/posix_getgroups_basic.phpt
+++ b/ext/posix/tests/posix_getgroups_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getgroups() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getpgid_basic.phpt b/ext/posix/tests/posix_getpgid_basic.phpt
index 57efab7c3fbd8..ec4e59052fb13 100644
--- a/ext/posix/tests/posix_getpgid_basic.phpt
+++ b/ext/posix/tests/posix_getpgid_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getpgid() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getpgid_error.phpt b/ext/posix/tests/posix_getpgid_error.phpt
index d6f0512ab40de..e7e3ec4207375 100644
--- a/ext/posix/tests/posix_getpgid_error.phpt
+++ b/ext/posix/tests/posix_getpgid_error.phpt
@@ -3,7 +3,7 @@ Test posix_getpgid() function : error conditions
 --SKIPIF--
 <?php
 if((!extension_loaded("posix")) || (!function_exists("posix_getpgid"))) {
-	 print "skip - POSIX extension not loaded or posix_getpgid() does not exist";
+     print "skip - POSIX extension not loaded or posix_getpgid() does not exist";
 }
 ?>
 --FILE--
diff --git a/ext/posix/tests/posix_getpgrp_basic.phpt b/ext/posix/tests/posix_getpgrp_basic.phpt
index ceb78bb700bfc..84da54d56307d 100644
--- a/ext/posix/tests/posix_getpgrp_basic.phpt
+++ b/ext/posix/tests/posix_getpgrp_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getpgrp() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getpid_basic.phpt b/ext/posix/tests/posix_getpid_basic.phpt
index a52895946dda2..1a49e948768ab 100644
--- a/ext/posix/tests/posix_getpid_basic.phpt
+++ b/ext/posix/tests/posix_getpid_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getpid() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getppid_basic.phpt b/ext/posix/tests/posix_getppid_basic.phpt
index 2fc4ff43ae611..96790ed77ecac 100644
--- a/ext/posix/tests/posix_getppid_basic.phpt
+++ b/ext/posix/tests/posix_getppid_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getppid() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getpwnam_basic_01.phpt b/ext/posix/tests/posix_getpwnam_basic_01.phpt
index e45b6fa95dfdd..9a7b473eccb65 100644
--- a/ext/posix/tests/posix_getpwnam_basic_01.phpt
+++ b/ext/posix/tests/posix_getpwnam_basic_01.phpt
@@ -5,7 +5,7 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com>
 User Group: PHPSP #phptestfestbrasil
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getpwuid_basic.phpt b/ext/posix/tests/posix_getpwuid_basic.phpt
index a604ce36cf8e9..76aa2989cc2a9 100644
--- a/ext/posix/tests/posix_getpwuid_basic.phpt
+++ b/ext/posix/tests/posix_getpwuid_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getpwuid() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getpwuid_error.phpt b/ext/posix/tests/posix_getpwuid_error.phpt
index b45b32ccac06a..15bd93b80d222 100644
--- a/ext/posix/tests/posix_getpwuid_error.phpt
+++ b/ext/posix/tests/posix_getpwuid_error.phpt
@@ -2,7 +2,7 @@
 Test posix_getpwuid() function : error conditions
 --SKIPIF--
 <?php
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
+    if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getsid.phpt b/ext/posix/tests/posix_getsid.phpt
index c538f61d7e395..0f99daf49e516 100644
--- a/ext/posix/tests/posix_getsid.phpt
+++ b/ext/posix/tests/posix_getsid.phpt
@@ -8,7 +8,7 @@ Moritz Neuhaeuser, info@xcompile.net
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
 <?php
-	if(!extension_loaded("posix")) print "SKIP - POSIX extension not loaded";
+    if(!extension_loaded("posix")) print "SKIP - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getsid_basic.phpt b/ext/posix/tests/posix_getsid_basic.phpt
index 758ec6055dab8..8726adbb27bc1 100644
--- a/ext/posix/tests/posix_getsid_basic.phpt
+++ b/ext/posix/tests/posix_getsid_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_getsid() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt
index 08080230aa549..afd4eb844b189 100644
--- a/ext/posix/tests/posix_getsid_error.phpt
+++ b/ext/posix/tests/posix_getsid_error.phpt
@@ -7,7 +7,7 @@ Moritz Neuhaeuser, info@xcompile.net
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
 <?php
-	if(!extension_loaded("posix")) {
+    if(!extension_loaded("posix")) {
         die("SKIP - POSIX extension not loaded");
     }
 ?>
diff --git a/ext/posix/tests/posix_kill_error.phpt b/ext/posix/tests/posix_kill_error.phpt
index e378fa241f8ff..9f0ca0b158a50 100644
--- a/ext/posix/tests/posix_kill_error.phpt
+++ b/ext/posix/tests/posix_kill_error.phpt
@@ -2,7 +2,7 @@
 Test posix_kill() function : error conditions
 --SKIPIF--
 <?php
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
+    if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_strerror_error.phpt b/ext/posix/tests/posix_strerror_error.phpt
index 1c3775a3238f4..bdbe867b9f101 100644
--- a/ext/posix/tests/posix_strerror_error.phpt
+++ b/ext/posix/tests/posix_strerror_error.phpt
@@ -2,7 +2,7 @@
 Test posix_strerror() function : error conditions
 --SKIPIF--
 <?php
-	if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
+    if(!extension_loaded("posix")) print "skip - POSIX extension not loaded";
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_times.phpt b/ext/posix/tests/posix_times.phpt
index 4f069b2d8d540..a6bf93dba8539 100644
--- a/ext/posix/tests/posix_times.phpt
+++ b/ext/posix/tests/posix_times.phpt
@@ -8,7 +8,7 @@ Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) {
+    if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
 ?>
diff --git a/ext/posix/tests/posix_times_basic.phpt b/ext/posix/tests/posix_times_basic.phpt
index 49da6b8aebd05..fd06320b0c2b4 100644
--- a/ext/posix/tests/posix_times_basic.phpt
+++ b/ext/posix/tests/posix_times_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_times() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/posix/tests/posix_ttyname.phpt b/ext/posix/tests/posix_ttyname.phpt
index c63fe27ec975e..874077897c678 100644
--- a/ext/posix/tests/posix_ttyname.phpt
+++ b/ext/posix/tests/posix_ttyname.phpt
@@ -8,7 +8,7 @@ Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) {
+    if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
 ?>
diff --git a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
index 98488f68d19fc..9d070d8ec313d 100644
--- a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
+++ b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt
@@ -9,10 +9,10 @@ Falko Menge, mail at falko-menge dot de
 PHP Testfest Berlin 2009-05-10
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) {
+    if (!extension_loaded('posix')) {
         die('SKIP - POSIX extension not available');
     }
-	if (!extension_loaded('standard')) {
+    if (!extension_loaded('standard')) {
         die('SKIP - Standard extension not available');
     }
 ?>
diff --git a/ext/posix/tests/posix_uname_basic.phpt b/ext/posix/tests/posix_uname_basic.phpt
index 49c2cf5609184..4133b745a4493 100644
--- a/ext/posix/tests/posix_uname_basic.phpt
+++ b/ext/posix/tests/posix_uname_basic.phpt
@@ -2,7 +2,7 @@
 Test posix_uname() function : basic functionality
 --SKIPIF--
 <?php
-	if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
+    if (!extension_loaded('posix')) die('skip - POSIX extension not loaded');
 ?>
 --FILE--
 <?php
diff --git a/ext/pspell/tests/001.phpt b/ext/pspell/tests/001.phpt
index 000671cf8fb1d..64d97fff88c7c 100644
--- a/ext/pspell/tests/001.phpt
+++ b/ext/pspell/tests/001.phpt
@@ -4,7 +4,7 @@ pspell basic tests (warning: may fail with pspell/aspell < GNU Aspell 0.50.3)
 <?php
 if (!extension_loaded("pspell")) die("skip");
 if (!@pspell_new ("en", "", "", "", (PSPELL_FAST|PSPELL_RUN_TOGETHER))) {
-	die("skip English dictionary is not available");
+    die("skip English dictionary is not available");
 }
 ?>
 --FILE--
diff --git a/ext/readline/tests/libedit_info_001-win32.phpt b/ext/readline/tests/libedit_info_001-win32.phpt
index d14c7a2f46265..3a558b11eb662 100644
--- a/ext/readline/tests/libedit_info_001-win32.phpt
+++ b/ext/readline/tests/libedit_info_001-win32.phpt
@@ -4,7 +4,7 @@ readline_info(): Basic test
 <?php if (!extension_loaded("readline")) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/readline/tests/libedit_info_001.phpt b/ext/readline/tests/libedit_info_001.phpt
index 4c77e7a97c0c3..46618120fba8a 100644
--- a/ext/readline/tests/libedit_info_001.phpt
+++ b/ext/readline/tests/libedit_info_001.phpt
@@ -4,7 +4,7 @@ readline_info(): Basic test
 <?php if (!extension_loaded("readline")) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-	die('skip not for windows');
+    die('skip not for windows');
 }
 ?>
 --FILE--
diff --git a/ext/readline/tests/libedit_write_history_001-win32.phpt b/ext/readline/tests/libedit_write_history_001-win32.phpt
index 28af4cbfddc53..6cc94bd1294f5 100644
--- a/ext/readline/tests/libedit_write_history_001-win32.phpt
+++ b/ext/readline/tests/libedit_write_history_001-win32.phpt
@@ -4,7 +4,7 @@ readline_write_history(): Basic test
 <?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/readline/tests/libedit_write_history_001.phpt b/ext/readline/tests/libedit_write_history_001.phpt
index 14c3282e6d173..96424e232f6b9 100644
--- a/ext/readline/tests/libedit_write_history_001.phpt
+++ b/ext/readline/tests/libedit_write_history_001.phpt
@@ -4,7 +4,7 @@ readline_write_history(): Basic test
 <?php if (!extension_loaded("readline") || !function_exists('readline_add_history')) die("skip");
 if (READLINE_LIB != "libedit") die("skip libedit only");
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-	die('skip not for windows');
+    die('skip not for windows');
 }
 ?>
 --FILE--
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
index 8a1951062ff29..e4546bdb78fbe 100644
--- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001.phpt
@@ -33,14 +33,14 @@ var_dump($rcB->getStaticPropertyValue("publicOverridden"));
 
 echo "\nRetrieving non-existent values from A with no default value:\n";
 try {
-	var_dump($rcA->getStaticPropertyValue("protectedDoesNotExist"));
+    var_dump($rcA->getStaticPropertyValue("protectedDoesNotExist"));
     echo "you should not see this";
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-	var_dump($rcA->getStaticPropertyValue("privateDoesNotExist"));
+    var_dump($rcA->getStaticPropertyValue("privateDoesNotExist"));
     echo "you should not see this";
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt
index 1414cfadb7a3a..2c855a0436747 100644
--- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt
+++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001.phpt
@@ -35,14 +35,14 @@ print_r($rcB->getStaticProperties());
 
 echo "\nSet non-existent values from A with no default value:\n";
 try {
-	var_dump($rcA->setStaticPropertyValue("protectedDoesNotExist", "new value 8"));
+    var_dump($rcA->setStaticPropertyValue("protectedDoesNotExist", "new value 8"));
     echo "you should not see this";
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
 }
 
 try {
-	var_dump($rcA->setStaticPropertyValue("privateDoesNotExist", "new value 9"));
+    var_dump($rcA->setStaticPropertyValue("privateDoesNotExist", "new value 9"));
     echo "you should not see this";
 } catch (Exception $e) {
     echo $e->getMessage() . "\n";
diff --git a/ext/session/tests/bug42596.phpt b/ext/session/tests/bug42596.phpt
index 094bd31bcfd59..f27e86387e4fa 100644
--- a/ext/session/tests/bug42596.phpt
+++ b/ext/session/tests/bug42596.phpt
@@ -2,8 +2,8 @@
 Bug #42596 (session.save_path MODE option will not set "write" bit for group or world)
 --SKIPIF--
 <?php
-	if(substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
-	include('skipif.inc');
+    if(substr(PHP_OS, 0, 3) == "WIN") die("skip not for Windows");
+    include('skipif.inc');
 ?>
 --INI--
 session.use_cookies=0
diff --git a/ext/session/tests/session_save_path_variation5.phpt b/ext/session/tests/session_save_path_variation5.phpt
index 5388f82f45b7a..446a472ab4690 100644
--- a/ext/session/tests/session_save_path_variation5.phpt
+++ b/ext/session/tests/session_save_path_variation5.phpt
@@ -3,7 +3,7 @@ Test session_save_path() function : variation
 --SKIPIF--
 <?php include('skipif.inc');
 if(substr(PHP_OS, 0, 3) == "WIN")
-	die("skip Not for Windows");
+    die("skip Not for Windows");
 ?>
 --INI--
 session.save_handler=files
diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt
index 4cac82d2f0c8b..a0f85922eef8d 100644
--- a/ext/shmop/tests/001.phpt
+++ b/ext/shmop/tests/001.phpt
@@ -2,9 +2,9 @@
 shmop extension test
 --SKIPIF--
 <?php
-	if (!extension_loaded("shmop")) {
-		die("skip shmop() extension not available");
-	}
+    if (!extension_loaded("shmop")) {
+        die("skip shmop() extension not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/shmop/tests/002.phpt b/ext/shmop/tests/002.phpt
index 6b82fc27c0582..40bbdbff23f84 100644
--- a/ext/shmop/tests/002.phpt
+++ b/ext/shmop/tests/002.phpt
@@ -4,9 +4,9 @@ shmop extension error messages
 edgarsandi - <edgar.r.sandi@gmail.com>
 --SKIPIF--
 <?php
-	if (!extension_loaded("shmop")) {
-		die("skip shmop() extension not available");
-	}
+    if (!extension_loaded("shmop")) {
+        die("skip shmop() extension not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/simplexml/tests/011.phpt b/ext/simplexml/tests/011.phpt
index 06f3e791c3cb9..b283fc741364f 100644
--- a/ext/simplexml/tests/011.phpt
+++ b/ext/simplexml/tests/011.phpt
@@ -2,7 +2,7 @@
 SimpleXML: echo/print
 --SKIPIF--
 <?php
-	if (!extension_loaded('simplexml')) print 'skip';
+    if (!extension_loaded('simplexml')) print 'skip';
 ?>
 --FILE--
 <?php
diff --git a/ext/simplexml/tests/012.phpt b/ext/simplexml/tests/012.phpt
index 307f8219cd70e..f1a3e1a9428d3 100644
--- a/ext/simplexml/tests/012.phpt
+++ b/ext/simplexml/tests/012.phpt
@@ -2,7 +2,7 @@
 SimpleXML: Attribute creation
 --SKIPIF--
 <?php
-	if (!extension_loaded('simplexml')) print 'skip';
+    if (!extension_loaded('simplexml')) print 'skip';
 ?>
 --FILE--
 <?php
diff --git a/ext/simplexml/tests/013.phpt b/ext/simplexml/tests/013.phpt
index 59e6672a1f9c3..509ed7fb68f1f 100644
--- a/ext/simplexml/tests/013.phpt
+++ b/ext/simplexml/tests/013.phpt
@@ -2,7 +2,7 @@
 SimpleXML: Split text content
 --SKIPIF--
 <?php
-	if (!extension_loaded('simplexml')) print 'skip';
+    if (!extension_loaded('simplexml')) print 'skip';
 ?>
 --FILE--
 <?php
diff --git a/ext/skeleton/tests/001.phpt b/ext/skeleton/tests/001.phpt
index f03f8a01be35a..db06b6e09ae92 100644
--- a/ext/skeleton/tests/001.phpt
+++ b/ext/skeleton/tests/001.phpt
@@ -3,7 +3,7 @@ Check if %EXTNAME% is loaded
 --SKIPIF--
 <?php
 if (!extension_loaded('%EXTNAME%')) {
-	echo 'skip';
+    echo 'skip';
 }
 ?>
 --FILE--
diff --git a/ext/skeleton/tests/002.phpt b/ext/skeleton/tests/002.phpt
index dcbdd8f2b28b1..6b42a28db3d6e 100644
--- a/ext/skeleton/tests/002.phpt
+++ b/ext/skeleton/tests/002.phpt
@@ -3,7 +3,7 @@ test1() Basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('%EXTNAME%')) {
-	echo 'skip';
+    echo 'skip';
 }
 ?>
 --FILE--
diff --git a/ext/skeleton/tests/003.phpt b/ext/skeleton/tests/003.phpt
index 84c9fe160204a..0aca2155b5548 100644
--- a/ext/skeleton/tests/003.phpt
+++ b/ext/skeleton/tests/003.phpt
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 if (!extension_loaded('%EXTNAME%')) {
-	echo 'skip';
+    echo 'skip';
 }
 ?>
 --FILE--
diff --git a/ext/snmp/tests/bug64124.phpt b/ext/snmp/tests/bug64124.phpt
index 9dac2c9e1bba4..5ad75353db86b 100644
--- a/ext/snmp/tests/bug64124.phpt
+++ b/ext/snmp/tests/bug64124.phpt
@@ -8,7 +8,7 @@ require_once(__DIR__.'/skipif.inc');
 
 $packed = str_repeat(chr(0), 15) . chr(1);
 if (@inet_ntop($packed) === false) {
-	die("skip no IPv6 support");
+    die("skip no IPv6 support");
 }
 ?>
 --FILE--
diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt
index 38bf7ffcb60c4..a4ae028e42e9b 100644
--- a/ext/snmp/tests/ipv6.phpt
+++ b/ext/snmp/tests/ipv6.phpt
@@ -8,7 +8,7 @@ require_once(__DIR__.'/skipif.inc');
 
 $packed = str_repeat(chr(0), 15) . chr(1);
 if (@inet_ntop($packed) === false) {
-	die("skip no IPv6 support");
+    die("skip no IPv6 support");
 }
 ?>
 --FILE--
diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt
index d835f2a2805f7..4e7293286244e 100644
--- a/ext/soap/tests/bug73037.phpt
+++ b/ext/soap/tests/bug73037.phpt
@@ -4,14 +4,14 @@ Bug #73037 SoapServer reports Bad Request when gzipped, var 0
 server
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	if (!extension_loaded("zlib")) {
-		echo "skip zlib is required for this test";
-	}
-
-	if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
-		echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
-	}
+    require_once('skipif.inc');
+    if (!extension_loaded("zlib")) {
+        echo "skip zlib is required for this test";
+    }
+
+    if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
+        echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/soap/tests/bug77088.phpt b/ext/soap/tests/bug77088.phpt
index 46d2e1d987074..b402ef889669c 100644
--- a/ext/soap/tests/bug77088.phpt
+++ b/ext/soap/tests/bug77088.phpt
@@ -2,7 +2,7 @@
 Bug #77088 (Segfault when using SoapClient with null options)
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
+    require_once('skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/soap/tests/custom_content_type.phpt b/ext/soap/tests/custom_content_type.phpt
index 7a92a766079db..17a074f102425 100644
--- a/ext/soap/tests/custom_content_type.phpt
+++ b/ext/soap/tests/custom_content_type.phpt
@@ -2,11 +2,11 @@
 SOAP customized Content-Type, eg. SwA use case
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
+    require_once('skipif.inc');
 
-	if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
-		echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
-	}
+    if (!file_exists(__DIR__ . "/../../../sapi/cli/tests/php_cli_server.inc")) {
+        echo "skip sapi/cli/tests/php_cli_server.inc required but not found";
+    }
 ?>
 --CONFLICTS--
 server
diff --git a/ext/soap/tests/schema/schema064.phpt b/ext/soap/tests/schema/schema064.phpt
index 88f58cf8cec35..b52a0519f6374 100644
--- a/ext/soap/tests/schema/schema064.phpt
+++ b/ext/soap/tests/schema/schema064.phpt
@@ -3,7 +3,7 @@ SOAP XML Schema 64: standard date/time types
 --SKIPIF--
 <?php
 if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
-	die('skip, windows has different TZ format');
+    die('skip, windows has different TZ format');
 }
 require_once('skipif.inc'); ?>
 --FILE--
diff --git a/ext/soap/tests/server009.phpt b/ext/soap/tests/server009.phpt
index 28d195a3ce401..c8367f1b624fb 100644
--- a/ext/soap/tests/server009.phpt
+++ b/ext/soap/tests/server009.phpt
@@ -2,10 +2,10 @@
 SOAP Server 9: setclass and setpersistence(SOAP_PERSISTENCE_SESSION)
 --SKIPIF--
 <?php
-	require_once('skipif.inc');
-	if (!extension_loaded('session')) {
-		die('skip this test needs session extension');
-	}
+    require_once('skipif.inc');
+    if (!extension_loaded('session')) {
+        die('skip this test needs session extension');
+    }
 ?>
 --INI--
 session.auto_start=1
diff --git a/ext/soap/tests/server019.phpt b/ext/soap/tests/server019.phpt
index 132b4dc1a5044..7838a824bc325 100644
--- a/ext/soap/tests/server019.phpt
+++ b/ext/soap/tests/server019.phpt
@@ -2,9 +2,9 @@
 SOAP Server 19: compressed request (gzip)
 --SKIPIF--
 <?php
-	if (php_sapi_name()=='cli') echo 'skip';
-	require_once('skipif.inc');
-	if (!extension_loaded('zlib')) die('skip zlib extension not available');
+    if (php_sapi_name()=='cli') echo 'skip';
+    require_once('skipif.inc');
+    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --INI--
 precision=14
diff --git a/ext/soap/tests/server020.phpt b/ext/soap/tests/server020.phpt
index 69eb4f097b57a..c98517edeac5a 100644
--- a/ext/soap/tests/server020.phpt
+++ b/ext/soap/tests/server020.phpt
@@ -2,9 +2,9 @@
 SOAP Server 20: compressed request (deflate)
 --SKIPIF--
 <?php
-	if (php_sapi_name()=='cli') echo 'skip';
-	require_once('skipif.inc');
-	if (!extension_loaded('zlib')) die('skip zlib extension not available');
+    if (php_sapi_name()=='cli') echo 'skip';
+    require_once('skipif.inc');
+    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --INI--
 precision=14
diff --git a/ext/soap/tests/server029.phpt b/ext/soap/tests/server029.phpt
index f5b28699a53da..7a75a2fec3d55 100644
--- a/ext/soap/tests/server029.phpt
+++ b/ext/soap/tests/server029.phpt
@@ -14,8 +14,8 @@ SOAP Server 29-CGI: new/addfunction/handle
 </SOAP-ENV:Envelope>
 --SKIPIF--
 <?php
-	if (php_sapi_name()=='cli') echo 'skip';
-	require_once('skipif.inc');
+    if (php_sapi_name()=='cli') echo 'skip';
+    require_once('skipif.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/sockets/tests/bug51958.phpt b/ext/sockets/tests/bug51958.phpt
index 975626634374f..8f47fad0f0335 100644
--- a/ext/sockets/tests/bug51958.phpt
+++ b/ext/sockets/tests/bug51958.phpt
@@ -6,10 +6,10 @@ if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
 if (!defined('IPPROTO_IPV6')) {
-	die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 }
 if (PHP_OS != "WINNT")
-	die('skip test relies Winsock\'s error code for WSAEWOULDBLOCK/EAGAIN');
+    die('skip test relies Winsock\'s error code for WSAEWOULDBLOCK/EAGAIN');
 --FILE--
 <?php
 $listenfd = socket_create(AF_INET6, SOCK_STREAM, SOL_TCP);
diff --git a/ext/sockets/tests/ipv4loop.phpt b/ext/sockets/tests/ipv4loop.phpt
index 4e5d15453bc4a..0314773291474 100644
--- a/ext/sockets/tests/ipv4loop.phpt
+++ b/ext/sockets/tests/ipv4loop.phpt
@@ -2,9 +2,9 @@
 IPv4 Loopback test
 --SKIPIF--
 <?php
-	if (!extension_loaded('sockets')) {
-		die('skip sockets extension not available.');
-	}
+    if (!extension_loaded('sockets')) {
+        die('skip sockets extension not available.');
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/sockets/tests/ipv6loop.phpt b/ext/sockets/tests/ipv6loop.phpt
index 109da5bc2db28..f6f141805d57e 100644
--- a/ext/sockets/tests/ipv6loop.phpt
+++ b/ext/sockets/tests/ipv6loop.phpt
@@ -2,10 +2,10 @@
 IPv6 Loopback test
 --SKIPIF--
 <?php
-	if (!extension_loaded('sockets')) {
-		die('skip sockets extension not available.');
-	}
-	require 'ipv6_skipif.inc';
+    if (!extension_loaded('sockets')) {
+        die('skip sockets extension not available.');
+    }
+    require 'ipv6_skipif.inc';
 ?>
 --FILE--
 <?php
diff --git a/ext/sockets/tests/mcast_ipv4_recv.phpt b/ext/sockets/tests/mcast_ipv4_recv.phpt
index 0f17eb67c6f87..fded01e2e8fa9 100644
--- a/ext/sockets/tests/mcast_ipv4_recv.phpt
+++ b/ext/sockets/tests/mcast_ipv4_recv.phpt
@@ -9,8 +9,8 @@ if (getenv('SKIP_ONLINE_TESTS')) die('skip online test');
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 $br = socket_bind($s, '0.0.0.0', 3000);
 $so = @socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
-	"group"	=> '224.0.0.23',
-	"interface" => 'lo',
+    "group"	=> '224.0.0.23',
+    "interface" => 'lo',
 ));
 if ($so === false) {
     die('skip interface \'lo\' is unavailable.');
diff --git a/ext/sockets/tests/mcast_ipv4_send.phpt b/ext/sockets/tests/mcast_ipv4_send.phpt
index e1e88aca416fe..027c07f1b8158 100644
--- a/ext/sockets/tests/mcast_ipv4_send.phpt
+++ b/ext/sockets/tests/mcast_ipv4_send.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded('sockets')) {
 }
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP) or die("err");
 if (socket_set_option($s, IPPROTO_IP, IP_MULTICAST_IF, 1) === false) {
-	die("skip interface 1 either doesn't exist or has no ipv4 address");
+    die("skip interface 1 either doesn't exist or has no ipv4 address");
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/mcast_ipv4_send_error.phpt b/ext/sockets/tests/mcast_ipv4_send_error.phpt
index 978b78938bba8..5e3ff394cf1b7 100644
--- a/ext/sockets/tests/mcast_ipv4_send_error.phpt
+++ b/ext/sockets/tests/mcast_ipv4_send_error.phpt
@@ -9,10 +9,10 @@ $domain = AF_INET;
 $level = IPPROTO_IP;
 $s = socket_create($domain, SOCK_DGRAM, SOL_UDP);
 if ($s === false) {
-	die("skip unable to create socket");
+    die("skip unable to create socket");
 }
 if (socket_set_option($s, $level, IP_MULTICAST_IF, 1) === false) {
-	die("skip interface 1 either doesn't exist or has no ipv4 address");
+    die("skip interface 1 either doesn't exist or has no ipv4 address");
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/mcast_ipv6_recv.phpt b/ext/sockets/tests/mcast_ipv6_recv.phpt
index 757bf9889b8db..127e9d17cfa42 100644
--- a/ext/sockets/tests/mcast_ipv6_recv.phpt
+++ b/ext/sockets/tests/mcast_ipv6_recv.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
 if (!defined('IPPROTO_IPV6')) {
-	die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 }
 $s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
 if ($s === false) {
@@ -17,28 +17,28 @@ $br = socket_bind($s, '::', 3000);
  * troublesome to send multicast traffic from lo, which we must since
  * we're dealing with interface-local traffic... */
 $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_GROUP, array(
-	"group"	=> 'ff01::114',
-	"interface" => 0,
+    "group"	=> 'ff01::114',
+    "interface" => 0,
 ));
 if ($so === false) {
     die('skip unable to join multicast group on any interface.');
 }
 $r = socket_sendto($s, $m = "testing packet", strlen($m), 0, 'ff01::114', 3000);
 if ($r === false) {
-	die('skip unable to send multicast packet.');
+    die('skip unable to send multicast packet.');
 }
 
 if (!defined("MCAST_JOIN_SOURCE_GROUP"))
     die('skip source operations are unavailable');
 
 $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_LEAVE_GROUP, array(
-	"group"	=> 'ff01::114',
-	"interface" => 0,
+    "group"	=> 'ff01::114',
+    "interface" => 0,
 ));
 $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
-	"group"	=> 'ff01::114',
-	"interface" => 0,
-	"source" => '2001::dead:beef',
+    "group"	=> 'ff01::114',
+    "interface" => 0,
+    "source" => '2001::dead:beef',
 ));
 if ($so === false) {
     die('skip protocol independent multicast API is unavailable.');
diff --git a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
index 9bf0bbf91492a..247c41b19d577 100644
--- a/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
+++ b/ext/sockets/tests/mcast_ipv6_recv_limited.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
 if (!defined('IPPROTO_IPV6')) {
-	die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 }
 $s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP);
 $br = socket_bind($s, '::', 3000);
@@ -14,29 +14,29 @@ $br = socket_bind($s, '::', 3000);
  * troublesome to send multicast traffic from lo, which we must since
  * we're dealing with interface-local traffic... */
 $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_GROUP, array(
-	"group"	=> 'ff01::114',
-	"interface" => 0,
+    "group"	=> 'ff01::114',
+    "interface" => 0,
 ));
 if ($so === false) {
     die('skip unable to join multicast group on any interface.');
 }
 $r = socket_sendto($s, $m = "testing packet", strlen($m), 0, 'ff01::114', 3000);
 if ($r === false) {
-	die('skip unable to send multicast packet.');
+    die('skip unable to send multicast packet.');
 }
 $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_LEAVE_GROUP, array(
-	"group"	=> 'ff01::114',
-	"interface" => 0,
+    "group"	=> 'ff01::114',
+    "interface" => 0,
 ));
 if (defined("MCAST_JOIN_SOURCE_GROUP")) {
-	$so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
-		"group"	=> 'ff01::114',
-		"interface" => 0,
-		"source" => '2001::dead:beef',
-	));
-	if ($so !== false) {
-	    die('skip protocol independent multicast API is available.');
-	}
+    $so = @socket_set_option($s, IPPROTO_IPV6, MCAST_JOIN_SOURCE_GROUP, array(
+        "group"	=> 'ff01::114',
+        "interface" => 0,
+        "source" => '2001::dead:beef',
+    ));
+    if ($so !== false) {
+        die('skip protocol independent multicast API is available.');
+    }
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/mcast_ipv6_send.phpt b/ext/sockets/tests/mcast_ipv6_send.phpt
index d9fec9e72bb23..ed8fe55ef5bb0 100644
--- a/ext/sockets/tests/mcast_ipv6_send.phpt
+++ b/ext/sockets/tests/mcast_ipv6_send.phpt
@@ -6,12 +6,12 @@ if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
 if (getenv('CI_NO_IPV6') || !defined('IPPROTO_IPV6')) {
-	die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 }
 $level = IPPROTO_IPV6;
 $s = socket_create(AF_INET6, SOCK_DGRAM, SOL_UDP) or die("skip Can not create socket");
 if (socket_set_option($s, $level, IPV6_MULTICAST_IF, 1) === false) {
-	die("skip interface 1 either doesn't exist or has no ipv6 address");
+    die("skip interface 1 either doesn't exist or has no ipv6 address");
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/socket_abstract_path.phpt b/ext/sockets/tests/socket_abstract_path.phpt
index bbe4debeaa583..686a487791cfe 100644
--- a/ext/sockets/tests/socket_abstract_path.phpt
+++ b/ext/sockets/tests/socket_abstract_path.phpt
@@ -3,10 +3,10 @@ Support for paths in the abstract namespace (bind, connect)
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets'))
-	die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 
 if (PHP_OS != 'Linux') {
-	die('skip For Linux only');
+    die('skip For Linux only');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/socket_abstract_path_sendmsg.phpt b/ext/sockets/tests/socket_abstract_path_sendmsg.phpt
index ca9ab3f5348b0..796b406e26e69 100644
--- a/ext/sockets/tests/socket_abstract_path_sendmsg.phpt
+++ b/ext/sockets/tests/socket_abstract_path_sendmsg.phpt
@@ -3,10 +3,10 @@ Support for paths in the abstract namespace (bind, sendmsg, recvmsg)
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets'))
-	die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 
 if (PHP_OS != 'Linux') {
-	die('skip For Linux only');
+    die('skip For Linux only');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/socket_clear_error-win32.phpt b/ext/sockets/tests/socket_clear_error-win32.phpt
index 3a0b1ea162a7a..c875cfd2e80fa 100644
--- a/ext/sockets/tests/socket_clear_error-win32.phpt
+++ b/ext/sockets/tests/socket_clear_error-win32.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/socket_clear_error.phpt b/ext/sockets/tests/socket_clear_error.phpt
index 273f7a0ca8d4e..9ea770954d539 100644
--- a/ext/sockets/tests/socket_clear_error.phpt
+++ b/ext/sockets/tests/socket_clear_error.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/socket_create_listen-win32.phpt b/ext/sockets/tests/socket_create_listen-win32.phpt
index 89d8dde0b2b83..73cc857617c9e 100644
--- a/ext/sockets/tests/socket_create_listen-win32.phpt
+++ b/ext/sockets/tests/socket_create_listen-win32.phpt
@@ -3,7 +3,7 @@ Test if socket binds on 31338
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	die('skip.. Not valid for non Windows');
+    die('skip.. Not valid for non Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_create_listen.phpt b/ext/sockets/tests/socket_create_listen.phpt
index 180b91368c4e7..131526bb0d213 100644
--- a/ext/sockets/tests/socket_create_listen.phpt
+++ b/ext/sockets/tests/socket_create_listen.phpt
@@ -3,7 +3,7 @@ Test if socket binds on 31338
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 5b6934d965205..1abab2a1e775c 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_create_pair()
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	die('skip.. Not valid for non Windows');
+    die('skip.. Not valid for non Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 7adbc91d8ad5a..8dc56d1e366ad 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_create_pair()
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_export_stream-1.phpt b/ext/sockets/tests/socket_export_stream-1.phpt
index a3788f8c724d8..45ed57974c328 100644
--- a/ext/sockets/tests/socket_export_stream-1.phpt
+++ b/ext/sockets/tests/socket_export_stream-1.phpt
@@ -3,7 +3,7 @@ socket_export_stream: Basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/socket_export_stream-2.phpt b/ext/sockets/tests/socket_export_stream-2.phpt
index 503db5b00404e..00e7a61929f38 100644
--- a/ext/sockets/tests/socket_export_stream-2.phpt
+++ b/ext/sockets/tests/socket_export_stream-2.phpt
@@ -3,7 +3,7 @@ socket_export_stream: Bad arguments
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/socket_export_stream-3.phpt b/ext/sockets/tests/socket_export_stream-3.phpt
index a1bffdbad654a..560718b457765 100644
--- a/ext/sockets/tests/socket_export_stream-3.phpt
+++ b/ext/sockets/tests/socket_export_stream-3.phpt
@@ -3,18 +3,18 @@ socket_export_stream: Test with multicasting
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 $br = @socket_bind($s, '0.0.0.0', 58393);
 if ($br === false)
-	die("SKIP IPv4/port 58393 not available");
+    die("SKIP IPv4/port 58393 not available");
 $so = @socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
-	"group"	=> '224.0.0.23',
-	"interface" => "lo",
+    "group"	=> '224.0.0.23',
+    "interface" => "lo",
 ));
 if ($so === false)
-	die("SKIP joining group 224.0.0.23 on interface lo failed");
+    die("SKIP joining group 224.0.0.23 on interface lo failed");
 --FILE--
 <?php
 
diff --git a/ext/sockets/tests/socket_export_stream-4-win.phpt b/ext/sockets/tests/socket_export_stream-4-win.phpt
index 067e9fcc194f1..fddd459a7df8a 100644
--- a/ext/sockets/tests/socket_export_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_export_stream-4-win.phpt
@@ -3,7 +3,7 @@ socket_export_stream: effects of closing
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
   die("skip Not Valid for Linux");
diff --git a/ext/sockets/tests/socket_export_stream-4.phpt b/ext/sockets/tests/socket_export_stream-4.phpt
index 390689cce5110..a467b6d845f0c 100644
--- a/ext/sockets/tests/socket_export_stream-4.phpt
+++ b/ext/sockets/tests/socket_export_stream-4.phpt
@@ -3,7 +3,7 @@ socket_export_stream: effects of closing
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
   die("skip Not Valid for Windows");
diff --git a/ext/sockets/tests/socket_export_stream-5.phpt b/ext/sockets/tests/socket_export_stream-5.phpt
index 3ce2c2579c54a..d5499222e2f2d 100644
--- a/ext/sockets/tests/socket_export_stream-5.phpt
+++ b/ext/sockets/tests/socket_export_stream-5.phpt
@@ -3,10 +3,10 @@ socket_export_stream: effects of leaked handles
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 if (!function_exists('zend_leak_variable'))
-	die('SKIP only for debug builds');
+    die('SKIP only for debug builds');
 ?>
 --INI--
 report_memleaks=0
diff --git a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
index 3dab562bbbf66..c5f61ec5470aa 100644
--- a/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
+++ b/ext/sockets/tests/socket_getpeername_ipv6loop.phpt
@@ -6,7 +6,7 @@ Tatjana Andersen tatjana.andersen@redpill-linpro.com
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 }
 require 'ipv6_skipif.inc';
 ?>
diff --git a/ext/sockets/tests/socket_import_stream-1.phpt b/ext/sockets/tests/socket_import_stream-1.phpt
index 9931535721a33..a89ccf807e272 100644
--- a/ext/sockets/tests/socket_import_stream-1.phpt
+++ b/ext/sockets/tests/socket_import_stream-1.phpt
@@ -3,7 +3,7 @@ socket_import_stream: Basic test
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt
index a16a3dc18a54a..ff2b9ee975a13 100644
--- a/ext/sockets/tests/socket_import_stream-2.phpt
+++ b/ext/sockets/tests/socket_import_stream-2.phpt
@@ -3,7 +3,7 @@ socket_import_stream: Bad arguments
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 --FILE--
 <?php
diff --git a/ext/sockets/tests/socket_import_stream-3.phpt b/ext/sockets/tests/socket_import_stream-3.phpt
index 972a3d6fcf90c..635d43cdbd805 100644
--- a/ext/sockets/tests/socket_import_stream-3.phpt
+++ b/ext/sockets/tests/socket_import_stream-3.phpt
@@ -3,18 +3,18 @@ socket_import_stream: Test with multicasting
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
 $br = @socket_bind($s, '0.0.0.0', 58379);
 if ($br === false)
-	die("SKIP IPv4/port 58379 not available");
+    die("SKIP IPv4/port 58379 not available");
 $so = @socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array(
-	"group"	=> '224.0.0.23',
-	"interface" => "lo",
+    "group"	=> '224.0.0.23',
+    "interface" => "lo",
 ));
 if ($so === false)
-	die("SKIP joining group 224.0.0.23 on interface lo failed");
+    die("SKIP joining group 224.0.0.23 on interface lo failed");
 --FILE--
 <?php
 
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt
index 9b5863cf2b950..94af0ab5c1b9f 100644
--- a/ext/sockets/tests/socket_import_stream-4-win.phpt
+++ b/ext/sockets/tests/socket_import_stream-4-win.phpt
@@ -3,7 +3,7 @@ socket_import_stream: effects of closing
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
   die("skip Not Valid for Linux");
diff --git a/ext/sockets/tests/socket_import_stream-4.phpt b/ext/sockets/tests/socket_import_stream-4.phpt
index 592dbd6c04a44..9c11611d03fb3 100644
--- a/ext/sockets/tests/socket_import_stream-4.phpt
+++ b/ext/sockets/tests/socket_import_stream-4.phpt
@@ -3,7 +3,7 @@ socket_import_stream: effects of closing
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
   die("skip Not Valid for Windows");
diff --git a/ext/sockets/tests/socket_import_stream-5.phpt b/ext/sockets/tests/socket_import_stream-5.phpt
index ce10168650d2b..c2acf94f363d1 100644
--- a/ext/sockets/tests/socket_import_stream-5.phpt
+++ b/ext/sockets/tests/socket_import_stream-5.phpt
@@ -3,10 +3,10 @@ socket_import_stream: effects of leaked handles
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets')) {
-	die('SKIP sockets extension not available.');
+    die('SKIP sockets extension not available.');
 }
 if (!function_exists('zend_leak_variable'))
-	die('SKIP only for debug builds');
+    die('SKIP only for debug builds');
 ?>
 --INI--
 report_memleaks=0
diff --git a/ext/sockets/tests/socket_listen-wrongparams.phpt b/ext/sockets/tests/socket_listen-wrongparams.phpt
index 5262d5e4b3340..c7c066b5edc0d 100644
--- a/ext/sockets/tests/socket_listen-wrongparams.phpt
+++ b/ext/sockets/tests/socket_listen-wrongparams.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_listen().
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
index 21c3c9e8d9a6b..40a9e118e427a 100644
--- a/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
+++ b/ext/sockets/tests/socket_select-wrongparams-1-win32.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_select().
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	die('skip.. Not valid for non Windows');
+    die('skip.. Not valid for non Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_select-wrongparams-1.phpt b/ext/sockets/tests/socket_select-wrongparams-1.phpt
index 91286d1372045..695eb62d01260 100644
--- a/ext/sockets/tests/socket_select-wrongparams-1.phpt
+++ b/ext/sockets/tests/socket_select-wrongparams-1.phpt
@@ -3,7 +3,7 @@ Test parameter handling in socket_select().
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
index a5aaea35a4cc0..062ed094f2eac 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt
@@ -3,14 +3,14 @@ sendmsg()/recvmsg(): test ability to receive multiple messages
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets'))
-	die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 
 require 'ipv6_skipif.inc';
 
 if (!defined('IPPROTO_IPV6'))
-	die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 if (substr(PHP_OS, 0, 3) == 'WIN')
-	die('skip Not for the Windows!');
+    die('skip Not for the Windows!');
 /* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
  * WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
  * does not accept IPV6_TCLASS messages */
diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
index 9fe57a8258ed4..abbd2a7aa8560 100644
--- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
+++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt
@@ -3,12 +3,12 @@ sendmsg()/recvmsg(): test ability to receive multiple messages (WIN32)
 --SKIPIF--
 <?php
 if (!extension_loaded('sockets'))
-	die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 
 require 'ipv6_skipif.inc';
 
 if (!defined('IPPROTO_IPV6'))
-	die('skip IPv6 not available.');
+    die('skip IPv6 not available.');
 /* Windows supports IPV6_RECVTCLASS and is able to receive the tclass via
  * WSARecvMsg (though only the top 6 bits seem to reported), but WSASendMsg
  * does not accept IPV6_TCLASS messages. We still test that sendmsg() works
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
index 2aa5f7f115fe7..9a686539daa16 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp-win32.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
 }
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	die('skip only for Windows');
+    die('skip only for Windows');
 }
 require 'ipv6_skipif.inc';
 --FILE--
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
index de16c5c580f5f..75a2f73e68ff9 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_ipv6_udp.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
 }
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip Not valid for Windows');
+    die('skip Not valid for Windows');
 }
 require 'ipv6_skipif.inc';
 ?>
diff --git a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
index 6e063c5b52018..a355a2486411f 100644
--- a/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
+++ b/ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
@@ -3,7 +3,7 @@ Test if socket_recvfrom() receives data sent by socket_sendto() through a Unix d
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
 if (!extension_loaded('sockets')) {
     die('SKIP The sockets extension is not loaded.');
diff --git a/ext/sockets/tests/socket_set_option_bindtodevice.phpt b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
index acce4d832c4e5..9bd608384f01f 100644
--- a/ext/sockets/tests/socket_set_option_bindtodevice.phpt
+++ b/ext/sockets/tests/socket_set_option_bindtodevice.phpt
@@ -9,10 +9,10 @@ if (!extension_loaded('sockets')) {
         die('SKIP sockets extension not available.');
 }
 if (!defined("SO_BINDTODEVICE")) {
-	die('SKIP SO_BINDTODEVICE not supported on this platform.');
+    die('SKIP SO_BINDTODEVICE not supported on this platform.');
 }
 if (!function_exists("posix_getuid") || posix_getuid() != 0) {
-	die('SKIP SO_BINDTODEVICE requires root permissions.');
+    die('SKIP SO_BINDTODEVICE requires root permissions.');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/socket_shutdown-win32.phpt b/ext/sockets/tests/socket_shutdown-win32.phpt
index aced74b7f8ec3..cc16c3a215871 100644
--- a/ext/sockets/tests/socket_shutdown-win32.phpt
+++ b/ext/sockets/tests/socket_shutdown-win32.phpt
@@ -8,7 +8,7 @@ if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/socket_shutdown.phpt b/ext/sockets/tests/socket_shutdown.phpt
index 3dc62bc270731..7c12b616c1669 100644
--- a/ext/sockets/tests/socket_shutdown.phpt
+++ b/ext/sockets/tests/socket_shutdown.phpt
@@ -9,7 +9,7 @@ if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
 }
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-	die('skip not for windows');
+    die('skip not for windows');
 }
 ?>
 --FILE--
diff --git a/ext/sockets/tests/unixloop.phpt b/ext/sockets/tests/unixloop.phpt
index 31740c97c66e6..c3b80ff588e62 100644
--- a/ext/sockets/tests/unixloop.phpt
+++ b/ext/sockets/tests/unixloop.phpt
@@ -3,11 +3,11 @@ Unix domain socket Loopback test
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip.. Not valid for Windows');
+    die('skip.. Not valid for Windows');
 }
-	if (!extension_loaded('sockets')) {
-		die('skip sockets extension not available.');
-	}
+    if (!extension_loaded('sockets')) {
+        die('skip sockets extension not available.');
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/sockets/tests/wsaprotocol_info_0.phpt b/ext/sockets/tests/wsaprotocol_info_0.phpt
index 7ea50d359fc5d..2d189d55bcd77 100644
--- a/ext/sockets/tests/wsaprotocol_info_0.phpt
+++ b/ext/sockets/tests/wsaprotocol_info_0.phpt
@@ -3,10 +3,10 @@ Winsock export/import socket, basic test
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	die('skip.. Windows only test');
+    die('skip.. Windows only test');
 }
 if (!extension_loaded('sockets')) {
-	die('skip sockets extension not available.');
+    die('skip sockets extension not available.');
 }
 ?>
 --FILE--
diff --git a/ext/spl/tests/bug65006.phpt b/ext/spl/tests/bug65006.phpt
index 1393936c5a1a7..954811a784898 100644
--- a/ext/spl/tests/bug65006.phpt
+++ b/ext/spl/tests/bug65006.phpt
@@ -4,17 +4,17 @@ Bug #65006: spl_autoload_register fails with multiple callables using self, same
 <?php
 
 class first {
-	public static function init() {
-		spl_autoload_register(array('self','load'));
-	}
-	public static function load($class) {}
+    public static function init() {
+        spl_autoload_register(array('self','load'));
+    }
+    public static function load($class) {}
 }
 
 class second {
-	public static function init() {
-		spl_autoload_register(array('self','load'));
-	}
-	public static function load($class){}
+    public static function init() {
+        spl_autoload_register(array('self','load'));
+    }
+    public static function load($class){}
 }
 
 first::init();
diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
index 49b8cd7cc7a98..b6622dd25f245 100644
--- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt
+++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt
@@ -4,9 +4,9 @@ SQLite3::prepare number of rows
 <?php require_once(__DIR__ . '/skipif.inc');
 // Create an instance of the ReflectionMethod class
 try {
-	$method = new ReflectionMethod('sqlite3result', 'numRows');
+    $method = new ReflectionMethod('sqlite3result', 'numRows');
 } catch (ReflectionException $e) {
-	die("skip SQLite3Result::numRows method does not exist");
+    die("skip SQLite3Result::numRows method does not exist");
 }
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
index 4b75b3b28f02c..4bdb9fade4b15 100644
--- a/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error-win.phpt
@@ -3,7 +3,7 @@ SQLite3::open error test
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 require_once(__DIR__ . '/skipif.inc');
 ?>
diff --git a/ext/sqlite3/tests/sqlite3_15_open_error.phpt b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
index 817affa78461a..219cb6051a954 100644
--- a/ext/sqlite3/tests/sqlite3_15_open_error.phpt
+++ b/ext/sqlite3/tests/sqlite3_15_open_error.phpt
@@ -3,7 +3,7 @@ SQLite3::open error test
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-	die('skip non windows test');
+    die('skip non windows test');
 }
 require_once(__DIR__ . '/skipif.inc');
 if (!function_exists('posix_geteui')) {
diff --git a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
index 52a533d542aa3..d4750b5f5e0f1 100644
--- a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
+++ b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt
@@ -5,7 +5,7 @@ SQLite3 load extension
 require_once(__DIR__ . '/skipif.inc');
 $r = new ReflectionClass("sqlite3");
 if (!$r->hasMethod("loadExtension")) {
-	die("skip - sqlite3 doesn't have loadExtension enabled");
+    die("skip - sqlite3 doesn't have loadExtension enabled");
 }
 ?>
 --INI--
diff --git a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
index ab5d3fc99a8de..d8f59a5edb1b9 100644
--- a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
+++ b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
@@ -10,7 +10,7 @@ sqlite3.extension_dir="{TMP}"
 require_once(__DIR__ . '/skipif.inc');
 
 if (!method_exists('SQLite3', 'loadExtension')) {
-	die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
+    die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
 }
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
index f04df7750b2a4..7b0d5fea531fc 100644
--- a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
+++ b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
@@ -8,7 +8,7 @@ Jelle Lampaert
 require_once(__DIR__ . '/skipif.inc');
 
 if (!method_exists('SQLite3', 'loadExtension')) {
-	die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
+    die("skip if SQLITE_OMIT_LOAD_EXTENSION defined");
 }
 ?>
 --FILE--
diff --git a/ext/sqlite3/tests/sqlite3_defensive.phpt b/ext/sqlite3/tests/sqlite3_defensive.phpt
index 064d87b50a054..c8826af24f1cb 100644
--- a/ext/sqlite3/tests/sqlite3_defensive.phpt
+++ b/ext/sqlite3/tests/sqlite3_defensive.phpt
@@ -4,7 +4,7 @@ SQLite3 defensive mode ini setting
 <?php require_once(__DIR__ . '/skipif.inc');
 
 if (SQLite3::version()['versionNumber'] < 3026000) {
-	die("skip: sqlite3 library version < 3.26: no support for defensive mode");
+    die("skip: sqlite3 library version < 3.26: no support for defensive mode");
 }
 
 ?>
diff --git a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
index 9a893c590d3a9..0b677c7378487 100644
--- a/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
+++ b/ext/sqlite3/tests/sqlite3stmt_getsql_expanded.phpt
@@ -4,7 +4,7 @@ SQLite3Stmt::getSQL expanded test
 <?php require_once(__DIR__ . '/skipif.inc');
 
 if (SQLite3::version()['versionNumber'] < 3014000) {
-	die('skip SQLite < 3.14 installed, requires SQLite >= 3.14');
+    die('skip SQLite < 3.14 installed, requires SQLite >= 3.14');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt
index 59c8f072fa507..f6b2934474b83 100644
--- a/ext/standard/tests/dir/opendir_variation5.phpt
+++ b/ext/standard/tests/dir/opendir_variation5.phpt
@@ -3,7 +3,7 @@ Test opendir() function : usage variations - directories with restricted permiss
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip Not for Windows');
+    die('skip Not for Windows');
 }
 require __DIR__ . '/../skipif_root.inc';
 ?>
diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt
index da20b5289e6ae..7bee9f087a7f5 100644
--- a/ext/standard/tests/dir/scandir_variation5.phpt
+++ b/ext/standard/tests/dir/scandir_variation5.phpt
@@ -3,7 +3,7 @@ Test scandir() function : usage variations - different directory permissions
 --SKIPIF--
 <?php
 if( substr(PHP_OS, 0, 3) == 'WIN') {
-	die('skip Not for Windows');
+    die('skip Not for Windows');
 }
 require __DIR__ . '/../skipif_root.inc';
 ?>
diff --git a/ext/standard/tests/file/bug41874_1.phpt b/ext/standard/tests/file/bug41874_1.phpt
index ed14d87a6777c..b7be9d068a13b 100644
--- a/ext/standard/tests/file/bug41874_1.phpt
+++ b/ext/standard/tests/file/bug41874_1.phpt
@@ -5,7 +5,7 @@ Venkat Raman Don
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-		die('skip windows only test');
+        die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/bug41874_2.phpt b/ext/standard/tests/file/bug41874_2.phpt
index 012fc01a3d206..f08e22fb02fd2 100644
--- a/ext/standard/tests/file/bug41874_2.phpt
+++ b/ext/standard/tests/file/bug41874_2.phpt
@@ -5,7 +5,7 @@ Venkat Raman Don
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-		die('skip windows only test');
+        die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/bug41874_3.phpt b/ext/standard/tests/file/bug41874_3.phpt
index 01bd7dc60690f..6ecfb8f5d52a7 100644
--- a/ext/standard/tests/file/bug41874_3.phpt
+++ b/ext/standard/tests/file/bug41874_3.phpt
@@ -5,7 +5,7 @@ Venkat Raman Don
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-		die('skip windows only test');
+        die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/bug47517.phpt b/ext/standard/tests/file/bug47517.phpt
index 4eaf9a132c674..22a2dc0c5f6a7 100644
--- a/ext/standard/tests/file/bug47517.phpt
+++ b/ext/standard/tests/file/bug47517.phpt
@@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
 }
 exec('net session 2>&1', $out, $status);
 if (!$status) {
-	die('skip test runs under an elevated user account');
+    die('skip test runs under an elevated user account');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/bug47767.phpt b/ext/standard/tests/file/bug47767.phpt
index a7c4f02e78f18..0ef3eb2091940 100644
--- a/ext/standard/tests/file/bug47767.phpt
+++ b/ext/standard/tests/file/bug47767.phpt
@@ -5,7 +5,7 @@ Venkat Raman Don
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-		die('skip windows only test');
+        die('skip windows only test');
 }
 include_once __DIR__ . '/windows_links/common.inc';
 skipIfSeCreateSymbolicLinkPrivilegeIsDisabled(__FILE__);
diff --git a/ext/standard/tests/file/bug60120.phpt b/ext/standard/tests/file/bug60120.phpt
index 9d964e34cb79c..0236e9e1ea7c7 100644
--- a/ext/standard/tests/file/bug60120.phpt
+++ b/ext/standard/tests/file/bug60120.phpt
@@ -4,7 +4,7 @@ Bug #60120 (proc_open hangs when data in stdin/out/err is getting larger or equa
 <?php
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (!$php) {
-	die("skip No php executable defined\n");
+    die("skip No php executable defined\n");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/chroot_001.phpt b/ext/standard/tests/file/chroot_001.phpt
index 7fda0b3654bae..a8bca2e04bde7 100644
--- a/ext/standard/tests/file/chroot_001.phpt
+++ b/ext/standard/tests/file/chroot_001.phpt
@@ -4,11 +4,11 @@ chroot()
 <?php
 chdir("/");
 if (!@mkdir("testtmpskipifdir")) {
-	die("skip for root only");
+    die("skip for root only");
 }
 rmdir("testtmpskipifdir");
 if (!function_exists("chroot")) {
-	die("skip chroot() not available");
+    die("skip chroot() not available");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt
index 0bbce038e6ba4..f2803e9189ed6 100644
--- a/ext/standard/tests/file/file_get_contents_error001.phpt
+++ b/ext/standard/tests/file/file_get_contents_error001.phpt
@@ -7,7 +7,7 @@ file_get_contents() test using offset parameter out of range
 display_errors=false
 --SKIPIF--
 <?php
-	if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+    if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt
index a754f6431fdf4..45ec3052cdcbc 100644
--- a/ext/standard/tests/file/fopen_variation10-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation10-win32.phpt
@@ -8,7 +8,7 @@ if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Run only on Windows");
 
 if (!is_writable('c:\\')) {
-	die('skip. C:\\ not writable.');
+    die('skip. C:\\ not writable.');
 }
 
 ?>
diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt
index e6201829b005a..22368812637bc 100644
--- a/ext/standard/tests/file/fopen_variation11-win32.phpt
+++ b/ext/standard/tests/file/fopen_variation11-win32.phpt
@@ -7,7 +7,7 @@ Dave Kelsey <d_kelsey@uk.ibm.com>
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip Run only on Windows");
 if (!is_writable('c:\\')) {
-	die('skip. C:\\ not writable.');
+    die('skip. C:\\ not writable.');
 }
 
 ?>
diff --git a/ext/standard/tests/file/fscanf_variation3.phpt b/ext/standard/tests/file/fscanf_variation3.phpt
index 5226dba55a9aa..ae197b6f96fce 100644
--- a/ext/standard/tests/file/fscanf_variation3.phpt
+++ b/ext/standard/tests/file/fscanf_variation3.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - integer formats with float values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fscanf_variation33.phpt b/ext/standard/tests/file/fscanf_variation33.phpt
index 1809a0d1e5d68..c008c759c9b39 100644
--- a/ext/standard/tests/file/fscanf_variation33.phpt
+++ b/ext/standard/tests/file/fscanf_variation33.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - hexa formats with integer values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fscanf_variation34.phpt b/ext/standard/tests/file/fscanf_variation34.phpt
index ac202ab26e6cf..2dad3ace145fa 100644
--- a/ext/standard/tests/file/fscanf_variation34.phpt
+++ b/ext/standard/tests/file/fscanf_variation34.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - hexa formats with float values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fscanf_variation39.phpt b/ext/standard/tests/file/fscanf_variation39.phpt
index 25a0b38706c89..f04d3b7e3165c 100644
--- a/ext/standard/tests/file/fscanf_variation39.phpt
+++ b/ext/standard/tests/file/fscanf_variation39.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - unsigned int formats with integer val
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fscanf_variation40.phpt b/ext/standard/tests/file/fscanf_variation40.phpt
index f13af1a26a5f4..4b12a8cf0a1e9 100644
--- a/ext/standard/tests/file/fscanf_variation40.phpt
+++ b/ext/standard/tests/file/fscanf_variation40.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - unsigned formats with float values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fscanf_variation55.phpt b/ext/standard/tests/file/fscanf_variation55.phpt
index 3536d01b4200b..9b5eb967db75a 100644
--- a/ext/standard/tests/file/fscanf_variation55.phpt
+++ b/ext/standard/tests/file/fscanf_variation55.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - tracking file pointer while reading
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/fscanf_variation9.phpt b/ext/standard/tests/file/fscanf_variation9.phpt
index eafa78cefd1a8..8b88a036f3baf 100644
--- a/ext/standard/tests/file/fscanf_variation9.phpt
+++ b/ext/standard/tests/file/fscanf_variation9.phpt
@@ -3,7 +3,7 @@ Test fscanf() function: usage variations - float formats with integer values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/link_win32.phpt b/ext/standard/tests/file/link_win32.phpt
index 2bba5469c723a..5aa3ce04fd8ca 100644
--- a/ext/standard/tests/file/link_win32.phpt
+++ b/ext/standard/tests/file/link_win32.phpt
@@ -5,7 +5,7 @@ Venkat Raman Don
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-		die('skip windows only test');
+        die('skip windows only test');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/file/mkdir-004.phpt b/ext/standard/tests/file/mkdir-004.phpt
index 46db53108265a..7de0e45894d43 100644
--- a/ext/standard/tests/file/mkdir-004.phpt
+++ b/ext/standard/tests/file/mkdir-004.phpt
@@ -4,7 +4,7 @@ recursive mkdir() tests
 <?php
 chdir("/");
 if (!@mkdir("testtmpskipifdir")) {
-	die("skip for root only");
+    die("skip for root only");
 }
 rmdir("testtmpskipifdir");
 ?>
diff --git a/ext/standard/tests/file/mkdir-005.phpt b/ext/standard/tests/file/mkdir-005.phpt
index 621c9922e553a..383f8b18e0527 100644
--- a/ext/standard/tests/file/mkdir-005.phpt
+++ b/ext/standard/tests/file/mkdir-005.phpt
@@ -4,7 +4,7 @@ recursive mkdir() tests
 <?php
 chdir("/");
 if (!@mkdir("testtmpskipifdir")) {
-	die("skip for root only");
+    die("skip for root only");
 }
 rmdir("testtmpskipifdir");
 ?>
diff --git a/ext/standard/tests/file/tempnam_variation3-win32.phpt b/ext/standard/tests/file/tempnam_variation3-win32.phpt
index f47bb610c6cd6..86990f03416a4 100644
--- a/ext/standard/tests/file/tempnam_variation3-win32.phpt
+++ b/ext/standard/tests/file/tempnam_variation3-win32.phpt
@@ -3,7 +3,7 @@ Test tempnam() function: usage variations - obscure prefixes
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != "WIN")
-	die("skip run only on Windows");
+    die("skip run only on Windows");
 ?>
 --CONFLICTS--
 obscure_filename
diff --git a/ext/standard/tests/file/windows_links/bug48746_3.phpt b/ext/standard/tests/file/windows_links/bug48746_3.phpt
index 09875f32c8cc7..8150e2c551006 100644
--- a/ext/standard/tests/file/windows_links/bug48746_3.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt
@@ -5,12 +5,12 @@ Venkat Raman Don (don.raman@microsoft.com)
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
-	die('skip windows only test');
+    die('skip windows only test');
 }
 include_once __DIR__ . '/common.inc';
 $ret = exec(get_junction().' /? 2>&1', $out);
 if (strpos($out[0], 'recognized')) {
-	die('skip. junction.exe not found in PATH.');
+    die('skip. junction.exe not found in PATH.');
 }
 
 ?>
diff --git a/ext/standard/tests/file/windows_links/common.inc b/ext/standard/tests/file/windows_links/common.inc
index b4a09e00c220c..c55aa5d01ad53 100644
--- a/ext/standard/tests/file/windows_links/common.inc
+++ b/ext/standard/tests/file/windows_links/common.inc
@@ -21,10 +21,10 @@ function get_mountvol() {
 }
 
 function skipIfSeCreateSymbolicLinkPrivilegeIsDisabled(string $filename) {
-	$ln = "$filename.lnk";
-	$ret = exec("mklink $ln " . __FILE__ .' 2>&1', $out);
-	@unlink($ln);
-	if (strpos($ret, 'privilege') !== false) {
-		die('skip SeCreateSymbolicLinkPrivilege not enabled');
-	}
+    $ln = "$filename.lnk";
+    $ret = exec("mklink $ln " . __FILE__ .' 2>&1', $out);
+    @unlink($ln);
+    if (strpos($ret, 'privilege') !== false) {
+        die('skip SeCreateSymbolicLinkPrivilege not enabled');
+    }
 }
diff --git a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt
index b8235c8842691..5beb63f905c97 100644
--- a/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt
+++ b/ext/standard/tests/file/windows_mb_path/bug75063_utf8.phpt
@@ -60,8 +60,8 @@ $d0 = $prefix . DIRECTORY_SEPARATOR . $dir_basename;
 
 $obj = scandir($d0);
 foreach ($obj as $file) {
-	if ("." == $file || ".." == $file) continue;
-	unlink($d0 . DIRECTORY_SEPARATOR . $file);
+    if ("." == $file || ".." == $file) continue;
+    unlink($d0 . DIRECTORY_SEPARATOR . $file);
 }
 
 rmdir($d0);
diff --git a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
index 1e3d7cd19cc06..1502d62e02286 100644
--- a/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
+++ b/ext/standard/tests/file/windows_mb_path/test_long_path_mkdir.phpt
@@ -8,7 +8,7 @@ skip_if_not_win();
 
 $start = realpath(__DIR__);
 if (strlen($start) > 260 || strlen($start) > 248) {
-	die("skip the starting path length is unsuitable for this test");
+    die("skip the starting path length is unsuitable for this test");
 }
 
 ?>
diff --git a/ext/standard/tests/filters/bug74267.phpt b/ext/standard/tests/filters/bug74267.phpt
index 7e5d550e175b7..703b6c0b87cff 100644
--- a/ext/standard/tests/filters/bug74267.phpt
+++ b/ext/standard/tests/filters/bug74267.phpt
@@ -6,14 +6,14 @@ $stream = fopen('php://memory', 'w');
 stream_filter_append($stream, 'convert.quoted-printable-decode', STREAM_FILTER_WRITE, ['line-break-chars' => "\r\n"]);
 
 $lines = [
-	"\r\n",
-	" -=()\r\n",
-	" -=\r\n",
-	"\r\n"
-	];
+    "\r\n",
+    " -=()\r\n",
+    " -=\r\n",
+    "\r\n"
+    ];
 
 foreach ($lines as $line) {
-	fwrite($stream, $line);
+    fwrite($stream, $line);
 }
 
 fclose($stream);
diff --git a/ext/standard/tests/general_functions/bug41518.phpt b/ext/standard/tests/general_functions/bug41518.phpt
index 26e2413ce9a5e..3b5ad3a8336ad 100644
--- a/ext/standard/tests/general_functions/bug41518.phpt
+++ b/ext/standard/tests/general_functions/bug41518.phpt
@@ -5,7 +5,7 @@ Bug #41518 (file_exists() warns of open_basedir restriction on non-existent file
 $tmp_dir = __DIR__ . '/bug41518';
 mkdir($tmp_dir);
 if (!is_dir($tmp_dir)) {
-	die("skip");
+    die("skip");
 }
 @unlink($tmp_dir);
 ?>
diff --git a/ext/standard/tests/general_functions/dl-check-enabled.phpt b/ext/standard/tests/general_functions/dl-check-enabled.phpt
index 7559b8d905c90..e989df0fb5a0b 100644
--- a/ext/standard/tests/general_functions/dl-check-enabled.phpt
+++ b/ext/standard/tests/general_functions/dl-check-enabled.phpt
@@ -7,7 +7,7 @@ User Group: PHP-WVL & PHPGent #PHPTestFest
 <?php
 $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
 if (!in_array(php_sapi_name(), $enabled_sapi)) {
-	die('skip dl() is not enabled for ' . php_sapi_name());
+    die('skip dl() is not enabled for ' . php_sapi_name());
 }
 ?>
 --INI--
diff --git a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
index 0fe2a5814343a..effae83464ed5 100644
--- a/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
+++ b/ext/standard/tests/general_functions/dl-cve-2007-4887.phpt
@@ -4,7 +4,7 @@ dl() filename length checks (CVE-2007-4887)
 <?php
 $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
 if (!in_array(php_sapi_name(), $enabled_sapi)) {
-	die('skip dl() is not enabled for ' . php_sapi_name());
+    die('skip dl() is not enabled for ' . php_sapi_name());
 }
 ?>
 --INI--
diff --git a/ext/standard/tests/general_functions/dl-full-path-not-supported.phpt b/ext/standard/tests/general_functions/dl-full-path-not-supported.phpt
index 746162c7bfbac..aaf7d042e536a 100644
--- a/ext/standard/tests/general_functions/dl-full-path-not-supported.phpt
+++ b/ext/standard/tests/general_functions/dl-full-path-not-supported.phpt
@@ -7,7 +7,7 @@ User Group: PHP-WVL & PHPGent #PHPTestFest
 <?php
 $enabled_sapi = array('cgi-fcgi', 'cli', 'embed', 'fpm');
 if (!in_array(php_sapi_name(), $enabled_sapi)) {
-	die('skip dl() is not enabled for ' . php_sapi_name());
+    die('skip dl() is not enabled for ' . php_sapi_name());
 }
 ?>
 --INI--
diff --git a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt
index 6bf3b2c0a66b5..e79bcad3c11c7 100644
--- a/ext/standard/tests/general_functions/proc_nice_basic-win.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_basic-win.phpt
@@ -5,11 +5,11 @@ proc_nice() basic behaviour
 /* No function_exists() check, proc_nice() is always available on Windows */
 
 if (!defined('PHP_WINDOWS_VERSION_MAJOR')) {
-	die('skip: Only for Windows');
+    die('skip: Only for Windows');
 }
 
 if (getenv('SKIP_SLOW_TESTS')) {
-	doe('skip: Slow test');
+    doe('skip: Slow test');
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/general_functions/proc_nice_variation5.phpt b/ext/standard/tests/general_functions/proc_nice_variation5.phpt
index 650b13c60c722..f4378a4d92b53 100644
--- a/ext/standard/tests/general_functions/proc_nice_variation5.phpt
+++ b/ext/standard/tests/general_functions/proc_nice_variation5.phpt
@@ -7,9 +7,9 @@ Michele Orselli (mo@ideato.it)
 Simone Gentili (sensorario@gmail.com)
 --SKIPIF--
 <?php
-	if(!function_exists('proc_nice')) die("skip. proc_nice not available ");
-	if(!function_exists('posix_geteuid')) die("skip. posix_geteuid not available ");
-	if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
+    if(!function_exists('proc_nice')) die("skip. proc_nice not available ");
+    if(!function_exists('posix_geteuid')) die("skip. posix_geteuid not available ");
+    if(posix_geteuid() == 0) print "skip - Cannot run test as root.";
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/general_functions/proc_open_sockets1.phpt b/ext/standard/tests/general_functions/proc_open_sockets1.phpt
index baecc44827bfe..acc8eee617fef 100644
--- a/ext/standard/tests/general_functions/proc_open_sockets1.phpt
+++ b/ext/standard/tests/general_functions/proc_open_sockets1.phpt
@@ -4,47 +4,47 @@ proc_open() with output socketpairs
 <?php
 
 $cmd = [
-	getenv("TEST_PHP_EXECUTABLE"),
-	__DIR__ . '/proc_open_sockets1.inc'
+    getenv("TEST_PHP_EXECUTABLE"),
+    __DIR__ . '/proc_open_sockets1.inc'
 ];
 
 $spec = [
-	['null'],
-	['socket'],
-	['socket']
+    ['null'],
+    ['socket'],
+    ['socket']
 ];
 
 $proc = proc_open($cmd, $spec, $pipes);
 
 foreach ($pipes as $pipe) {
-	var_dump(stream_set_blocking($pipe, false));
+    var_dump(stream_set_blocking($pipe, false));
 }
 
 while ($pipes) {
-	$r = $pipes;
-	$w = null;
-	$e = null;
-	
-	if (!stream_select($r, $w, $e, null, 0)) {
-		throw new Error("Select failed");
-	}
-	
-	foreach ($r as $i => $pipe) {
-		if (!is_resource($pipe) || feof($pipe)) {
-			unset($pipes[$i]);
-			continue;
-		}
-		
-		$chunk = @fread($pipe, 8192);
-		
-		if ($chunk === false) {
-			throw new Error("Failed to read: " . (error_get_last()['message'] ?? 'N/A'));
-		}
-		
-		if ($chunk !== '') {
-			echo "PIPE {$i} << {$chunk}\n";
-		}
-	}
+    $r = $pipes;
+    $w = null;
+    $e = null;
+
+    if (!stream_select($r, $w, $e, null, 0)) {
+        throw new Error("Select failed");
+    }
+
+    foreach ($r as $i => $pipe) {
+        if (!is_resource($pipe) || feof($pipe)) {
+            unset($pipes[$i]);
+            continue;
+        }
+
+        $chunk = @fread($pipe, 8192);
+
+        if ($chunk === false) {
+            throw new Error("Failed to read: " . (error_get_last()['message'] ?? 'N/A'));
+        }
+
+        if ($chunk !== '') {
+            echo "PIPE {$i} << {$chunk}\n";
+        }
+    }
 }
 
 ?>
diff --git a/ext/standard/tests/general_functions/proc_open_sockets2.phpt b/ext/standard/tests/general_functions/proc_open_sockets2.phpt
index 25f3153ec4874..7f9e1a85c54f6 100644
--- a/ext/standard/tests/general_functions/proc_open_sockets2.phpt
+++ b/ext/standard/tests/general_functions/proc_open_sockets2.phpt
@@ -5,49 +5,49 @@ proc_open() with IO socketpairs
 
 function poll($pipe, $read = true)
 {
-	$r = ($read == true) ? [$pipe] : null;
-	$w = ($read == false) ? [$pipe] : null;
-	$e = null;
-	
-	if (!stream_select($r, $w, $e, null, 0)) {
-		throw new \Error("Select failed");
-	}
+    $r = ($read == true) ? [$pipe] : null;
+    $w = ($read == false) ? [$pipe] : null;
+    $e = null;
+
+    if (!stream_select($r, $w, $e, null, 0)) {
+        throw new \Error("Select failed");
+    }
 }
 
 function read_pipe($pipe): string
 {
-	poll($pipe);
-	
-	if (false === ($chunk = @fread($pipe, 8192))) {
-		throw new Error("Failed to read: " . (error_get_last()['message'] ?? 'N/A'));
-	}
-	
-	return $chunk;
+    poll($pipe);
+
+    if (false === ($chunk = @fread($pipe, 8192))) {
+        throw new Error("Failed to read: " . (error_get_last()['message'] ?? 'N/A'));
+    }
+
+    return $chunk;
 }
 
 function write_pipe($pipe, $data)
 {
-	poll($pipe, false);
-	
-	if (false == @fwrite($pipe, $data)) {
-		throw new Error("Failed to write: " . (error_get_last()['message'] ?? 'N/A'));
-	}
+    poll($pipe, false);
+
+    if (false == @fwrite($pipe, $data)) {
+        throw new Error("Failed to write: " . (error_get_last()['message'] ?? 'N/A'));
+    }
 }
 
 $cmd = [
-	getenv("TEST_PHP_EXECUTABLE"),
-	__DIR__ . '/proc_open_sockets2.inc'
+    getenv("TEST_PHP_EXECUTABLE"),
+    __DIR__ . '/proc_open_sockets2.inc'
 ];
 
 $spec = [
-	['socket'],
-	['socket']
+    ['socket'],
+    ['socket']
 ];
 
 $proc = proc_open($cmd, $spec, $pipes);
 
 foreach ($pipes as $pipe) {
-	var_dump(stream_set_blocking($pipe, false));
+    var_dump(stream_set_blocking($pipe, false));
 }
 
 printf("STDOUT << %s\n", read_pipe($pipes[1]));
diff --git a/ext/standard/tests/general_functions/proc_open_sockets3.phpt b/ext/standard/tests/general_functions/proc_open_sockets3.phpt
index 5ee9e53b56b47..be2a3712382a3 100644
--- a/ext/standard/tests/general_functions/proc_open_sockets3.phpt
+++ b/ext/standard/tests/general_functions/proc_open_sockets3.phpt
@@ -5,34 +5,34 @@ proc_open() with socket and pipe
 
 function poll($pipe, $read = true)
 {
-	$r = ($read == true) ? [$pipe] : null;
-	$w = ($read == false) ? [$pipe] : null;
-	$e = null;
-	
-	if (!stream_select($r, $w, $e, null, 0)) {
-		throw new \Error("Select failed");
-	}
+    $r = ($read == true) ? [$pipe] : null;
+    $w = ($read == false) ? [$pipe] : null;
+    $e = null;
+
+    if (!stream_select($r, $w, $e, null, 0)) {
+        throw new \Error("Select failed");
+    }
 }
 
 function read_pipe($pipe): string
 {
-	poll($pipe);
-	
-	if (false === ($chunk = @fread($pipe, 8192))) {
-		throw new Error("Failed to read: " . (error_get_last()['message'] ?? 'N/A'));
-	}
-	
-	return $chunk;
+    poll($pipe);
+
+    if (false === ($chunk = @fread($pipe, 8192))) {
+        throw new Error("Failed to read: " . (error_get_last()['message'] ?? 'N/A'));
+    }
+
+    return $chunk;
 }
 
 $cmd = [
-	getenv("TEST_PHP_EXECUTABLE"),
-	__DIR__ . '/proc_open_sockets2.inc'
+    getenv("TEST_PHP_EXECUTABLE"),
+    __DIR__ . '/proc_open_sockets2.inc'
 ];
 
 $spec = [
-	['pipe', 'r'],
-	['socket']
+    ['pipe', 'r'],
+    ['socket']
 ];
 
 $proc = proc_open($cmd, $spec, $pipes);
diff --git a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt
index 9a92bef794135..9e963dd1ce495 100644
--- a/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt
+++ b/ext/standard/tests/general_functions/putenv_bug75574_cp936_win.phpt
@@ -7,7 +7,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
   die("skip Valid only on Windows");
 }
 if (!sapi_windows_cp_set(936)) {
-	die("skip Required CP 936 or compatible");
+    die("skip Required CP 936 or compatible");
 }
 
 ?>
diff --git a/ext/standard/tests/image/getimagesize.phpt b/ext/standard/tests/image/getimagesize.phpt
index ed32ac7c0e914..582959f3ae6ee 100644
--- a/ext/standard/tests/image/getimagesize.phpt
+++ b/ext/standard/tests/image/getimagesize.phpt
@@ -2,7 +2,7 @@
 GetImageSize()
 --SKIPIF--
 <?php
-	require_once('skipif_imagetype.inc');
+    require_once('skipif_imagetype.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/getimagesize_246x247.phpt b/ext/standard/tests/image/getimagesize_246x247.phpt
index 0e1290fcf25d9..c716ac3aebc08 100644
--- a/ext/standard/tests/image/getimagesize_246x247.phpt
+++ b/ext/standard/tests/image/getimagesize_246x247.phpt
@@ -2,7 +2,7 @@
 GetImageSize() with 246x247 pixels
 --SKIPIF--
 <?php
-	require_once('skipif_imagetype.inc');
+    require_once('skipif_imagetype.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/getimagesize_384x385.phpt b/ext/standard/tests/image/getimagesize_384x385.phpt
index cef9d73b3fd0a..57dc8a7192159 100644
--- a/ext/standard/tests/image/getimagesize_384x385.phpt
+++ b/ext/standard/tests/image/getimagesize_384x385.phpt
@@ -2,7 +2,7 @@
 GetImageSize() with 384x385 pixels
 --SKIPIF--
 <?php
-	require_once('skipif_imagetype.inc');
+    require_once('skipif_imagetype.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/getimagesize_swc.phpt b/ext/standard/tests/image/getimagesize_swc.phpt
index bba67d4f0995f..b5a0838eb655d 100644
--- a/ext/standard/tests/image/getimagesize_swc.phpt
+++ b/ext/standard/tests/image/getimagesize_swc.phpt
@@ -2,9 +2,9 @@
 GetImageSize() for compressed swf files
 --SKIPIF--
 <?php
-	if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
-		die("skip zlib extension is not available");
-	}
+    if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
+        die("skip zlib extension is not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/getimagesize_variation4.phpt b/ext/standard/tests/image/getimagesize_variation4.phpt
index fac3900417b8f..8ed39fc2ff5b3 100644
--- a/ext/standard/tests/image/getimagesize_variation4.phpt
+++ b/ext/standard/tests/image/getimagesize_variation4.phpt
@@ -2,9 +2,9 @@
 Test getimagesize() function : variation - For shockwave-flash format
 --SKIPIF--
 <?php
-	if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
-		die("skip zlib extension is not available");
-	}
+    if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
+        die("skip zlib extension is not available");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/getimagesize_variation_005.phpt b/ext/standard/tests/image/getimagesize_variation_005.phpt
index 503ed7657c735..d0c48f5112ce9 100644
--- a/ext/standard/tests/image/getimagesize_variation_005.phpt
+++ b/ext/standard/tests/image/getimagesize_variation_005.phpt
@@ -2,9 +2,9 @@
 Test getimagesize() function : basic functionality for shockwave-flash
 --SKIPIF--
 <?php
-	if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
-		die("skip zlib extension is not available or SWC not supported");
-	}
+    if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
+        die("skip zlib extension is not available or SWC not supported");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/image_type_to_mime_type.phpt b/ext/standard/tests/image/image_type_to_mime_type.phpt
index aff49ae58f21d..b4f6d3c403fa1 100644
--- a/ext/standard/tests/image/image_type_to_mime_type.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type.phpt
@@ -2,7 +2,7 @@
 image_type_to_mime_type()
 --SKIPIF--
 <?php
-	require_once('skipif_imagetype.inc');
+    require_once('skipif_imagetype.inc');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
index ca487e00a2beb..ed70dada183bd 100644
--- a/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
+++ b/ext/standard/tests/image/image_type_to_mime_type_variation4.phpt
@@ -2,9 +2,9 @@
 Test image_type_to_mime_type() function : usage variations - Passing IMAGETYPE_ICO and IMAGETYPE_SWC
 --SKIPIF--
 <?php
-	if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
-		die("skip zlib extension is not available or IMAGETYPE_SWC is not defined ");
-	}
+    if (!defined("IMAGETYPE_SWC") || !extension_loaded('zlib')) {
+        die("skip zlib extension is not available or IMAGETYPE_SWC is not defined ");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/math/bug25665.phpt b/ext/standard/tests/math/bug25665.phpt
index 120604aff2515..058562fffb641 100644
--- a/ext/standard/tests/math/bug25665.phpt
+++ b/ext/standard/tests/math/bug25665.phpt
@@ -2,8 +2,8 @@
 Bug #25665 (var_dump () hangs on Nan and INF)
 --SKIPIF--
 <?php
-	$OS = strtoupper(PHP_OS);
-	if ($OS == 'SUNOS' || $OS == 'SOLARIS') die("SKIP Solaris acos() returns wrong value");
+    $OS = strtoupper(PHP_OS);
+    if ($OS == 'SUNOS' || $OS == 'SOLARIS') die("SKIP Solaris acos() returns wrong value");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/inet_ipv6.phpt b/ext/standard/tests/network/inet_ipv6.phpt
index f78d4be7cc983..8e9c44431b9b5 100644
--- a/ext/standard/tests/network/inet_ipv6.phpt
+++ b/ext/standard/tests/network/inet_ipv6.phpt
@@ -7,7 +7,7 @@ if (!function_exists("inet_pton")) die("skip no inet_pton()");
 
 $packed = str_repeat(chr(0), 15) . chr(1);
 if (@inet_ntop($packed) === false) {
-	die("skip no IPv6 support");
+    die("skip no IPv6 support");
 }
 if (stristr(PHP_OS, "darwin") !== false) die("skip MacOS has broken inet_*() funcs");
 ?>
diff --git a/ext/standard/tests/network/shutdown.phpt b/ext/standard/tests/network/shutdown.phpt
index b8655cc1f487b..64373596a2756 100644
--- a/ext/standard/tests/network/shutdown.phpt
+++ b/ext/standard/tests/network/shutdown.phpt
@@ -2,7 +2,7 @@
 stream_socket_shutdown() test on IPv4 TCP Loopback
 --SKIPIF--
 <?php
-	function_exists('stream_socket_shutdown') or die('skip stream_socket_shutdown() is not supported.');
+    function_exists('stream_socket_shutdown') or die('skip stream_socket_shutdown() is not supported.');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/tcp6loop.phpt b/ext/standard/tests/network/tcp6loop.phpt
index 8322a0912de2a..e832c1e9c0271 100644
--- a/ext/standard/tests/network/tcp6loop.phpt
+++ b/ext/standard/tests/network/tcp6loop.phpt
@@ -2,13 +2,13 @@
 Streams Based IPv6 TCP Loopback test
 --SKIPIF--
 <?php
-	/* If IPv6 is supported on the platform this will error out with code 111 - Connection refused (or code 10049 on Windows).
-	   If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error)
-	   Note: Might be a good idea to export an IPv6 support indicator (such as AF_INET6 exported by ext/sockets) */
-	@stream_socket_client('tcp://[::1]:0', $errno);
-	if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
-		die('skip IPv6 is not supported.');
-	}
+    /* If IPv6 is supported on the platform this will error out with code 111 - Connection refused (or code 10049 on Windows).
+       If IPv6 is NOT supported, $errno will be set to something else (indicating parse/getaddrinfo error)
+       Note: Might be a good idea to export an IPv6 support indicator (such as AF_INET6 exported by ext/sockets) */
+    @stream_socket_client('tcp://[::1]:0', $errno);
+    if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
+        die('skip IPv6 is not supported.');
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/udgloop.phpt b/ext/standard/tests/network/udgloop.phpt
index 3a7e1bf267af8..21f3d2554fc41 100644
--- a/ext/standard/tests/network/udgloop.phpt
+++ b/ext/standard/tests/network/udgloop.phpt
@@ -2,8 +2,8 @@
 Streams Based Unix Domain Datagram Loopback test
 --SKIPIF--
 <?php
-	if (array_search("udg",stream_get_transports()) === false)
-		die('SKIP No support for UNIX domain sockets.');
+    if (array_search("udg",stream_get_transports()) === false)
+        die('SKIP No support for UNIX domain sockets.');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/udp6loop.phpt b/ext/standard/tests/network/udp6loop.phpt
index 533d9afb2ae47..5426d8b7e5ec1 100644
--- a/ext/standard/tests/network/udp6loop.phpt
+++ b/ext/standard/tests/network/udp6loop.phpt
@@ -2,19 +2,19 @@
 Streams Based IPv6 UDP Loopback test
 --SKIPIF--
 <?php
-	/* If IPv6 is supported on the platform this will error out with code 111 -
-	 * Connection refused (or code 10049 on Windows).  If IPv6 is NOT supported, $errno will be set to
-	 * something else (indicating parse/getaddrinfo error)
-	 * Note: Might be a good idea to export an IPv6 support indicator
-	 * (such as AF_INET6 exported by ext/sockets), however, since we
-	 * cannot tell for sure if IPv6 works until we probe it at run time,
-	 * this isn't really practical.
-   	 */
+    /* If IPv6 is supported on the platform this will error out with code 111 -
+     * Connection refused (or code 10049 on Windows).  If IPv6 is NOT supported, $errno will be set to
+     * something else (indicating parse/getaddrinfo error)
+     * Note: Might be a good idea to export an IPv6 support indicator
+     * (such as AF_INET6 exported by ext/sockets), however, since we
+     * cannot tell for sure if IPv6 works until we probe it at run time,
+     * this isn't really practical.
+     */
 
-	@stream_socket_client('tcp://[::1]:0', $errno);
-	if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
-		die('skip IPv6 is not supported.');
-	}
+    @stream_socket_client('tcp://[::1]:0', $errno);
+    if ((PHP_OS_FAMILY === 'Windows' && $errno !== 10049) || (PHP_OS_FAMILY !== 'Windows' && $errno !== 111)) {
+        die('skip IPv6 is not supported.');
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/unixloop.phpt b/ext/standard/tests/network/unixloop.phpt
index 4b5bde2262feb..1eaa64a87c8c7 100644
--- a/ext/standard/tests/network/unixloop.phpt
+++ b/ext/standard/tests/network/unixloop.phpt
@@ -2,8 +2,8 @@
 Streams Based Unix Domain Loopback test
 --SKIPIF--
 <?php
-	if (array_search("unix",stream_get_transports()) === false)
-		die('SKIP No support for UNIX domain sockets.');
+    if (array_search("unix",stream_get_transports()) === false)
+        die('SKIP No support for UNIX domain sockets.');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/serialize/bug26762.phpt b/ext/standard/tests/serialize/bug26762.phpt
index d4daf34464c59..33b2276a6cb69 100644
--- a/ext/standard/tests/serialize/bug26762.phpt
+++ b/ext/standard/tests/serialize/bug26762.phpt
@@ -2,7 +2,7 @@
 Bug #26762 (unserialize() produces lowercase classnames)
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root')) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root')) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/serialize/bug30234.phpt b/ext/standard/tests/serialize/bug30234.phpt
index 66e5aa3547fcc..c931ef189556f 100644
--- a/ext/standard/tests/serialize/bug30234.phpt
+++ b/ext/standard/tests/serialize/bug30234.phpt
@@ -2,7 +2,7 @@
 Bug #30234 (__autoload() not invoked for interfaces)
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/serialize/precision.phpt b/ext/standard/tests/serialize/precision.phpt
index c4679db4f1ec3..05305319d357a 100644
--- a/ext/standard/tests/serialize/precision.phpt
+++ b/ext/standard/tests/serialize/precision.phpt
@@ -3,7 +3,7 @@ Default precision is sufficient to serialize all the information in floats
 --SKIPIF--
 <?php
 if (pack('s', 1) != "\x01\x00")
-	die("skip test for little-endian architectures");
+    die("skip test for little-endian architectures");
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/streams/bug61371-unix.phpt b/ext/standard/tests/streams/bug61371-unix.phpt
index 20361095f6a19..e196c028cc941 100644
--- a/ext/standard/tests/streams/bug61371-unix.phpt
+++ b/ext/standard/tests/streams/bug61371-unix.phpt
@@ -3,7 +3,7 @@ Bug #61371: stream_context_create() causes memory leaks on use streams_socket_cr
 --SKIPIF--
 <?php
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
-	die('skip non windows test');
+    die('skip non windows test');
 }
 --FILE--
 <?php
diff --git a/ext/standard/tests/streams/bug64433.phpt b/ext/standard/tests/streams/bug64433.phpt
index ae8330292143a..56af2418375a8 100644
--- a/ext/standard/tests/streams/bug64433.phpt
+++ b/ext/standard/tests/streams/bug64433.phpt
@@ -3,10 +3,10 @@ Bug #60180 ($_SERVER["PHP_SELF"] incorrect)
 --SKIPIF--
 <?php
 if(!file_exists(__DIR__."/../../../../sapi/cli/tests/php_cli_server.inc"))
-	die("skip could not found cli server script");
+    die("skip could not found cli server script");
 $res = @include __DIR__."/../../../../sapi/cli/tests/php_cli_server.inc";
 if(!$res) {
-	die("skip could not open cli server script");
+    die("skip could not open cli server script");
 }
 ?>
 --CONFLICTS--
diff --git a/ext/standard/tests/streams/proc_open_bug51800.phpt b/ext/standard/tests/streams/proc_open_bug51800.phpt
index 7cf502edd8645..3ae96ca3dd1b6 100644
--- a/ext/standard/tests/streams/proc_open_bug51800.phpt
+++ b/ext/standard/tests/streams/proc_open_bug51800.phpt
@@ -2,10 +2,10 @@
 Bug #51800 proc_open on Windows hangs forever
 --SKIPIF--
 <?php
-	echo 'skip expected to fail or take too long';
-	if (getenv("SKIP_SLOW_TESTS")) {
-		die("skip slow test");
-	}
+    echo 'skip expected to fail or take too long';
+    if (getenv("SKIP_SLOW_TESTS")) {
+        die("skip slow test");
+    }
 ?>
 --XFAIL--
 pipes have to be read/written simultaneously
diff --git a/ext/standard/tests/strings/bug65769.phpt b/ext/standard/tests/strings/bug65769.phpt
index 31656ee60fe41..aedc303681f99 100644
--- a/ext/standard/tests/strings/bug65769.phpt
+++ b/ext/standard/tests/strings/bug65769.phpt
@@ -6,7 +6,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
     die('skip Windows only');
 }
 if (PHP_WINDOWS_VERSION_MAJOR < 10) {
-	die("skip for Windows 10 and above");
+    die("skip for Windows 10 and above");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/bug72663_2.phpt b/ext/standard/tests/strings/bug72663_2.phpt
index fc8978439013f..d0d7f81008597 100644
--- a/ext/standard/tests/strings/bug72663_2.phpt
+++ b/ext/standard/tests/strings/bug72663_2.phpt
@@ -3,7 +3,7 @@ Bug #72663: Create an Unexpected Object and Don't Invoke __wakeup() in Deseriali
 --SKIPIF--
 <?php
 if (!extension_loaded("session")) {
-	die("skip");
+    die("skip");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/htmlentities02.phpt b/ext/standard/tests/strings/htmlentities02.phpt
index 9e6a96e060985..e8d0b5b9f7459 100644
--- a/ext/standard/tests/strings/htmlentities02.phpt
+++ b/ext/standard/tests/strings/htmlentities02.phpt
@@ -4,7 +4,7 @@ htmlentities() test 2 (setlocale / fr_FR.ISO-8859-15)
 <?php
 $result = (bool)setlocale(LC_CTYPE, "fr_FR.ISO-8859-15", "fr_FR.ISO8859-15", 'fr_FR@euro');
 if (!$result) {
-	die("skip setlocale() failed\n");
+    die("skip setlocale() failed\n");
 }
 ?>
 --INI--
diff --git a/ext/standard/tests/strings/htmlentities03.phpt b/ext/standard/tests/strings/htmlentities03.phpt
index 484065341496d..973bafedbd3b4 100644
--- a/ext/standard/tests/strings/htmlentities03.phpt
+++ b/ext/standard/tests/strings/htmlentities03.phpt
@@ -4,7 +4,7 @@ htmlentities() test 3 (setlocale / de_DE.ISO-8859-1)
 <?php
 $result = (bool)setlocale(LC_CTYPE, "de_DE.ISO-8859-1", "de_DE.ISO8859-1");
 if (!$result || preg_match('/ISO/i', setlocale(LC_CTYPE, 0)) == 0) {
-	die("skip setlocale() failed\n");
+    die("skip setlocale() failed\n");
 }
 ?>
 --INI--
diff --git a/ext/standard/tests/strings/htmlentities05.phpt b/ext/standard/tests/strings/htmlentities05.phpt
index 04bf4deb00193..04dd756a3177a 100644
--- a/ext/standard/tests/strings/htmlentities05.phpt
+++ b/ext/standard/tests/strings/htmlentities05.phpt
@@ -5,7 +5,7 @@ output_handler=
 internal_encoding=cp1252
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 --FILE--
 <?php
     print mb_internal_encoding()."\n";
diff --git a/ext/standard/tests/strings/htmlentities06.phpt b/ext/standard/tests/strings/htmlentities06.phpt
index 487b5d33fffcc..9ecfa3cf4dd52 100644
--- a/ext/standard/tests/strings/htmlentities06.phpt
+++ b/ext/standard/tests/strings/htmlentities06.phpt
@@ -5,7 +5,7 @@ output_handler=
 internal_encoding=ISO-8859-15
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 --FILE--
 <?php
     mb_internal_encoding('ISO-8859-15');
diff --git a/ext/standard/tests/strings/htmlentities07.phpt b/ext/standard/tests/strings/htmlentities07.phpt
index 04e138e0c79fb..b69aeca861a15 100644
--- a/ext/standard/tests/strings/htmlentities07.phpt
+++ b/ext/standard/tests/strings/htmlentities07.phpt
@@ -5,7 +5,7 @@ output_handler=
 internal_encoding=ISO-8859-1
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 --FILE--
 <?php
     mb_internal_encoding('ISO-8859-1');
diff --git a/ext/standard/tests/strings/htmlentities08.phpt b/ext/standard/tests/strings/htmlentities08.phpt
index fdba4ede80dbf..3ec74996d5e54 100644
--- a/ext/standard/tests/strings/htmlentities08.phpt
+++ b/ext/standard/tests/strings/htmlentities08.phpt
@@ -5,7 +5,7 @@ output_handler=
 internal_encoding=EUC-JP
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 --FILE--
 <?php
     mb_internal_encoding('EUC-JP');
diff --git a/ext/standard/tests/strings/htmlentities09.phpt b/ext/standard/tests/strings/htmlentities09.phpt
index 6ca0a1e39e677..9d9576c5ea58a 100644
--- a/ext/standard/tests/strings/htmlentities09.phpt
+++ b/ext/standard/tests/strings/htmlentities09.phpt
@@ -5,7 +5,7 @@ output_handler=
 internal_encoding=Shift_JIS
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 --FILE--
 <?php
     mb_internal_encoding('Shift_JIS');
diff --git a/ext/standard/tests/strings/htmlentities16.phpt b/ext/standard/tests/strings/htmlentities16.phpt
index 1971f8340d931..6f2b2702427b9 100644
--- a/ext/standard/tests/strings/htmlentities16.phpt
+++ b/ext/standard/tests/strings/htmlentities16.phpt
@@ -5,7 +5,7 @@ output_handler=
 internal_encoding=cp1251
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/htmlentities25.phpt b/ext/standard/tests/strings/htmlentities25.phpt
index 7eef7ff356220..b7bfdfa1bf594 100644
--- a/ext/standard/tests/strings/htmlentities25.phpt
+++ b/ext/standard/tests/strings/htmlentities25.phpt
@@ -6,7 +6,7 @@ internal_encoding=
 mbstring.internal_encoding=ISO-8859-1
 --SKIPIF--
 <?php
-	extension_loaded("mbstring") or die("skip mbstring not available\n");
+    extension_loaded("mbstring") or die("skip mbstring not available\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/pack.phpt b/ext/standard/tests/strings/pack.phpt
index 97a6a687c56ee..af449266671da 100644
--- a/ext/standard/tests/strings/pack.phpt
+++ b/ext/standard/tests/strings/pack.phpt
@@ -3,7 +3,7 @@ Generic pack()/unpack() tests
 --SKIPIF--
 <?php
 if (PHP_INT_MAX > 2147483647) {
-	die("skip 32bit test only");
+    die("skip 32bit test only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/pack64.phpt b/ext/standard/tests/strings/pack64.phpt
index cccdc1ba6e5f3..753821f654299 100644
--- a/ext/standard/tests/strings/pack64.phpt
+++ b/ext/standard/tests/strings/pack64.phpt
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE < 8) {
-	die("skip 64bit test only");
+    die("skip 64bit test only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/pack64_32.phpt b/ext/standard/tests/strings/pack64_32.phpt
index f52de63ca463d..978e04449de61 100644
--- a/ext/standard/tests/strings/pack64_32.phpt
+++ b/ext/standard/tests/strings/pack64_32.phpt
@@ -3,7 +3,7 @@
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE > 4) {
-	die("skip 32bit test only");
+    die("skip 32bit test only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/printf_basic7.phpt b/ext/standard/tests/strings/printf_basic7.phpt
index 19c1f42104782..b7218cd7de062 100644
--- a/ext/standard/tests/strings/printf_basic7.phpt
+++ b/ext/standard/tests/strings/printf_basic7.phpt
@@ -3,7 +3,7 @@ Test printf() function : basic functionality - unsigned format
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/printf_basic8.phpt b/ext/standard/tests/strings/printf_basic8.phpt
index 800d6cc1e77aa..395972ba96c23 100644
--- a/ext/standard/tests/strings/printf_basic8.phpt
+++ b/ext/standard/tests/strings/printf_basic8.phpt
@@ -3,7 +3,7 @@ Test printf() function : basic functionality - octal format
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/sprintf_basic7.phpt b/ext/standard/tests/strings/sprintf_basic7.phpt
index 63cf1975bb686..77765aaf52e8c 100644
--- a/ext/standard/tests/strings/sprintf_basic7.phpt
+++ b/ext/standard/tests/strings/sprintf_basic7.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - unsigned format
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/sprintf_basic8.phpt b/ext/standard/tests/strings/sprintf_basic8.phpt
index 5c8cdb5d5a0d4..e9696db27b161 100644
--- a/ext/standard/tests/strings/sprintf_basic8.phpt
+++ b/ext/standard/tests/strings/sprintf_basic8.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : basic functionality - octal format
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/sprintf_variation28.phpt b/ext/standard/tests/strings/sprintf_variation28.phpt
index 53c6bd015f07f..4903d3ed154e6 100644
--- a/ext/standard/tests/strings/sprintf_variation28.phpt
+++ b/ext/standard/tests/strings/sprintf_variation28.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - octal formats with integer values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/sprintf_variation34.phpt b/ext/standard/tests/strings/sprintf_variation34.phpt
index a02f5cda6e5ab..c7ff681f57504 100644
--- a/ext/standard/tests/strings/sprintf_variation34.phpt
+++ b/ext/standard/tests/strings/sprintf_variation34.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - hexa formats with integer values
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/sprintf_variation40.phpt b/ext/standard/tests/strings/sprintf_variation40.phpt
index 9b3890f15df0e..3bec553dd862a 100644
--- a/ext/standard/tests/strings/sprintf_variation40.phpt
+++ b/ext/standard/tests/strings/sprintf_variation40.phpt
@@ -3,7 +3,7 @@ Test sprintf() function : usage variations - unsigned formats with integer value
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	    die("skip this test is for 32bit platform only");
+        die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/strings/sscanf_basic6.phpt b/ext/standard/tests/strings/sscanf_basic6.phpt
index dad84c3e6331f..5aec9c094089f 100644
--- a/ext/standard/tests/strings/sscanf_basic6.phpt
+++ b/ext/standard/tests/strings/sscanf_basic6.phpt
@@ -3,7 +3,7 @@ Test sscanf() function : basic functionality - unsigned format
 --SKIPIF--
 <?php
 if (PHP_INT_SIZE != 4) {
-	die("skip this test is for 32bit platform only");
+    die("skip this test is for 32bit platform only");
 }
 ?>
 --FILE--
diff --git a/ext/standard/tests/time/001.phpt b/ext/standard/tests/time/001.phpt
index 34b87157f2243..afd32375bb828 100644
--- a/ext/standard/tests/time/001.phpt
+++ b/ext/standard/tests/time/001.phpt
@@ -2,7 +2,7 @@
 microtime() function
 --SKIPIF--
 <?php
-	if (!function_exists('microtime'))  die('skip microtime() not available');
+    if (!function_exists('microtime'))  die('skip microtime() not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/time/strptime_error.phpt b/ext/standard/tests/time/strptime_error.phpt
index c71ee0b465dd0..adbb8922f51b7 100644
--- a/ext/standard/tests/time/strptime_error.phpt
+++ b/ext/standard/tests/time/strptime_error.phpt
@@ -3,7 +3,7 @@ Test localtime() function : error conditions
 --SKIPIF--
 <?php
 if (!function_exists('strptime')) {
-	echo "SKIP strptime function not available in build";
+    echo "SKIP strptime function not available in build";
 }
 ?>
 --FILE--
diff --git a/ext/sysvsem/tests/nowait.phpt b/ext/sysvsem/tests/nowait.phpt
index b52d2d7e20f4f..ef2ba56cbb5b6 100644
--- a/ext/sysvsem/tests/nowait.phpt
+++ b/ext/sysvsem/tests/nowait.phpt
@@ -3,7 +3,7 @@ Test sem_acquire with nowait option
 --SKIPIF--
 <?php
 if(!extension_loaded('sysvsem') || !extension_loaded('pcntl')) {
-	die("skip sysvsem and pcntl required");
+    die("skip sysvsem and pcntl required");
 }
 ?>
 --FILE--
diff --git a/ext/sysvsem/tests/sysv.phpt b/ext/sysvsem/tests/sysv.phpt
index 14270ee608fa9..0ed7b8a76853b 100644
--- a/ext/sysvsem/tests/sysv.phpt
+++ b/ext/sysvsem/tests/sysv.phpt
@@ -3,7 +3,7 @@ General semaphore and shared memory test
 --SKIPIF--
 <?php
 if(!extension_loaded('sysvsem') || !extension_loaded('sysvshm')) {
-	die("skip Both sysvsem and sysvshm required");
+    die("skip Both sysvsem and sysvshm required");
 }
 ?>
 --FILE--
diff --git a/ext/xml/tests/bug32001.phpt b/ext/xml/tests/bug32001.phpt
index 5ced12894020e..410a2f62ffec6 100644
--- a/ext/xml/tests/bug32001.phpt
+++ b/ext/xml/tests/bug32001.phpt
@@ -5,7 +5,7 @@ Bug #32001 (xml_parse*() goes into infinite loop when autodetection in effect),
 require_once("skipif.inc");
 if (!extension_loaded('iconv')) die ("skip iconv extension not available");
 if (ICONV_IMPL == 'glibc' && version_compare(ICONV_VERSION, '2.12', '<='))
-	die("skip iconv of glibc <= 2.12 is buggy");
+    die("skip iconv of glibc <= 2.12 is buggy");
 ?>
 --FILE--
 <?php
diff --git a/ext/xml/tests/xml007.phpt b/ext/xml/tests/xml007.phpt
index 5b76dfc848c12..6389c7fa6e659 100644
--- a/ext/xml/tests/xml007.phpt
+++ b/ext/xml/tests/xml007.phpt
@@ -5,7 +5,7 @@ xml_parse_into_struct/umlauts in tags
 include("skipif.inc");
 if(strtoupper("äöüß") != "ÄÖÜß")
 {
-	die("skip strtoupper on non-ascii not supported on this platform");
+    die("skip strtoupper on non-ascii not supported on this platform");
 }
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml_parse_into_struct_variation.phpt b/ext/xml/tests/xml_parse_into_struct_variation.phpt
index 3f980495676f7..a03b86ac8ae6b 100644
--- a/ext/xml/tests/xml_parse_into_struct_variation.phpt
+++ b/ext/xml/tests/xml_parse_into_struct_variation.phpt
@@ -3,7 +3,7 @@ Test xml_parse_into_struct() function : variation
 --SKIPIF--
 <?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded";
+    print "skip - XML extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml_parser_set_option_basic.phpt b/ext/xml/tests/xml_parser_set_option_basic.phpt
index 7d398dfd7014e..cae9ed71466f5 100644
--- a/ext/xml/tests/xml_parser_set_option_basic.phpt
+++ b/ext/xml/tests/xml_parser_set_option_basic.phpt
@@ -3,7 +3,7 @@ Test xml_set_notation_decl_handler function : basic
 --SKIPIF--
 <?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded";
+    print "skip - XML extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/xml/tests/xml_parser_set_option_variation3.phpt b/ext/xml/tests/xml_parser_set_option_variation3.phpt
index 592c9f52e80bc..d1163de356e0b 100644
--- a/ext/xml/tests/xml_parser_set_option_variation3.phpt
+++ b/ext/xml/tests/xml_parser_set_option_variation3.phpt
@@ -3,7 +3,7 @@ Test xml_parser_set_option() function : usage variations
 --SKIPIF--
 <?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded";
+    print "skip - XML extension not loaded";
 }
 ?>
 --FILE--
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 6ceaea63d0914..aa37b84a5560c 100644
--- a/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_notation_decl_handler_basic.phpt
@@ -3,7 +3,7 @@ Test xml_set_notation_decl_handler function : basic
 --SKIPIF--
 <?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded";
+    print "skip - XML extension not loaded";
 }
 ?>
 --FILE--
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 54a71fd48c771..dc9efe278b969 100644
--- a/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
+++ b/ext/xml/tests/xml_set_processing_instruction_handler_basic.phpt
@@ -3,7 +3,7 @@ Test xml_set_processing_instruction_handler function : basic
 --SKIPIF--
 <?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded";
+    print "skip - XML extension not loaded";
 }
 ?>
 --FILE--
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 6a783f6cfcd71..ba27eec9f5f94 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
@@ -3,7 +3,7 @@ Test xml_set_start_namespace_decl_handler function: basic
 --SKIPIF--
 <?php
 if (!extension_loaded("xml")) {
-	print "skip - XML extension not loaded";
+    print "skip - XML extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/xmlwriter/tests/bug79029.phpt b/ext/xmlwriter/tests/bug79029.phpt
index b6b0c84b182d0..2e6f70dc0ab22 100644
--- a/ext/xmlwriter/tests/bug79029.phpt
+++ b/ext/xmlwriter/tests/bug79029.phpt
@@ -1,7 +1,7 @@
 --TEST--
 #79029 (Use After Free's in XMLReader / XMLWriter)
 --SKIPIF--
-<?php 
+<?php
 if (!extension_loaded("xmlwriter")) print "skip xmlwriter extension not available";
 if (!extension_loaded("xmlreader")) print "skip xmlreader extension not available";
 ?>
diff --git a/ext/xsl/tests/xsl-phpinfo.phpt b/ext/xsl/tests/xsl-phpinfo.phpt
index 5f830356b7410..2119181a5b44d 100644
--- a/ext/xsl/tests/xsl-phpinfo.phpt
+++ b/ext/xsl/tests/xsl-phpinfo.phpt
@@ -2,9 +2,9 @@
 Test phpinfo() displays xsl info
 --SKIPIF--
 <?php
-	if (!extension_loaded("xsl")) {
-		die("SKIP extension gettext not loaded\n");
-	}
+    if (!extension_loaded("xsl")) {
+        die("SKIP extension gettext not loaded\n");
+    }
 ?>
 --FILE--
 <?php
diff --git a/ext/xsl/tests/xslt008-mb.phpt b/ext/xsl/tests/xslt008-mb.phpt
index a10b13a580432..d9b072098dc75 100644
--- a/ext/xsl/tests/xslt008-mb.phpt
+++ b/ext/xsl/tests/xslt008-mb.phpt
@@ -2,8 +2,8 @@
 Test 8: Stream Wrapper Includes
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	if (!extension_loaded('zlib')) die('skip zlib extension not available');
+    require_once __DIR__ .'/skipif.inc';
+    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/xsl/tests/xslt008.phpt b/ext/xsl/tests/xslt008.phpt
index 4446045198b46..c2268312e1fad 100644
--- a/ext/xsl/tests/xslt008.phpt
+++ b/ext/xsl/tests/xslt008.phpt
@@ -2,8 +2,8 @@
 Test 8: Stream Wrapper Includes
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	if (!extension_loaded('zlib')) die('skip zlib extension not available');
+    require_once __DIR__ .'/skipif.inc';
+    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/xsl/tests/xslt009.phpt b/ext/xsl/tests/xslt009.phpt
index 25f8f6896f8ec..05d5b5883ffb4 100644
--- a/ext/xsl/tests/xslt009.phpt
+++ b/ext/xsl/tests/xslt009.phpt
@@ -2,8 +2,8 @@
 Test 9: Stream Wrapper XPath-Document()
 --SKIPIF--
 <?php
-	require_once __DIR__ .'/skipif.inc';
-	if (!extension_loaded('zlib')) die('skip zlib extension not available');
+    require_once __DIR__ .'/skipif.inc';
+    if (!extension_loaded('zlib')) die('skip zlib extension not available');
 ?>
 --FILE--
 <?php
diff --git a/ext/zend_test/tests/observer_generator_04.phpt b/ext/zend_test/tests/observer_generator_04.phpt
index 6c2f18207783d..bf6b4e6c6947b 100644
--- a/ext/zend_test/tests/observer_generator_04.phpt
+++ b/ext/zend_test/tests/observer_generator_04.phpt
@@ -18,7 +18,7 @@ function fooResults() {
 
 function doSomething() {
     $generator = fooResults();
-    
+
     while($generator->current() !== NULL) {
         echo $generator->current() . PHP_EOL;
         if ($generator->current() === 5) {
diff --git a/ext/zip/tests/bug51353.phpt b/ext/zip/tests/bug51353.phpt
index ab021f4715944..3a4e74a07c806 100644
--- a/ext/zip/tests/bug51353.phpt
+++ b/ext/zip/tests/bug51353.phpt
@@ -46,7 +46,7 @@ unlink("$base_path/51353.zip");
 
 $a = glob("$base_path/51353_unpack/*.txt");
 foreach($a as $f) {
-	unlink($f);
+    unlink($f);
 }
 rmdir("$base_path/51353_unpack");
 ?>
diff --git a/ext/zip/tests/bug64342_0.phpt b/ext/zip/tests/bug64342_0.phpt
index d187175cd9f98..43f60f5d7c566 100644
--- a/ext/zip/tests/bug64342_0.phpt
+++ b/ext/zip/tests/bug64342_0.phpt
@@ -2,7 +2,7 @@
 Bug #64342 ZipArchive::addFile() has to check file existence (variation 1)
 --SKIPIF--
 <?php
-	if(!extension_loaded('zip')) die('skip');
+    if(!extension_loaded('zip')) die('skip');
 ?>
 --FILE--
 <?php
diff --git a/ext/zlib/tests/bug55544-win.phpt b/ext/zlib/tests/bug55544-win.phpt
index 3f9843fc45dc0..9bbfef5f7fd41 100644
Binary files a/ext/zlib/tests/bug55544-win.phpt and b/ext/zlib/tests/bug55544-win.phpt differ
diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt
index e650fe6909f55..b5041cedc566f 100644
Binary files a/ext/zlib/tests/bug55544.phpt and b/ext/zlib/tests/bug55544.phpt differ
diff --git a/ext/zlib/tests/bug61139.phpt b/ext/zlib/tests/bug61139.phpt
index ab7c74e9ccf7c..646396c04199d 100644
--- a/ext/zlib/tests/bug61139.phpt
+++ b/ext/zlib/tests/bug61139.phpt
@@ -3,7 +3,7 @@ Bug #61139 (gzopen leaks when specifying invalid mode)
 --SKIPIF--
 <?php
 if (!extension_loaded('zlib')) {
-	die('skip - zlib extension not loaded');
+    die('skip - zlib extension not loaded');
 }
 ?>
 --FILE--
@@ -12,7 +12,7 @@ if (!extension_loaded('zlib')) {
 gzopen('someFile', 'c');
 --CLEAN--
 <?php
-	unlink('someFile');
+    unlink('someFile');
 ?>
 --EXPECTF--
 Warning: gzopen(): gzopen failed in %s on line %d
diff --git a/ext/zlib/tests/gzclose_basic.phpt b/ext/zlib/tests/gzclose_basic.phpt
index f3387de09cee5..1f72fc1c88469 100644
--- a/ext/zlib/tests/gzclose_basic.phpt
+++ b/ext/zlib/tests/gzclose_basic.phpt
@@ -3,7 +3,7 @@ Test function gzclose() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt
index 3a8ee949bc4a7..a5d27359274e3 100644
--- a/ext/zlib/tests/gzcompress_basic1.phpt
+++ b/ext/zlib/tests/gzcompress_basic1.phpt
@@ -3,7 +3,7 @@ Test gzcompress() function : basic functionality
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzcompress_error1.phpt b/ext/zlib/tests/gzcompress_error1.phpt
index e559030151dc2..ff09d6568affc 100644
--- a/ext/zlib/tests/gzcompress_error1.phpt
+++ b/ext/zlib/tests/gzcompress_error1.phpt
@@ -3,7 +3,7 @@ Test gzcompress() function : error conditions
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzcompress_variation1.phpt b/ext/zlib/tests/gzcompress_variation1.phpt
index e3cc8e846beee..762aa3c870d63 100644
--- a/ext/zlib/tests/gzcompress_variation1.phpt
+++ b/ext/zlib/tests/gzcompress_variation1.phpt
@@ -3,7 +3,7 @@ Test gzcompress() function : variation
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt
index 5257e4db6c537..7ace99a8a7e2f 100644
--- a/ext/zlib/tests/gzdeflate_basic1.phpt
+++ b/ext/zlib/tests/gzdeflate_basic1.phpt
@@ -3,7 +3,7 @@ Test gzdeflate() function : basic functionality
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzdeflate_error1.phpt b/ext/zlib/tests/gzdeflate_error1.phpt
index fbcb2d95f317c..fea4dfec002a7 100644
--- a/ext/zlib/tests/gzdeflate_error1.phpt
+++ b/ext/zlib/tests/gzdeflate_error1.phpt
@@ -3,7 +3,7 @@ Test gzdeflate() function : error conditions
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzdeflate_variation1.phpt b/ext/zlib/tests/gzdeflate_variation1.phpt
index 3058b1d9008f4..e881d77b5102c 100644
--- a/ext/zlib/tests/gzdeflate_variation1.phpt
+++ b/ext/zlib/tests/gzdeflate_variation1.phpt
@@ -3,7 +3,7 @@ Test gzdeflate() function : variation
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzencode_basic1.phpt b/ext/zlib/tests/gzencode_basic1.phpt
index 927e0406db246..b129399dfd7ae 100644
--- a/ext/zlib/tests/gzencode_basic1.phpt
+++ b/ext/zlib/tests/gzencode_basic1.phpt
@@ -3,7 +3,7 @@ Test gzencode() function : basic functionality
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzencode_error1.phpt b/ext/zlib/tests/gzencode_error1.phpt
index 5d850e5438af7..951437b98a085 100644
--- a/ext/zlib/tests/gzencode_error1.phpt
+++ b/ext/zlib/tests/gzencode_error1.phpt
@@ -3,7 +3,7 @@ Test gzencode() function : error conditions
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzencode_variation1-win32.phpt b/ext/zlib/tests/gzencode_variation1-win32.phpt
index 7272b4e7dc582..f7870e890fa55 100644
--- a/ext/zlib/tests/gzencode_variation1-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation1-win32.phpt
@@ -8,7 +8,7 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) {
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzencode_variation1.phpt b/ext/zlib/tests/gzencode_variation1.phpt
index 625745629872c..b3987b9d205fa 100644
--- a/ext/zlib/tests/gzencode_variation1.phpt
+++ b/ext/zlib/tests/gzencode_variation1.phpt
@@ -8,7 +8,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 
 if (PHP_OS == "Darwin") {
diff --git a/ext/zlib/tests/gzencode_variation2-win32.phpt b/ext/zlib/tests/gzencode_variation2-win32.phpt
index 5ad5a1cdc424e..727a079b61275 100644
--- a/ext/zlib/tests/gzencode_variation2-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation2-win32.phpt
@@ -8,12 +8,12 @@ if( substr(PHP_OS, 0, 3) != "WIN" ) {
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 
 include 'func.inc';
 if (version_compare(get_zlib_version(), "1.2.11") < 0) {
-	die("skip - at least zlib 1.2.11 required, got " . get_zlib_version());
+    die("skip - at least zlib 1.2.11 required, got " . get_zlib_version());
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzencode_variation2.phpt b/ext/zlib/tests/gzencode_variation2.phpt
index d5c0844006908..f1e3c0d2baba2 100644
--- a/ext/zlib/tests/gzencode_variation2.phpt
+++ b/ext/zlib/tests/gzencode_variation2.phpt
@@ -8,7 +8,7 @@ if( substr(PHP_OS, 0, 3) == "WIN" ) {
 }
 
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 
 if (PHP_OS == "Darwin") {
diff --git a/ext/zlib/tests/gzeof_basic.phpt b/ext/zlib/tests/gzeof_basic.phpt
index c159819d76b4e..f92450d22b98c 100644
--- a/ext/zlib/tests/gzeof_basic.phpt
+++ b/ext/zlib/tests/gzeof_basic.phpt
@@ -3,7 +3,7 @@ Test function feof() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzeof_variation1.phpt b/ext/zlib/tests/gzeof_variation1.phpt
index 2dded2ca1a4ab..3be013facfa04 100644
--- a/ext/zlib/tests/gzeof_variation1.phpt
+++ b/ext/zlib/tests/gzeof_variation1.phpt
@@ -3,7 +3,7 @@ Test function gzeof while writing.
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzfile_variation15.phpt b/ext/zlib/tests/gzfile_variation15.phpt
index 01958214bcb00..7fb103b3ecc9f 100644
--- a/ext/zlib/tests/gzfile_variation15.phpt
+++ b/ext/zlib/tests/gzfile_variation15.phpt
@@ -3,7 +3,7 @@ Test gzfile() function : variation: use include path (relative directories in pa
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzgetc_basic.phpt b/ext/zlib/tests/gzgetc_basic.phpt
index c9b7fcf6159be..5eff9b6d5df8c 100644
--- a/ext/zlib/tests/gzgetc_basic.phpt
+++ b/ext/zlib/tests/gzgetc_basic.phpt
@@ -3,11 +3,11 @@ Test function gzgetc() by calling it with its expected arguments zlib 1.2.5
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 include 'func.inc';
 if (version_compare(get_zlib_version(), '1.2.5') > 0) {
-	die('skip - only for zlib <= 1.2.5');
+    die('skip - only for zlib <= 1.2.5');
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzgetc_basic_1.phpt b/ext/zlib/tests/gzgetc_basic_1.phpt
index b2a1a056af68b..49e4ab8f6becf 100644
--- a/ext/zlib/tests/gzgetc_basic_1.phpt
+++ b/ext/zlib/tests/gzgetc_basic_1.phpt
@@ -3,11 +3,11 @@ Test function gzgetc() by calling it with its expected arguments zlib 1.2.7
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 include 'func.inc';
 if (version_compare(get_zlib_version(), '1.2.7') < 0) {
-	die('skip - only for zlib >= 1.2.7');
+    die('skip - only for zlib >= 1.2.7');
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzgets_basic.phpt b/ext/zlib/tests/gzgets_basic.phpt
index 80ef741423142..4f4e908645d65 100644
--- a/ext/zlib/tests/gzgets_basic.phpt
+++ b/ext/zlib/tests/gzgets_basic.phpt
@@ -3,7 +3,7 @@ Test function gzgets() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzinflate_error1.phpt b/ext/zlib/tests/gzinflate_error1.phpt
index 2ddb3adb6b9fc..67f2aa438bce7 100644
--- a/ext/zlib/tests/gzinflate_error1.phpt
+++ b/ext/zlib/tests/gzinflate_error1.phpt
@@ -3,7 +3,7 @@ Test gzinflate() function : error conditions
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_basic.phpt b/ext/zlib/tests/gzopen_basic.phpt
index a1768e8e00584..cbb4174f9fe00 100644
--- a/ext/zlib/tests/gzopen_basic.phpt
+++ b/ext/zlib/tests/gzopen_basic.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : basic functionality
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt
index 2b5a9c61d1604..5814b5168f377 100644
--- a/ext/zlib/tests/gzopen_basic2.phpt
+++ b/ext/zlib/tests/gzopen_basic2.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : basic functionality for writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt
index 3fe924a282fc0..6505306c4534e 100644
--- a/ext/zlib/tests/gzopen_variation4.phpt
+++ b/ext/zlib/tests/gzopen_variation4.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : variation: use include path (relative directories in pa
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation5.phpt b/ext/zlib/tests/gzopen_variation5.phpt
index a1cf48ba18ed0..e06c358d80d90 100644
--- a/ext/zlib/tests/gzopen_variation5.phpt
+++ b/ext/zlib/tests/gzopen_variation5.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : variation: use include path and stream context create a
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation6.phpt b/ext/zlib/tests/gzopen_variation6.phpt
index 631314818fcdd..16b266db65a5e 100644
--- a/ext/zlib/tests/gzopen_variation6.phpt
+++ b/ext/zlib/tests/gzopen_variation6.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : variation: relative/absolute file
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation7.phpt b/ext/zlib/tests/gzopen_variation7.phpt
index f3ba9a4fbc50e..7eef44a702bdc 100644
--- a/ext/zlib/tests/gzopen_variation7.phpt
+++ b/ext/zlib/tests/gzopen_variation7.phpt
@@ -3,7 +3,7 @@ Test function gzopen() by calling it twice on the same file and not closing one
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation8.phpt b/ext/zlib/tests/gzopen_variation8.phpt
index 1885a048d6807..b2b12276ebd25 100644
--- a/ext/zlib/tests/gzopen_variation8.phpt
+++ b/ext/zlib/tests/gzopen_variation8.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : variation: opening a plain file
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt
index 91e2a4297657f..b8b895a92d524 100644
--- a/ext/zlib/tests/gzopen_variation9.phpt
+++ b/ext/zlib/tests/gzopen_variation9.phpt
@@ -3,7 +3,7 @@ Test gzopen() function : variation: try opening with possibly invalid modes
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzpassthru_basic.phpt b/ext/zlib/tests/gzpassthru_basic.phpt
index 5606114bc3d8b..4ca2780b41355 100644
--- a/ext/zlib/tests/gzpassthru_basic.phpt
+++ b/ext/zlib/tests/gzpassthru_basic.phpt
@@ -3,7 +3,7 @@ Test function gzpassthru() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzputs_basic.phpt b/ext/zlib/tests/gzputs_basic.phpt
index e1414d2504e55..6fd4d0748de63 100644
--- a/ext/zlib/tests/gzputs_basic.phpt
+++ b/ext/zlib/tests/gzputs_basic.phpt
@@ -3,7 +3,7 @@ Test function gzputs() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzread_basic.phpt b/ext/zlib/tests/gzread_basic.phpt
index 1b66d85fc10cc..356eb2c845049 100644
--- a/ext/zlib/tests/gzread_basic.phpt
+++ b/ext/zlib/tests/gzread_basic.phpt
@@ -3,7 +3,7 @@ Test function gzread() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzread_error2.phpt b/ext/zlib/tests/gzread_error2.phpt
index ff0dfe80289fe..0b4c4d13fcbc6 100644
--- a/ext/zlib/tests/gzread_error2.phpt
+++ b/ext/zlib/tests/gzread_error2.phpt
@@ -3,7 +3,7 @@ Test function gzread() by calling it invalid lengths
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzread_variation1.phpt b/ext/zlib/tests/gzread_variation1.phpt
index bc9eee4f94681..f5968e28ad233 100644
--- a/ext/zlib/tests/gzread_variation1.phpt
+++ b/ext/zlib/tests/gzread_variation1.phpt
@@ -3,7 +3,7 @@ Test function gzread() by calling it while file open for writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzrewind_basic.phpt b/ext/zlib/tests/gzrewind_basic.phpt
index 988e10a36622e..ffed16d4e9167 100644
--- a/ext/zlib/tests/gzrewind_basic.phpt
+++ b/ext/zlib/tests/gzrewind_basic.phpt
@@ -3,7 +3,7 @@ Test function gzrewind() by calling it with its expected arguments when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzrewind_basic2.phpt b/ext/zlib/tests/gzrewind_basic2.phpt
index d1a2d296fc33d..1522750c5ba21 100644
--- a/ext/zlib/tests/gzrewind_basic2.phpt
+++ b/ext/zlib/tests/gzrewind_basic2.phpt
@@ -3,7 +3,7 @@ Test function gzrewind() by calling it with its expected arguments when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzrewind_variation1.phpt b/ext/zlib/tests/gzrewind_variation1.phpt
index 1704771679e77..0b2053993d96a 100644
--- a/ext/zlib/tests/gzrewind_variation1.phpt
+++ b/ext/zlib/tests/gzrewind_variation1.phpt
@@ -3,7 +3,7 @@ Test function gzrewind() by calling it with its expected arguments when writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_basic.phpt b/ext/zlib/tests/gzseek_basic.phpt
index 2cc13595591eb..9a835f8df5b3c 100644
--- a/ext/zlib/tests/gzseek_basic.phpt
+++ b/ext/zlib/tests/gzseek_basic.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with its expected arguments when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_basic2.phpt b/ext/zlib/tests/gzseek_basic2.phpt
index a463d607f1815..c9d60ebcfd3a7 100644
--- a/ext/zlib/tests/gzseek_basic2.phpt
+++ b/ext/zlib/tests/gzseek_basic2.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with its expected arguments when writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation1.phpt b/ext/zlib/tests/gzseek_variation1.phpt
index 81fe035987915..e5dcefc9bb065 100644
--- a/ext/zlib/tests/gzseek_variation1.phpt
+++ b/ext/zlib/tests/gzseek_variation1.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by seeking forward in write mode
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation2.phpt b/ext/zlib/tests/gzseek_variation2.phpt
index 56b4fa9ec132d..50ad28f36fea1 100644
--- a/ext/zlib/tests/gzseek_variation2.phpt
+++ b/ext/zlib/tests/gzseek_variation2.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with SEEK_SET when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation3.phpt b/ext/zlib/tests/gzseek_variation3.phpt
index 77e0e33e019d6..0ba9eb68eaf0d 100644
--- a/ext/zlib/tests/gzseek_variation3.phpt
+++ b/ext/zlib/tests/gzseek_variation3.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with SEEK_CUR when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation4.phpt b/ext/zlib/tests/gzseek_variation4.phpt
index 09e38cd33d6da..2850efa7d64c8 100644
--- a/ext/zlib/tests/gzseek_variation4.phpt
+++ b/ext/zlib/tests/gzseek_variation4.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with SEEK_SET when writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation5.phpt b/ext/zlib/tests/gzseek_variation5.phpt
index e59a3fb88d7ba..41d5c777a6883 100644
--- a/ext/zlib/tests/gzseek_variation5.phpt
+++ b/ext/zlib/tests/gzseek_variation5.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with SEEK_CUR when writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation6.phpt b/ext/zlib/tests/gzseek_variation6.phpt
index e7f49f5fd72f8..1c2e6de562ba7 100644
--- a/ext/zlib/tests/gzseek_variation6.phpt
+++ b/ext/zlib/tests/gzseek_variation6.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with SEEK_END when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzseek_variation7.phpt b/ext/zlib/tests/gzseek_variation7.phpt
index 67c0ecf074db9..1198e56ced57b 100644
--- a/ext/zlib/tests/gzseek_variation7.phpt
+++ b/ext/zlib/tests/gzseek_variation7.phpt
@@ -3,7 +3,7 @@ Test function gzseek() by calling it with SEEK_END when writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gztell_basic.phpt b/ext/zlib/tests/gztell_basic.phpt
index acd0829360bb8..063bae63bb6a2 100644
--- a/ext/zlib/tests/gztell_basic.phpt
+++ b/ext/zlib/tests/gztell_basic.phpt
@@ -3,7 +3,7 @@ Test function gztell() by calling it with its expected arguments when reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gztell_basic2.phpt b/ext/zlib/tests/gztell_basic2.phpt
index 13ac183d46519..b9d9eb083738d 100644
--- a/ext/zlib/tests/gztell_basic2.phpt
+++ b/ext/zlib/tests/gztell_basic2.phpt
@@ -3,7 +3,7 @@ Test function gztell() by calling it with its expected arguments when writing
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzuncompress_basic1.phpt b/ext/zlib/tests/gzuncompress_basic1.phpt
index d82d7069e3a2d..c46e8b35ebd99 100644
--- a/ext/zlib/tests/gzuncompress_basic1.phpt
+++ b/ext/zlib/tests/gzuncompress_basic1.phpt
@@ -3,7 +3,7 @@ Test gzuncompress() function : basic functionality
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzuncompress_error1.phpt b/ext/zlib/tests/gzuncompress_error1.phpt
index 5390cce93832d..a93de5b054b18 100644
--- a/ext/zlib/tests/gzuncompress_error1.phpt
+++ b/ext/zlib/tests/gzuncompress_error1.phpt
@@ -3,7 +3,7 @@ Test gzuncompress() function : error conditions
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzwrite_basic.phpt b/ext/zlib/tests/gzwrite_basic.phpt
index bdea57deff856..699b2f49937d2 100644
--- a/ext/zlib/tests/gzwrite_basic.phpt
+++ b/ext/zlib/tests/gzwrite_basic.phpt
@@ -3,7 +3,7 @@ Test function gzwrite() by calling it with its expected arguments
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzwrite_error2.phpt b/ext/zlib/tests/gzwrite_error2.phpt
index a4e4fa4958d6a..009cb4d7d28d8 100644
--- a/ext/zlib/tests/gzwrite_error2.phpt
+++ b/ext/zlib/tests/gzwrite_error2.phpt
@@ -3,7 +3,7 @@ Test function gzwrite() by calling it invalid lengths
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/gzwrite_variation1.phpt b/ext/zlib/tests/gzwrite_variation1.phpt
index 563702e4bdcc5..540a87985a109 100644
--- a/ext/zlib/tests/gzwrite_variation1.phpt
+++ b/ext/zlib/tests/gzwrite_variation1.phpt
@@ -3,7 +3,7 @@ Test function gzwrite() by calling it when file is opened for reading
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/readgzfile_variation15.phpt b/ext/zlib/tests/readgzfile_variation15.phpt
index 1a96fdb429090..749087f6ce66e 100644
--- a/ext/zlib/tests/readgzfile_variation15.phpt
+++ b/ext/zlib/tests/readgzfile_variation15.phpt
@@ -3,7 +3,7 @@ Test readgzfile() function : variation: use include path (relative directories i
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_copy_basic.phpt b/ext/zlib/tests/zlib_scheme_copy_basic.phpt
index 5a35164cf1c9c..9c6becb4c75f9 100644
--- a/ext/zlib/tests/zlib_scheme_copy_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the copy function: compressed to compressed
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
index a5e145faa3fcc..c96e2bee290be 100644
--- a/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_variation1.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the copy function: compressed to uncompressed
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
index 8492862892a27..829351846bce5 100644
--- a/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
+++ b/ext/zlib/tests/zlib_scheme_copy_variation2.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the copy function: uncompressed to compressed
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
index f0e155e899366..014243d5749f2 100644
--- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the directory functions
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_basic.phpt
index 5d73cf16c2944..cb697f44f0718 100644
--- a/ext/zlib/tests/zlib_scheme_file_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the file
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
index b02a1bffe98c6..615d3c5d25ecb 100644
--- a/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_get_contents_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the file_get_contents
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
index 51a52c9808efc..7ed77b36b3381 100644
--- a/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_put_contents_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the file_get_contents
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
index 007a4a50229e2..73047310214e7 100644
--- a/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_file_read_file_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the file_get_contents
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
index c6508deaa047b..e8c6492024f5f 100644
--- a/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_fopen_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the fopen
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
index 8bed54ebaa7c6..093b137c6e7d1 100644
--- a/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
+++ b/ext/zlib/tests/zlib_scheme_fopen_variation1.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the fopen on a file scheme
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_rename_basic.phpt b/ext/zlib/tests/zlib_scheme_rename_basic.phpt
index b58a09f89e26b..e67970d332cfd 100644
--- a/ext/zlib/tests/zlib_scheme_rename_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_rename_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_stat_basic.phpt b/ext/zlib/tests/zlib_scheme_stat_basic.phpt
index 31d08866ba307..fa48454db523c 100644
--- a/ext/zlib/tests/zlib_scheme_stat_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_stat_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
index 23c59f8ff3ea4..c2cfca723a91e 100644
--- a/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
+++ b/ext/zlib/tests/zlib_scheme_stat_basic2.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
index ca21637ed104a..c5c4eabb466ef 100644
--- a/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
+++ b/ext/zlib/tests/zlib_scheme_unlink_basic.phpt
@@ -3,7 +3,7 @@ Test compress.zlib:// scheme with the unlink function
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
index 6911aabe69e8d..54d0e37860d5d 100644
--- a/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fflush_basic.phpt
@@ -3,7 +3,7 @@ Test function fflush() on a zlib stream wrapper
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
index 41c651c50f991..6d3f9d6237920 100644
--- a/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
@@ -3,7 +3,7 @@ Test function stream_get_meta_data on a zlib stream
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
index 20af263e5a038..eaa9a124db483 100644
--- a/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_fstat_basic.phpt
@@ -3,7 +3,7 @@ Test function fstat() on zlib wrapper
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
index 2ace80d21cd9a..07b3917213d8b 100644
--- a/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_ftruncate_basic.phpt
@@ -3,7 +3,7 @@ Test function ftruncate() on zlib wrapper by calling it with its expected argume
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
index 8476b2923a0c2..815854b21e1a5 100644
--- a/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
+++ b/ext/zlib/tests/zlib_wrapper_meta_data_basic.phpt
@@ -3,7 +3,7 @@ Test function stream_get_meta_data on a zlib stream
 --SKIPIF--
 <?php
 if (!extension_loaded("zlib")) {
-	print "skip - ZLIB extension not loaded";
+    print "skip - ZLIB extension not loaded";
 }
 ?>
 --FILE--
diff --git a/sapi/cgi/tests/003.phpt b/sapi/cgi/tests/003.phpt
index 00c59c72784a0..ac3f6aa8e6386 100644
--- a/sapi/cgi/tests/003.phpt
+++ b/sapi/cgi/tests/003.phpt
@@ -4,7 +4,7 @@ strip comments and whitespace with -w
 <?php
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 
 include "skipif.inc";
diff --git a/sapi/cgi/tests/005-win32.phpt b/sapi/cgi/tests/005-win32.phpt
index 1674f16fb9ea6..cafec91d3dbbd 100644
--- a/sapi/cgi/tests/005-win32.phpt
+++ b/sapi/cgi/tests/005-win32.phpt
@@ -4,7 +4,7 @@ using invalid combinations of cmdline options
 <?php
 
 if (substr(PHP_OS, 0, 3) != 'WIN') {
-	die ("skip Windows only");
+    die ("skip Windows only");
 }
 
 include "skipif.inc";
diff --git a/sapi/cgi/tests/005.phpt b/sapi/cgi/tests/005.phpt
index 6b41f7a99f9aa..a46ac912c7063 100644
--- a/sapi/cgi/tests/005.phpt
+++ b/sapi/cgi/tests/005.phpt
@@ -4,7 +4,7 @@ using invalid combinations of cmdline options
 <?php
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 
 include "skipif.inc";
diff --git a/sapi/cli/tests/002-unix.phpt b/sapi/cli/tests/002-unix.phpt
index 2be668f18884c..8eb4e47b6e166 100644
--- a/sapi/cli/tests/002-unix.phpt
+++ b/sapi/cli/tests/002-unix.phpt
@@ -4,7 +4,7 @@ running code with -r
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/003-2.phpt b/sapi/cli/tests/003-2.phpt
index 71ef7163bef39..3a88b2a9a3aa1 100644
--- a/sapi/cli/tests/003-2.phpt
+++ b/sapi/cli/tests/003-2.phpt
@@ -4,7 +4,7 @@ defining INI options with -d (as 2nd arg)
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/003.phpt b/sapi/cli/tests/003.phpt
index 6584e2c7bef21..63e812d4a7cd7 100644
--- a/sapi/cli/tests/003.phpt
+++ b/sapi/cli/tests/003.phpt
@@ -4,7 +4,7 @@ defining INI options with -d
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/006.phpt b/sapi/cli/tests/006.phpt
index f3443b7475e64..77a5667bda82f 100644
--- a/sapi/cli/tests/006.phpt
+++ b/sapi/cli/tests/006.phpt
@@ -4,10 +4,10 @@ show information about extension
 <?php
 include "skipif.inc";
 if (!extension_loaded("session")) {
-	die("skip session extension required");
+    die("skip session extension required");
 }
 if (PCRE_JIT_SUPPORT == false) {
-	die ("skip not pcre jit support builtin");
+    die ("skip not pcre jit support builtin");
 }
 ?>
 --INI--
diff --git a/sapi/cli/tests/007.phpt b/sapi/cli/tests/007.phpt
index 94ea6fd247457..73faa334237cf 100644
--- a/sapi/cli/tests/007.phpt
+++ b/sapi/cli/tests/007.phpt
@@ -4,7 +4,7 @@ strip comments and whitespace with -w
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/008.phpt b/sapi/cli/tests/008.phpt
index c96170d4979b6..c3acf6b86330d 100644
--- a/sapi/cli/tests/008.phpt
+++ b/sapi/cli/tests/008.phpt
@@ -4,7 +4,7 @@ execute a file with -f
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/010-2.phpt b/sapi/cli/tests/010-2.phpt
index af998351bb76c..1780c3ffd6226 100644
--- a/sapi/cli/tests/010-2.phpt
+++ b/sapi/cli/tests/010-2.phpt
@@ -4,7 +4,7 @@ executing a code with -R
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/010.phpt b/sapi/cli/tests/010.phpt
index 01b35991369e1..d06007bd55e98 100644
--- a/sapi/cli/tests/010.phpt
+++ b/sapi/cli/tests/010.phpt
@@ -4,7 +4,7 @@ executing a file with -F
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/013.phpt b/sapi/cli/tests/013.phpt
index 3ca2ba833caa9..0684b8d0573cf 100644
--- a/sapi/cli/tests/013.phpt
+++ b/sapi/cli/tests/013.phpt
@@ -4,7 +4,7 @@ running PHP code before and after processing input lines with -B and -E
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/015.phpt b/sapi/cli/tests/015.phpt
index 5a5e6c5190d25..b64a5f0d50fae 100644
--- a/sapi/cli/tests/015.phpt
+++ b/sapi/cli/tests/015.phpt
@@ -4,7 +4,7 @@ CLI long options
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/016.phpt b/sapi/cli/tests/016.phpt
index bbba579ec2b24..bf23affe818e9 100644
--- a/sapi/cli/tests/016.phpt
+++ b/sapi/cli/tests/016.phpt
@@ -4,7 +4,7 @@ CLI -a and readline
 <?php
 include "skipif.inc";
 if (!extension_loaded('readline') || readline_info('done') === NULL) {
-	die ("skip need readline support");
+    die ("skip need readline support");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/017.phpt b/sapi/cli/tests/017.phpt
index 6c9a792476737..344daa7408b59 100644
--- a/sapi/cli/tests/017.phpt
+++ b/sapi/cli/tests/017.phpt
@@ -4,7 +4,7 @@ CLI -a and libedit
 <?php
 include "skipif.inc";
 if (!extension_loaded('readline') || readline_info('done') !== NULL) {
-	die ("skip need readline support using libedit");
+    die ("skip need readline support using libedit");
 }
 if(substr(PHP_OS, 0, 3) == 'WIN' ) {
     die('skip not for Windows');
diff --git a/sapi/cli/tests/018.phpt b/sapi/cli/tests/018.phpt
index 9ebe4faa87f1e..2aadfef62ae85 100644
--- a/sapi/cli/tests/018.phpt
+++ b/sapi/cli/tests/018.phpt
@@ -4,7 +4,7 @@ CLI php -m
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/019.phpt b/sapi/cli/tests/019.phpt
index 2b8c0f007ecbc..e8404d835e5e7 100644
--- a/sapi/cli/tests/019.phpt
+++ b/sapi/cli/tests/019.phpt
@@ -4,7 +4,7 @@ CLI php -i
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/020.phpt b/sapi/cli/tests/020.phpt
index 001cf62a3836d..fb7bcb4e7b5f6 100644
--- a/sapi/cli/tests/020.phpt
+++ b/sapi/cli/tests/020.phpt
@@ -4,7 +4,7 @@ CLI php --ri
 <?php
 include "skipif.inc";
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/021.phpt b/sapi/cli/tests/021.phpt
index a5d97c326d563..837f64109d03d 100644
--- a/sapi/cli/tests/021.phpt
+++ b/sapi/cli/tests/021.phpt
@@ -4,7 +4,7 @@ CLI shell shebang
 <?php
 include 'skipif.inc';
 if (substr(PHP_OS, 0, 3) == 'WIN') {
-	die ("skip not for Windows");
+    die ("skip not for Windows");
 }
 
 if (strlen("#!".getenv('TEST_PHP_EXECUTABLE')) > 127) {
diff --git a/sapi/cli/tests/argv_mb_bug77111.phpt b/sapi/cli/tests/argv_mb_bug77111.phpt
index a2bae24dc3ead..0ed6204b89d79 100644
--- a/sapi/cli/tests/argv_mb_bug77111.phpt
+++ b/sapi/cli/tests/argv_mb_bug77111.phpt
@@ -5,12 +5,12 @@ Bug #77111 php-win.exe corrupts unicode symbols from cli parameters
 include "skipif.inc";
 
 if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-	die("skip this test is for Windows platforms only");
+    die("skip this test is for Windows platforms only");
 }
 
 $php = dirname(getenv('TEST_PHP_EXECUTABLE')) . DIRECTORY_SEPARATOR . "php-win.exe";
 if (!file_exists($php)) {
-	die("skip php-win.exe doesn't exist");
+    die("skip php-win.exe doesn't exist");
 }
 
 ?>
diff --git a/sapi/cli/tests/bug44564.phpt b/sapi/cli/tests/bug44564.phpt
index 7dca62a7e8e9f..6ef5b9f9507f9 100644
--- a/sapi/cli/tests/bug44564.phpt
+++ b/sapi/cli/tests/bug44564.phpt
@@ -3,7 +3,7 @@ Bug #44564 (escapeshellarg removes UTF-8 multi-byte characters)
 --SKIPIF--
 <?php
 if (false == setlocale(LC_CTYPE, "UTF8", "en_US.UTF-8")) {
-	die("skip setlocale() failed\n");
+    die("skip setlocale() failed\n");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/bug64529.phpt b/sapi/cli/tests/bug64529.phpt
index ff3e3029e63db..7350cd2046169 100644
--- a/sapi/cli/tests/bug64529.phpt
+++ b/sapi/cli/tests/bug64529.phpt
@@ -3,14 +3,14 @@ Bug #64529 (Ran out of opcode space)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == "WIN") {
-	die("skip non windows test");
+    die("skip non windows test");
 }
 if (!extension_loaded("readline") || !readline_info("done")) {
-	die("skip readline support required");
+    die("skip readline support required");
 }
 exec('which expect', $output, $ret);
 if ($ret) {
-	die("skip no expect installed");
+    die("skip no expect installed");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/bug64544.phpt b/sapi/cli/tests/bug64544.phpt
index 33a6e16a10c8d..87e8eda64ae0f 100644
--- a/sapi/cli/tests/bug64544.phpt
+++ b/sapi/cli/tests/bug64544.phpt
@@ -3,7 +3,7 @@ Bug #64544 (Valgrind warnings after using putenv)
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == "WIN") {
-	die("skip non windows test");
+    die("skip non windows test");
 }
 ?>
 --FILE--
diff --git a/sapi/cli/tests/bug65275.inc b/sapi/cli/tests/bug65275.inc
index 6b8a2ad948e56..addc026322dc5 100644
--- a/sapi/cli/tests/bug65275.inc
+++ b/sapi/cli/tests/bug65275.inc
@@ -1,7 +1,7 @@
 <?php
 
 register_shutdown_function(function() {
-	die(111);
+    die(111);
 });
 
 die(222);
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
index 81258da1d3839..3d139ce6506fc 100644
--- a/sapi/cli/tests/upload_2G.phpt
+++ b/sapi/cli/tests/upload_2G.phpt
@@ -5,31 +5,31 @@ file upload greater than 2G
 include "skipif.inc";
 
 if (PHP_INT_SIZE < 8) {
-	die("skip need PHP_INT_SIZE>=8");
+    die("skip need PHP_INT_SIZE>=8");
 }
 
 if (disk_free_space(sys_get_temp_dir()) < 2300000000) {
-	die("skip need more than 2.15G of free disk space for the uploaded file");
+    die("skip need more than 2.15G of free disk space for the uploaded file");
 }
 
 if (!file_exists('/proc/meminfo')) {
-	die('skip Cannot check free RAM from /proc/meminfo on this platform');
+    die('skip Cannot check free RAM from /proc/meminfo on this platform');
 }
 
 $free_ram = 0;
 if ($f = fopen("/proc/meminfo","r")) {
-	while (!feof($f)) {
-		if (preg_match('/MemFree[^\d]*(\d+)/i', fgets($f), $m)) {
-			$free_ram = max($free_ram, $m[1]/1024/1024);
-			if ($free_ram > 3) {
-				$enough_free_ram = true;
-			}
-		}
-	}
+    while (!feof($f)) {
+        if (preg_match('/MemFree[^\d]*(\d+)/i', fgets($f), $m)) {
+            $free_ram = max($free_ram, $m[1]/1024/1024);
+            if ($free_ram > 3) {
+                $enough_free_ram = true;
+            }
+        }
+    }
 }
 
 if (empty($enough_free_ram)) {
-	die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram));
+    die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram));
 }
 
 if (getenv('TRAVIS')) {
diff --git a/scripts/dev/tidy.php b/scripts/dev/tidy.php
index 3829f9092ec23..7ec9f7902d662 100644
--- a/scripts/dev/tidy.php
+++ b/scripts/dev/tidy.php
@@ -117,7 +117,7 @@ function transformTestCode(string $code, callable $transformer): string {
     }
 
     return preg_replace_callback(
-        '/(--FILE--)(.+?)(--[A-Z_]+--)/s',
+        '/(--(?:FILE|SKIPIF|CLEAN)--)(.+?)(--[A-Z_]+--)/s',
         function(array $matches) use($transformer) {
             return $matches[1] . $transformer($matches[2]) . $matches[3];
         },
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt
index cdea16f689bb7..7fe6757d6859e 100644
--- a/tests/classes/autoload_001.phpt
+++ b/tests/classes/autoload_001.phpt
@@ -2,7 +2,7 @@
 ZE2 Autoload and class_exists
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt
index 752a9928af717..32321b3bfe0ee 100644
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -2,7 +2,7 @@
 ZE2 Autoload and get_class_methods
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt
index 05887433c363c..a81d56fe6c698 100644
--- a/tests/classes/autoload_003.phpt
+++ b/tests/classes/autoload_003.phpt
@@ -2,7 +2,7 @@
 ZE2 Autoload and derived classes
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt
index 8539e074333e1..a5dd5e393c50a 100644
--- a/tests/classes/autoload_004.phpt
+++ b/tests/classes/autoload_004.phpt
@@ -2,7 +2,7 @@
 ZE2 Autoload and recursion
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt
index 72d83b88f6629..16f55b9363926 100644
--- a/tests/classes/autoload_005.phpt
+++ b/tests/classes/autoload_005.phpt
@@ -2,7 +2,7 @@
 ZE2 Autoload from destructor
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt
index f17011ca5e548..fd3c85580f600 100644
--- a/tests/classes/autoload_006.phpt
+++ b/tests/classes/autoload_006.phpt
@@ -2,7 +2,7 @@
 ZE2 Autoload from destructor
 --SKIPIF--
 <?php
-	if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
+    if (class_exists('autoload_root', false)) die('skip Autoload test classes exist already');
 ?>
 --FILE--
 <?php
diff --git a/tests/lang/034.phpt b/tests/lang/034.phpt
index 2ed6bce9d7b8b..439c87e13b458 100644
--- a/tests/lang/034.phpt
+++ b/tests/lang/034.phpt
@@ -5,7 +5,7 @@ precision=14
 --SKIPIF--
 <?php  # try to activate a german locale
 if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
-	print "skip Can't find german locale";
+    print "skip Can't find german locale";
 }
 ?>
 --FILE--
diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt
index 24e6609498c21..3eb2c35241442 100644
--- a/tests/lang/bug30638.phpt
+++ b/tests/lang/bug30638.phpt
@@ -3,7 +3,7 @@ Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X
 --SKIPIF--
 <?php  # try to activate a german locale
 if (setlocale(LC_NUMERIC, "de_DE.UTF-8", "de_DE", "de", "german", "ge", "de_DE.ISO-8859-1") === FALSE) {
-	print "skip setlocale() failed";
+    print "skip setlocale() failed";
 } elseif (strtolower(php_uname('s')) == 'darwin') {
     print "skip ok to fail on MacOS X";
 }
diff --git a/tests/output/sapi_windows_vt100_support_winko_err.phpt b/tests/output/sapi_windows_vt100_support_winko_err.phpt
index d609e48770141..21be3b76a9593 100644
--- a/tests/output/sapi_windows_vt100_support_winko_err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDERR
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) >= 0) {
-	echo "skip Only for Windows systems < 10.0.10586";
+    echo "skip Only for Windows systems < 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt
index 86cf631110c2d..94e692d01f292 100644
--- a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) >= 0) {
-	echo "skip Only for Windows systems < 10.0.10586";
+    echo "skip Only for Windows systems < 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
index 4c0f5f9909937..11caa432d13e9 100644
--- a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) >= 0) {
-	echo "skip Only for Windows systems < 10.0.10586";
+    echo "skip Only for Windows systems < 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
index 01efb3bb4e36f..fc0429c4b0505 100644
--- a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDIN/
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) >= 0) {
-	echo "skip Only for Windows systems < 10.0.10586";
+    echo "skip Only for Windows systems < 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
index 09d3d8f0be40e..ee34be988b0d9 100644
--- a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) >= 0) {
-	echo "skip Only for Windows systems < 10.0.10586";
+    echo "skip Only for Windows systems < 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winko_out.phpt b/tests/output/sapi_windows_vt100_support_winko_out.phpt
index 65958ae19c1f0..3241ba352abd9 100644
--- a/tests/output/sapi_windows_vt100_support_winko_out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_out.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on older Windows versions with redirected STDOUT
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) >= 0) {
-	echo "skip Only for Windows systems < 10.0.10586";
+    echo "skip Only for Windows systems < 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winok_err.phpt b/tests/output/sapi_windows_vt100_support_winok_err.phpt
index 01a31a6b927e1..4d7543fdda1ae 100644
--- a/tests/output/sapi_windows_vt100_support_winok_err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDERR
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) < 0) {
-	echo "skip Only for Windows systems >= 10.0.10586";
+    echo "skip Only for Windows systems >= 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
index d36d79c8dcbf3..e08d558e25acd 100644
--- a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) < 0) {
-	echo "skip Only for Windows systems >= 10.0.10586";
+    echo "skip Only for Windows systems >= 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
index 16066046510bb..285a72f936366 100644
--- a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) < 0) {
-	echo "skip Only for Windows systems >= 10.0.10586";
+    echo "skip Only for Windows systems >= 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
index f67942f603f7a..a84b36534747d 100644
--- a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDIN/
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) < 0) {
-	echo "skip Only for Windows systems >= 10.0.10586";
+    echo "skip Only for Windows systems >= 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
index ebc6bcb120566..f3f49aa618f46 100644
--- a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) < 0) {
-	echo "skip Only for Windows systems >= 10.0.10586";
+    echo "skip Only for Windows systems >= 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/sapi_windows_vt100_support_winok_out.phpt b/tests/output/sapi_windows_vt100_support_winok_out.phpt
index 94a5f20a1bfb9..7fc5ae142b6c3 100644
--- a/tests/output/sapi_windows_vt100_support_winok_out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_out.phpt
@@ -3,15 +3,15 @@ Test sapi_windows_vt100_support on newer Windows versions with redirected STDOUT
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 if(PHP_OS_FAMILY !== "Windows") {
     echo "skip Only for Windows systems";
 } elseif (version_compare(
     PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD,
-	 '10.0.10586'
+     '10.0.10586'
 ) < 0) {
-	echo "skip Only for Windows systems >= 10.0.10586";
+    echo "skip Only for Windows systems >= 10.0.10586";
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/stream_isatty_err.phpt b/tests/output/stream_isatty_err.phpt
index e7c10383506d3..c0487392810bd 100644
--- a/tests/output/stream_isatty_err.phpt
+++ b/tests/output/stream_isatty_err.phpt
@@ -3,7 +3,7 @@ Test stream_isatty with redirected STDERR
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/stream_isatty_in-err.phpt b/tests/output/stream_isatty_in-err.phpt
index 73514955d43c9..8c10baae8039b 100644
--- a/tests/output/stream_isatty_in-err.phpt
+++ b/tests/output/stream_isatty_in-err.phpt
@@ -3,7 +3,7 @@ Test stream_isatty with redirected STDIN/STDERR
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/stream_isatty_in-out-err.phpt b/tests/output/stream_isatty_in-out-err.phpt
index 9b65e8861b86b..851327ead8024 100644
--- a/tests/output/stream_isatty_in-out-err.phpt
+++ b/tests/output/stream_isatty_in-out-err.phpt
@@ -3,7 +3,7 @@ Test stream_isatty with redirected STDIN/STDOUT/STDERR
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/stream_isatty_in-out.phpt b/tests/output/stream_isatty_in-out.phpt
index c2bb346854f4f..19fa8552b8b0a 100644
--- a/tests/output/stream_isatty_in-out.phpt
+++ b/tests/output/stream_isatty_in-out.phpt
@@ -3,7 +3,7 @@ Test stream_isatty with redirected STDIN/STDOUT
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/stream_isatty_out-err.phpt b/tests/output/stream_isatty_out-err.phpt
index dc113a972060e..e080810ae8af0 100644
--- a/tests/output/stream_isatty_out-err.phpt
+++ b/tests/output/stream_isatty_out-err.phpt
@@ -3,7 +3,7 @@ Test stream_isatty with redirected STDOUT/STDERR
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/output/stream_isatty_out.phpt b/tests/output/stream_isatty_out.phpt
index f18c986c5abf6..80db5095103dd 100644
--- a/tests/output/stream_isatty_out.phpt
+++ b/tests/output/stream_isatty_out.phpt
@@ -3,7 +3,7 @@ Test stream_isatty with redirected STDOUT
 --SKIPIF--
 <?php
 if (getenv("SKIP_IO_CAPTURE_TESTS")) {
-	die("skip I/O capture test");
+    die("skip I/O capture test");
 }
 ?>
 --CAPTURE_STDIO--
diff --git a/tests/run-test/bug75042.phpt b/tests/run-test/bug75042.phpt
index af3005372bbb7..a7979d6b5ed6e 100644
--- a/tests/run-test/bug75042.phpt
+++ b/tests/run-test/bug75042.phpt
@@ -4,7 +4,7 @@ phpt EXTENSIONS directive with shared module
 <?php
 $php = getenv('TEST_PHP_EXECUTABLE');
 if (false !== stripos(`$php -n -m`, 'openssl')) {
-	die('skip openssl is built static');
+    die('skip openssl is built static');
 }
 $ext_module = ini_get('extension_dir') . DIRECTORY_SEPARATOR . (substr(PHP_OS, 0, 3) === "WIN" ? "php_openssl." : "openssl.") . PHP_SHLIB_SUFFIX;
 if( !file_exists($ext_module) ) die('skip openssl shared extension not found');
diff --git a/tests/security/open_basedir_001.phpt b/tests/security/open_basedir_001.phpt
index e6068350a87ba..a68e9ac531218 100644
--- a/tests/security/open_basedir_001.phpt
+++ b/tests/security/open_basedir_001.phpt
@@ -3,10 +3,10 @@ openbase_dir runtime tightning
 --SKIPIF--
 <?php
 if(PHP_OS_FAMILY === "Windows") {
-	die('skip.. only for unix');
+    die('skip.. only for unix');
 }
 if (!is_dir("/usr/local/bin")) {
-	die('skip.. no /usr/local/bin on this machine');
+    die('skip.. no /usr/local/bin on this machine');
 }
 --INI--
 open_basedir=/usr/local