diff options
1169 files changed, 2581 insertions, 2581 deletions
diff --git a/Zend/tests/attributes/001_placement.phpt b/Zend/tests/attributes/001_placement.phpt index 7de2210460..518c890ef2 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 0177804dcc..854edf3d63 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 206d89fa10..62b14181ef 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 8da1ec9bde..2924e6ed79 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 36ee3fa47a..6a589b9253 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 a9131f92d0..347d1befe7 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 61dd9f594c..ff16bb7b82 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 a53ed09c0a..9f01d013a7 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 484d4154cf..b84ded8c38 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 af7de8e2e8..8c39ceede9 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 14a10c39b2..ce2acb26db 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 226025f359..96966c364d 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 c4c78c2220..f37d96d5ff 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 1680f4ceed..e4ce5c0e3a 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 7cb0cf0664..2f6387ca26 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 8b78e6c691..52dd7499dc 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 11f59dd95b..40915a286e 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 2ea1b91241..b8a1c91d36 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 fbef201033..cd837bd860 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 b333f153a8..57e5332431 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 7bbe6128b3..d6e057546b 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 9aeea65060..89acf9076a 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 3d6b736b8f..b54f861bf5 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 48813704b6..e6ab4e3c6c 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 5ce536ae40..7cd4d4bee1 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 4ac3952c4d..450c7b2295 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 03a4fb7ea7..95614779d5 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 783b6003dc..8a1aa6388d 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 d5e93c9ef0..3b7cf69618 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 a0ac45e42a..c456afa127 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 9afb089f31..0ce6227123 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 faddd3cca1..914a889808 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 85823e6c40..f0a5fabff2 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 45e144cac7..4efaf6fb18 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 e91fdc7848..6bdcafb1bf 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 a57c8b7dc8..84a960240a 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 72c20a7885..2835b46830 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 593d8fc037..89baac4699 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 f4edb33576..8d72b6be86 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 e725465253..1eb5171cb0 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 50324208cb..80a57cf1e8 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 fa2d331f55..359790b82e 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 4e2351869d..177cf5c75d 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 4a0062a7e1..5f9bc5c0b0 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 e99131d27b..7ebf16a10d 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 88f9f3e126..6a1b7e1c12 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 c46ea5331d..501bd3ee16 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 759e4bc1be..12dcdd498b 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 8fbcad627d..3b9aabf92c 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 316fa4d0e7..9b795241f2 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 2d947febec..3252f75f46 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 bf04d9faea..5b2ebfa2cc 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 e59aabc7c3..5d36abfdd6 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 95eec344a8..b1d8f4d4da 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 c983a77617..2a0dcd62a3 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 3f5a4801b1..5fddd30c27 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 2764a82f38..f1c61fbf3b 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 70f82532b7..3b5f67b5e0 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 13fbd0c404..5a9d4d44ae 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 6bcfd72b32..1ac764ea2c 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 6875d4f02a..4037a0bc12 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 0aa58dbcf8..945768436c 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 8dbb3f6987..63331b5726 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 be036d0ca8..afa8944bde 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 Binary files differindex 015b010a1c..91dff3f056 100644 --- a/ext/curl/tests/curl_escape.phpt +++ b/ext/curl/tests/curl_escape.phpt diff --git a/ext/curl/tests/curl_file_serialize.phpt b/ext/curl/tests/curl_file_serialize.phpt index 7748272b76..7776a455a4 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 cc8e175460..d0c237ef0c 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 25c3b4962f..7620c421e4 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 3c2edb988d..7d1b426a25 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 3a24121b57..d8f18eb76f 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 d53ae4ff8e..476ea68825 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 0634259896..85a13271c1 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 36dc43d760..65e8228149 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 80d4fa82fc..63eba795d8 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 38c724ed57..bfd416fc5e 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 563e39ab30..b8d4fc1d2a 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 32c066c1ca..fc466d411d 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 cf7478c90b..44d94cd76f 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 b1c107ba78..ab0089e7f7 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 fe625b62bc..a7a87c70c3 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 fe4c68aa80..364d54d004 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 c735c9a07d..bded251791 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 70f59c97c9..7e46ea9f1f 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 8bec60a543..dff291a39d 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 71fa8730b8..490e9116d1 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 79ebb2d237..d5984c54c8 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 c0432c4599..2aba823af2 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 55d4ce9fe0..dd08f86ed5 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 3846ccfd29..eebbc04ffb 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 0f5767988d..bde23a495d 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 1264ccf899..dfe93f874d 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 bb71ad273e..b617c34e9b 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 4ca9b0ed96..3f23c9748c 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 f5cb08871a..1b0d6172aa 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 42a448dde9..1da1307049 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 5d2a35990c..e670ec86b9 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 956483f5f3..7ed9a6487b 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 21969db074..c15f49a805 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 39fc85e454..77afb95661 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 26711c9d5e..d87699bdaa 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 013813062a..3683058d7d 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 f3c2061414..12a19fae7c 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 e69d60489d..c85f133fab 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 47bbae28c0..6fc649d29c 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 41bd0f891d..c2022895ab 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 ae4216d7fd..f8174dde58 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 e9bc185bf4..d1db7beb6c 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 a97244bf36..b23a2686f8 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 74f316e190..0cd00bbab1 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 c0ecc3101d..e36643944f 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 efe34653b3..940b929bdf 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 a857984741..2460187150 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 56cba13a1c..ffd5a13003 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 0d7c32f06c..f8ff71cb9e 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 2fe9cdac75..2b92048ea8 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 07134ae50f..93ec1fafdc 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 ad4121512c..a12527733c 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 f195fdc522..9cfdd2c6f9 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 59a3ab74d5..7a69ba470e 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 9d66e35ddc..6c043af4e2 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 2b2e978d52..1b371ff81f 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 634d8d4436..62cd0b2bdb 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 3acc98f035..d3a81cbfd1 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 39dcbdf71a..0fba3d4e16 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 314424548a..df9078b723 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 2509aa9bae..c0fee9ed4f 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 87ef584d51..5a44d58553 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 6c29db59d7..204a6e4f8c 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 184ea6e018..a237500501 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 b96e08662d..dba814936f 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 6f4147fb0e..7eed8049a5 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 c5ce8f9dc1..b3f4d576a0 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 c15b83c951..5ae63ee11f 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 9ab2bf2cb3..e6800b5f4a 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 272cdba702..ea32a8122a 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 e6289b73fd..9a00c4f32b 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 ceb0adc32f..e6a3fd5978 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 b5cab7774f..4de1bd71bc 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 588c087c54..32453d98d3 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 bad322e3ca..4d0050f950 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 bed288ce32..61f99ebcee 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 0ff2a68685..4d571b1b3f 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 5c4079b97a..440c218480 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 2832f72645..c6c3ed08ce 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 ae347edd70..23499617b8 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 c7b1e91966..3aca54df97 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 ff4f40fdec..59da459849 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 138258cbbc..4c91c6fe14 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 fc5f37c5a0..def3bfd233 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 371c8e48be..8e7097eaa0 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 262b881ca0..990d65b223 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 e1a9b8b470..92a0416985 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 40b3341685..3884024c45 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 74a58223a9..356c877f71 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 4eb553b614..328741a921 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 9bd6f5edc4..e6f1ad7575 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 7e938f4bb1..3fb56761e7 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 85c72fe860..c23f9eadf1 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 f00a4aae4e..6bfd83614f 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 6468f28b73..700dad46cf 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 e090477314..52c64534dc 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 3802094e25..8a673207b6 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 351734931a..2f88cc6d6c 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 3db42a228e..854e49eac4 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 74641496de..4257f6c1a7 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 1c3a7e5bc7..38668fdfbb 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 9264299181..71c567570a 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 0f130d28fd..de2b51ea3b 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 22e8a65ec4..4710f218f9 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 34fafa9423..fd7af45b91 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 03ee5a2b94..68c533d75a 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 437731bb4b..8f27d28086 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 b2be6a47f1..323690e2a0 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 1793ac3386..435af2d390 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 b5e32af480..0975d7d774 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 79830be71f..3817391765 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 6f14cd3c98..04d8277094 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 1d72e734a9..1520e84f35 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 11e7a8af57..3a6a06006a 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 c6a50ba48b..ed7b463c30 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 4eb2e28730..69f76e5719 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 a255997ca0..0803ed48bd 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 c17454433d..985183effc 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 cd10a8ffc0..6af034383f 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 6aed9e9361..0a4a8e31a0 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 fb1b5bde94..943d961f46 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 a3aa491cbe..0224c2ed4f 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 4baaa92ab2..442f6ab290 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 e9331ec600..96b6de1023 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 565d60a632..d9c6c8e297 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 2983ff29b8..0c5ae7cb76 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 a5b0dfe339..1bf9895c1b 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 c6a1a22427..37f7cd48ff 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 ab15ec024e..b426816f5b 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 5c18b1f2ce..61f73d97e7 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 8315fb0dbc..75b8322715 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 a741cadb26..1d8a8278a1 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 b0ce474886..ba02bed00e 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 295a80944c..c051d73425 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 3616f449ec..54b8c6df8e 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 258f8b6e38..15984eaf7f 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 e7b5807bbc..d6e19b8eef 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 877e8b64c4..6f8c3b7506 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 51df328f8c..92568667b0 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 6d9bceb3ac..1a4b9e61c5 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 ef7f361ad5..3da5189128 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 955dee9848..0d03ecf758 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 de1f25c0e0..1d6012e3f9 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 b0b6c3abf7..3e16c1f034 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 2da09cd18b..bb29eb6b1c 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 995aa03d7e..09870e2826 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 258eabf854..28ad43c706 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 f356fe826d..ea2129b52b 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 b353d808e6..199d435d9d 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 cc6e01b4ad..f17651afef 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 feb81a8e06..b388882390 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 165e685052..6462f42de7 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 f040c5cac4..a55b88ee90 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 ddb47c7cbd..65d6ec15bb 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 2e3a5eb3ca..87eac74133 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 d140af858e..52ed27aadb 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 0e3203e985..449363f8e6 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 8cc978a6ff..81b3ac7d46 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 fa323897ba..971a9dc3b8 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 2f175271d1..be385b8bdc 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 5a9c380758..dc41148394 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 a4ad10839b..6d30c1de33 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 0ef49da2a5..7bf326160c 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 830ee542ba..8a415478dd 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 d4948fcc61..bea4462c6a 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 ade61d8f80..34d66862ea 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 0afe6fc1d0..ae6a52a28e 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 376d18f790..30bd6094aa 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 1265fed6e6..0e418a69dd 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 4a53da464f..93ea4f34ea 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 18aa04a35d..6c6ceb2f9f 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 707f7e37bc..3fd8be0c3a 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 5726befab2..dd24aecc81 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 850ca806b6..36d2449fb1 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 8f2bdcec59..d7c3f0c416 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 c48fd7d821..52ecc59941 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 dfcd1ef1a2..cae283d10b 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 8cf4ffd283..d68ff24dd5 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 da671e01ac..855f7a5321 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 959828f068..69afee8090 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 78bafa761e..1cdb28fee8 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 7ce24a43b2..ca313893d5 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 8af0b342d9..f9cbeec871 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 c6fa6dd30e..9392fcf834 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 d2e278ced9..0206bd626b 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 d651b0bb1f..151d126075 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 cb1686b5ac..0df501c268 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 983b93e180..692d012c72 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 850cdd0be2..0df1e0611a 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 f9065ea82a..880e3a5b52 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 9b1b4013c8..c3b77f2e36 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 dba9f03ec8..47e6c2faf1 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 6491b85646..c16c3d89cf 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 602fc72a7c..c9902f0763 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 4dc45260f8..1de644a933 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 749f4cd1a2..3b0b3fd0ee 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 edbd31cc48..6fcd5bed80 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 26e7b7017e..b02c1e78a0 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 498568294a..cc86d78040 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 e9a7de7e73..19a51f116b 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 a2bc332ea2..0b7603651a 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 c5326a99df..98927c740b 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 f148693ef3..15182bbbee 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 065c8f8208..a967a80d76 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 c562ceac85..d1da176b6a 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 e2fb6a55e6..3b520c6e02 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 6be5a86a69..c43402262e 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 f699451407..05d3a0a2f6 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 b8c1c295ae..3de50290f7 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 63590aee1d..7b759621fe 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 16ca32bf18..716de728ae 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 4e997a8418..7ee277bc5c 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 bf07edf3be..954d404c04 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 6715d08f55..3edad104fe 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 0e2c65fb44..bed60e1c1f 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 24c015f3fb..a74c298575 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 4b56f03c39..b6af697b47 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 c3210906c7..428bf158bf 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 834da13ece..826f57e45a 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 f86e64d4cc..cd518b19d4 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 3ad2c73a99..2e83daa015 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 3efc1ca89f..a52fd58d8d 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 598d1f9d01..8c8212d34f 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 014c578725..50213d2a7e 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 fa40eed4bd..27e8f60ed3 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 31feb5efb2..b272bddf5b 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 8c1ee625e4..53446b2f6b 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 b30399365a..cd754456b6 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 0526fe0e51..1cab0f2d34 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 01673b8c48..e30f11dde8 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 790033c95b..2c3b7bf409 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 4830e73d9c..46a585cdd2 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 2fea77cbd5..90378c0c1a 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 e00858bbd1..954e0b63e3 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 e0d20f7c3c..8489a6db7d 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 f324d052b0..698672ef8f 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 28e0bb570a..0032ae8337 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 a9889d26d9..3693e3e20b 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 ab0eca20b9..449a3b8c4a 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 7bfa53058b..5b0f36e4f0 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 411023dc41..d5a7a81944 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 09d757f63a..923cfe805f 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 da2fe6acda..152dc0b741 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 3e8ed55579..9c20ddda32 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 2fdf7e0c9c..4b64274642 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 707ad08f0d..850e59128d 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 1c4b40f424..5845541b94 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 1e61f17315..ef3e0e9dcb 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 6bc97b6c71..ef7f57a2a8 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 db7d57adde..83249aa654 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 1dcb8f892f..4af69ed939 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 19d817b6be..7438dc9f4c 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 3bd0084c78..48783a7bb4 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 49604a47d6..ff9484b4ea 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 177518e381..f2ea3fefd0 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 918f279fb1..9a1e0fd27a 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 c43cbfe92f..7df49f092d 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 84010329a6..d8c59714a2 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 c610335bb3..40a56228c1 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 a5071545e2..15fd39f0a4 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 c525dca988..9a73ffcea9 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 982eaf4251..a4dac59144 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 512d29743b..9a066d800b 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 7c7481ebbf..d7e739f2ea 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 2bd97330ed..fe57b1833e 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 7b94b607b0..39a456e53f 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 3858b8a937..d61436ba5c 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 353c5cb099..55769f0f37 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 fbfe8515b9..4c649f0e64 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 92b61d35d5..bb4d3b8887 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 a7711e4565..eea3109934 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 2206c6e0be..1b579ccfcb 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 c5918dae37..296887247d 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 bc103420c4..00bed7f8d7 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 3d604da1b4..7dfa0e36b2 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 acd3effb20..509700b564 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 4ccd28243c..b1f3ab6fe1 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 b644bc0737..6ef757fa9d 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 13f5253728..7c958d11df 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 495caa390e..c861ff0965 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 30c2cb90e8..46ba6f13bc 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 616f40b526..0ba8d207ec 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 87bb96d220..b20dfdd0ce 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 82e77b8c8e..72f48fd533 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 a1f52b361d..e4e879b78b 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 13952ce6b2..7b0d682c73 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 dc008ce959..750ae03341 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 2b5f344cb1..2bc603780b 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 afc3df210a..00f8ca3c66 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 83e6b84645..d671dda235 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 2f96aaf96d..3e5e3d9897 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 6bbf833be7..3bb566cf2f 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 f0cb1d0cb1..51bbf77d9b 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 5e78c0b92c..f312941f4d 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 a387b8cbd0..33e5d415ce 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 b4e499cbb3..35e1d848bf 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 39f0026e63..fa4af38dc4 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 f7d3c39601..f1e3f67a2e 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 943bd9a29a..be0dac90ff 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 72e4708c88..7e2b8e044e 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 b7e2be4293..bb3d706dd3 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 14db357c00..beed750d72 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 1cad8c7e62..fccf0ec8f5 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 54f584d3eb..0e16ca7298 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 5ca4afc918..17d2d72f82 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 5aae101c33..a7efe5ad98 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 63051c86a9..a43fee9113 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 e256608531..69577e701f 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 05c6cb8e90..8d4cf161ea 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 45f34911a1..40224bed15 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 7e52589b81..dadd6187de 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 0890d160c8..3327787801 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 5474161e65..216310618c 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 3c3dd3bdd8..dc9dd2091b 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 3789f032e2..52e3839114 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 075ecaabb5..850022683e 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 64a2cdfb82..4d7287fd0a 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 93378a7b3f..8cf3246e24 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 1ebd40164b..228b38f86e 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 6a78cf213c..15943cb263 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 ad9b7c9eb6..4e59133005 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 8a707b4507..37f27a66cb 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 66cd96bbb9..458046ae7d 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 a1c33cf230..049eaea6f9 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 329c88c8b9..5708a6d4f9 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 928c30b922..2a51b6f42d 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 69788fb96e..29a8798e79 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 72e78af5f3..a1b7716a31 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 dc8eedc435..757603f632 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 92a7e5c304..2bc87c723d 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 86274c34bf..22dae52d77 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 3fe4faf464..0f1106c635 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 98c11e41b1..671278ec96 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 31c8024786..5df80c4b67 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 9cee3881f3..e00944ab99 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 492dbec7ed..17edfb6d3a 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 35aa1cb073..f766f60d88 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 660fc92f3b..8a407f3d4e 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 e110ff0e96..5514a9466c 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 4523613c77..712758e70f 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 487f760b52..5985c67dc6 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 2df598ce5b..d1e11d11a2 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 96b1f39b0b..fc7b27f551 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 5ec5ddf189..e3ba570824 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 968701b711..0df279f5c5 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 f891e973c0..8b7812e576 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 b24ae829bc..669d2def43 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 50970f0b9e..901ba30fe0 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 7b56ccb4cc..242c6f76f2 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 2a5723f2e0..c9aefbc7d6 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 86fda51d41..a5d1061b77 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 def14d25da..b94c7c7b5b 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 4592a62eb9..986c8f840e 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 44da765292..e7a6240095 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 0514fe1b32..d9ea4529a7 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 ccf923f42a..72808c4b47 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 5008c2b66a..064c5826d8 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 4a5a58f718..49025c8391 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 8df6a8ffe3..728b744305 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 7a7eef0a72..66dbb35c6e 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 6629f74ba6..94498db012 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 0a188df11e..042bd541c4 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 4500aef976..7321e93bd2 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 4e190129d4..2aff323ce3 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 19a5521a68..fa58d029eb 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 c035521322..488f6cb428 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 985957d3ca..070ee1a631 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 3bf7c9a670..3395f845d2 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 84711ff57f..b6a74ce741 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 4d37fe3e64..ea37fafb26 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 e58d7749d9..9195ed496c 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 a06f26b128..a17e2d1ee3 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 20703f5494..4b79655c81 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 3d489d14a6..ced7a3386b 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 b15edc030d..e17147060d 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 54a70d1f17..dbb4543b9b 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 1ed775ac52..c2d393ff80 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 c1f7b6927a..706ddb6dbf 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 6828d9bc08..c659dd97b3 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 fe59f3cae4..d6879597c3 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 57fab25966..d6d032f8d1 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 41131e0fe3..b38e305e6d 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 ebfb32cee4..684afcf109 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 45e0783a06..0230c3632f 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 12afaee2fa..34da68842e 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 f7f7a47311..65f369ab3a 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 c20e3c666a..c44a910726 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 9cd26d4f45..fb252415c8 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 7004b2dd60..8eecf720c9 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 da79d7c1bb..5ec090159c 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 3dbf5b1ce4..3c37ff30ef 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 639b690595..d236c15170 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 bfbf2710ca..6f85e9fc9c 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 612fa9b39d..3c9c463ec7 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 7d23b7f96d..7aa88d655a 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 28fd73c1a7..be8e40d222 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 e3b8e71122..d1670a0eab 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 9277f39911..d2efa466ad 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 8965024554..b112c507f0 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 c087e1ac5b..a3f59f73ea 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 f27ee72097..20f3b620aa 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 fc2552e690..83c422a143 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 7db7f80fde..f8c325cd33 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 6f702848a9..72cebfe7e5 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 edf2fd5a47..4acd4c92d3 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 7c00b646b6..32f80596c4 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 23a5124a77..4ce7faa352 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 7c39f4c8e2..698f193a70 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 b90a92bc00..b7e7835f38 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 e774a0e03f..56f77f920e 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 50e542a080..17fba4bc23 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 3ab977b854..3c4eb1b137 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 eff51c785e..646a7f2ed8 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 9027a4628f..6344637d33 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 dc1914d118..c2f9abad76 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 eb251efd7b..cecd1c3539 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 283ff11d6b..96eecbb625 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 06b85c691f..026d794e40 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 3d5ffd5659..acc152f720 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 2eccb87189..9e68128140 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 53d97ef3d1..f4c07e26f8 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 44a877aaee..521a976ca3 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 9640abc1e8..eb702b690a 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 0960da7a98..322cbb2ee3 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 faf3407bd7..56a26602df 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 0c246e0b2b..22a7712dba 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 2dffee80c2..ce0a9a8860 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 5e0443a9fb..534ef4261f 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 b510d8d8a3..7e71476a3a 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 412c3641e5..37b75bb5b9 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 187ac3f9a3..f245c71f5d 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 4da24b680a..9ddac0931f 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 4be6fe62c5..db327e2d32 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 c2981a206c..89303e5789 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 21cb6a949e..c8aaa73d84 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 cb100001c5..bc5d906d93 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 099fcff24e..a179e8ec5a 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 d35b162cd7..6d64a17601 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 f1409248c2..a2a8782f0f 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 3fa3b9a5cc..fd2d4f0e2b 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 d12ba4aff9..d591e5bae1 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 7c22704d44..a23e6e15ec 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 5be231c27d..dec1e284be 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 6e300890d7..62b1590d29 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 1db5f5af84..7f9a9bd4b8 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 0ed2517227..769f3753f4 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 660950d6f1..ea7d13bc9b 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 af6d81d64e..04fa7023be 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 7c6f72cb69..93b2ceace6 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 63d7e3ee32..9719d93049 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 782cbe57ad..04d839408e 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 645a82e419..d64739d79e 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 8b46049cb8..3545ed06c1 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 2e265d7c51..adcf502dc7 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 af38b6786d..8486f1003e 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 0a64386db2..998136dee1 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 4a2c9590cf..376bcb59c5 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 20271e43fb..be5f5a79f1 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 7c4f149c48..7d968a18b2 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 596b28569e..541be1ede4 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 c7f3877201..7168f6f8fa 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 22732f4ef1..c5a77ec16d 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 0b15b2ea85..76a40c704e 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 2733cdafb0..9b18d33459 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 678457e934..535d01d224 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 1560f76522..a8874ffef4 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 974ad87b78..af41924c37 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 60ed3f8d1a..9157a13b9a 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 7a990eacbf..95f65320f9 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 a722179896..578f905f35 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 5805a65100..7033eef23c 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 13d939608d..8345b4b82f 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 6f4de58a66..e188d83666 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 ba7d0ca49d..430a32856e 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 65b7ebd707..8604fc7260 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 2cdefbf4a3..e451abda9e 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 ac305b07d2..1dd8f73a69 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 3c7e09f17e..2d994f559e 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 4aa546cd26..6a459ed4ac 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 22ff7552b7..13ddf7b721 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 ecae650c1b..8cc15e325e 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 f069255639..2c4e19ca4c 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 b71afe28c7..0b187102f7 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 023b9f424d..379cab0db3 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 b4e92d839f..4391d74add 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 8e5ccfb410..2be4fe97aa 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 da69e3c629..13c0c95381 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 5489905a0a..1bc0e7a97f 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 b9ad29b6b8..24c729c670 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 18465e996b..1490f9fe96 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 2145de9b48..b2944f0203 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 6173ebad8c..f6fe13c917 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 d4bc06f93b..c76e1021e1 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 9c94aa6dfb..452cb7d8f7 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 b3f6580bae..3205e7cb2b 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 384ecd5e62..5e2e0bba8a 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 a20851a4db..7d23ee5782 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 af3142ea44..9bfec89b27 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 13e8fb0744..1030bedbb3 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 e4c87ed9db..fa8d88908c 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 8fe529236b..383a7a1cf8 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 c6bc2e9ee9..70c119b554 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 a9744ce980..bff89fb8dd 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 550ff18a2b..bc7dec03e6 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 bae4f8c858..c0b4cb9368 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 184dd23aa6..d420e060d9 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 2a1d726fb4..f818dea7da 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 a0d9c19928..65be8a0408 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 fc5253a807..2a61af45ed 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 40666a65be..393e06ebaa 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 0aedb50bb2..045d2b18c3 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 a85b962298..273412de0b 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 e2b8a25fd3..6377fdf5a9 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 694dc72dab..7d586a694d 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 8b5886bba2..9387dd2c48 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 d0fd769928..5334999cac 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 1a60d64a98..d1939bafa2 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 14c95c2de3..1646dd9f3a 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 b246fed9e2..65496fdf6e 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 7a59c7b4e0..bd17e13879 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 6afea2f866..6df6e0aef3 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 5e2be2ac5d..5402619316 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 a99df69359..0d963d2370 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 fe51b6141d..54edb67a07 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 d6e3088bc2..9c74b9592c 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 788a3571c5..b11856d60d 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 45a567dd9f..ade3e93fa7 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 7c962790c6..ae99c2ca87 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 ff56ad1a9e..358dc2ae8b 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 defa5a541e..cbb3367dd0 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 33330074df..d3e8c138b0 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 e4e39b9dc7..6bf2b0f4c0 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 62f2bf05e4..de19f9a878 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 cc60a01b83..d59cd82128 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 d74fb48270..225a5c03d8 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 b3c218b280..11c1928545 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 b6968ccbae..6d53211697 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 f70f422534..2018d75755 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 b8544d87f4..4a4d240be3 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 9c79925701..1f94eefd38 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 14ca304aa4..7dff325623 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 c5aa09c109..d655e05a9c 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 074d9ccd1c..dcfbbaaace 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 114029ac10..7cfad35f87 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 371b300b17..a1e4f50dbd 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 1de60e0363..6c117afc59 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 443b2663c7..a234aee4c8 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 9aac03195b..979c523199 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 75e62fd940..5a89d6d3f1 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 674c68a4fd..b00c485950 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 a1a891d702..09ae78aba6 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 26d1b8b108..ca40616547 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 1f5a6ee8fb..0a0b02273e 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 3575d17d8b..79cfc04885 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 594e30178e..ca5eb6230f 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 3956021615..8f81fffab4 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 88aa0e471d..68ee608028 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 9ef1cc4448..78f3d05b39 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 ec4ebe7cfb..92a779b31f 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 6cd49a2c15..e648d6695d 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 c9107115d3..ce7a5e3267 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 0e7f57bab1..ef1ea86e50 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 24e871bf14..8c14ff2f15 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 8002c045bf..d2b087ce9a 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 a26daa9ce1..4d9087860f 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 33e816f2e8..88cfd47ee1 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 23356db4e6..f81baa4177 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 431be0d293..0c45a4a676 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 16797aa94b..b3f36d4cb0 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 69f781f48a..105b3276d3 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 563a6ba19c..d1301ac550 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 b0c453d08e..0598f29b74 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 36a477fcf3..aaa4f65f28 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 843298140b..0cc260a557 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 159d7d9853..ec424e44bd 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 403662829a..a4459992d8 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 011df0e762..5ba3527028 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 62b743014f..425260b926 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 e1d61cf785..083ccef4bf 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 04a5dec59a..f617757d37 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 089f230538..fe591c2fe7 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 91bd38553c..0b7f8df703 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 5d9591e0dc..8866409efe 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 7799effe22..86e27fbaff 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 e6c65bef9d..9b5639ff9a 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 2397c82cac..b664179265 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 f6ee6aa5a0..f48222c425 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 d5527fcf02..c786a8166b 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 8ac3dc2bd1..1cd18cc45c 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 1813a72a27..44397ca37c 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 bf79c13a27..ca084aa63c 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 16d208efcc..f6676396e5 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 b3269689c1..90fc24cf9c 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 cb567affc2..3ad35363b9 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 4a77ac91c8..566dc9dc27 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 6959346107..b62418508f 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 a7245e384e..d49c01d3b7 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 e6b60997c9..2dec713db2 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 34c4faa98a..9af4ade589 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 c9482cc6e1..c79302d402 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 d85649757e..d84944b4bd 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 2f08d5c37f..4da0d8a232 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 c577215357..034a3bd607 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 78a3ece11b..4bb5ef7969 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 45df8a9edc..4b429940d7 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 223befe9bc..b93996ef38 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 dde2d7c261..d473211b58 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 cbadb8a95c..44c33b39c2 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 4ad70a4eb9..5aa695f8f2 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 af951739c2..305d701083 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 7103adfdb2..7f0295dd44 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 938f6e65dc..6be779f331 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 f917d00ed3..2e97cd45d7 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 a5c68ca73f..8c3c65f609 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 51060d6287..17f7aed05e 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 b3b616a70e..ebe27686ac 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 4e257bd0a1..0289e7733e 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 cd30913661..30bbb1410f 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 d827282809..e871d0ff3e 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 6ccfb4359d..2ad705bda4 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 e3cf5dcbbc..de4f73bc18 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 5c246aaff8..aea6c91ad0 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 80956e854f..9ef46151f9 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 a22704af50..16d789f37f 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 9479d233a9..75351b0983 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 9345bb5a0e..237b722646 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 e1e600229c..4db8db655e 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 9b70f23639..b3a4bfe223 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 38f2533625..b622f254d1 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 b69dfe686e..617e6e2cb0 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 99f2c8ef77..5c4d43375d 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 ecad139353..f24c5856ed 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 05e75f7e23..8ac3a049a1 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 a49d0d0ed9..00dcae479c 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 dd27da85ab..ba0dcd7140 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 ffd5960c06..a16aa631e4 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 2f18c6371f..14f1ebbe50 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 b5d741cd6e..b65770c444 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 c8012b3434..0bf93edaa9 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 1d1307e4b9..a939a93d31 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 33e6cd1c8b..b26c16f98a 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 f322a1a76c..86a703c641 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 7cbbc74988..667268b3aa 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 b99a326323..64b4862653 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 87757dcaa9..1e25a77a6b 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 086f4e08d8..073a48c228 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 3d177d903d..432d72fe54 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 939b3fcf5d..4424248c48 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 833970a8b5..867a8193d4 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 ca0b1ed036..2dee92d9ae 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 2daa325b75..99fabb89d8 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 c9e00a793d..dace91f4c8 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 ec313f06aa..300a1e3397 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 51d2875c96..2105a590d4 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 f3810019c4..2fe305ed21 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 0db422c030..0c9f0dfe23 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 f86b7c6b79..f2428aeb92 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 8dacc30ce9..8c3d6e1e35 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 1c2e857775..b188ed1d84 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 7e6fe07a14..3787a13386 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 639c95944c..22a21a64d2 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 092c90c2a9..d49bd1b094 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 abb9ecbfb2..73af79e2b1 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 f006b974eb..8b932dc053 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 0d1fa5ca55..5088694935 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 14929a9051..36ce473f3d 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 081a5f0855..933f0774bf 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 0c77186efc..250e93ed00 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 877bd0c713..929e9df645 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 b45098d298..b9139cb6e1 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 c81e0c5d1a..b191df6022 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 64643d52f3..c7376afdd3 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 959a5f7154..edad2b9c3f 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 e798ce8a3c..d8f4c4769f 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 7a0157106d..8d4e72bdf9 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 8e6cd1e6af..f72d33cf25 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 ddbd734153..a333891bba 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 1c1df0ccdf..5ad0e10334 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 5e3758be96..e33bdb7d3a 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 ce23b2b5aa..bcfb1e8515 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 61d59093b1..0005faa9a3 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 a116be0fab..bcab76b80c 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 4a58f917d3..006b49ab1e 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 203fd57e92..57d348082b 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 85ac993877..51e5ef38ac 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 b75dfe4350..c013a687eb 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 a556fb4a17..4aab1c36bc 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 8c7acd471f..cdc79b1057 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 2fdef26831..37e725a9b7 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 0297401f99..5f8fe821d4 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 69146914a4..de8197a5cb 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 bfc2faf5bf..719f765b4f 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 6c0b1b26d0..64ccfbe166 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 9d98d46b08..d453efb010 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 0d7de96f12..d92a44252b 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 b288bcd2d0..95a2f56f80 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 120f2b6109..56c0ae5586 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 87b6d4b264..067cde083b 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 5c243a8fad..223c9e72c4 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 e2be510980..2b4a31b0f4 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 12875392f4..b55b7ced44 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 43d51753a0..e7ee13caf6 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 92d7f2789e..f65822e535 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 cdfdb0733f..16601cdb51 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 f93039f412..68b2643092 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 012277d255..ebc0bc88e2 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 8e30204ab4..1b27bfdb6c 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 cf28868086..ada3ba1e1c 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 3509e14a7f..41c9e4d5ae 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 4a83966533..4a00d18b1c 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 f1a517051c..e2c9c9543b 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 c64910fb36..b3cbe3ace9 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 0df0061caa..ebaf84b552 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 bc213ad0e0..d2bfb7ee6f 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 3f0d8e6446..3b6f7786a2 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 0b706010a0..9ba70f7a64 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 b40a721998..156b692ab0 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 1baeb0f2a1..3cc87b47ac 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 50c62ad1b3..acceb2da71 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 5109bed3a7..b2f22381c5 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 4fdb603b85..ddceb6141f 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 de6e263e70..9cd249ea92 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 340b084098..9e784deee8 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 13fabc4f30..dc60c24938 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 f24042a3bd..1a5124daaa 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 2b9e7fa239..311a6d73d6 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 c03d13501a..7852cd6d62 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 8b9d59fc58..cf9c29a112 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 ac88e876e6..e38c4788cb 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 294931388d..5d08f1771b 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 5f23f910eb..0e1116d588 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 6ca5b17563..73c2675c1a 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 2c308d9113..daac15574a 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 f06ebbdc43..cdbcf6a22a 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 7c67bc3227..e3d530ba49 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 9328c0f20d..e33415eb67 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 c86cad2b51..e7db01c8e3 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 def3d4406d..7ce2e810d4 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 4ad38eeca2..7824448c07 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 6bd7114431..8767cee261 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 920dc4e067..9390e2abff 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 00446edc47..13d4d1b519 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 985179b84c..3c3b41ad28 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 99754c9058..1838336050 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 1337c1ac95..73e657fff9 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 2fc60f9fc2..fb550b1aa2 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 9e53f18154..1ff37cc3cc 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 7ab189fedf..8fcce4cc84 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 9dec5700b6..506be6475f 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 4e3f40d369..b3069eaf00 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 386dfb1e1e..80c6a23db8 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 4ba236f2a4..e3ca7caa1b 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 1f1e6d9668..4c9f60ea11 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 13df9024a2..06da4a5ed7 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 368f588cfd..a1f1644cf3 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 c76a7460c9..62214541d7 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 96e77a1326..d27aefc6be 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 9d6ee3d9b8..7556bf7e6f 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 31ee2a3e07..8e9e60b99e 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 3526b35c24..44f0a0ebb1 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 e473d6716e..c8f188a738 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 13f4f5769a..683c6e0bbe 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 21fd83f57d..1c492dfc06 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 5606ad4b86..d3be88d3aa 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 3e78098d0c..afe8978ec3 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 0c79faeeb9..25a200365a 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 1fd4e80e7d..c1ed7e615f 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 0023f91031..aca253f7b7 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 b9d80929cc..7887a24072 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 c287bb339f..40d908f1ee 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 9ced140b28..512c4fb95c 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 e67d036388..99d1ee7a06 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 d02d6146d6..0d25a60afa 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 1d277659c4..b6e0648014 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 e630ea852e..ec8222832f 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 bac9f4f610..46314f9aa4 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 2408c62850..c75a24c4eb 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 7a877d7663..e6e00fd6b1 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 57efab7c3f..ec4e59052f 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 d6f0512ab4..e7e3ec4207 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 ceb78bb700..84da54d563 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 a52895946d..1a49e94876 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 2fc4ff43ae..96790ed77e 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 e45b6fa95d..9a7b473ecc 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 a604ce36cf..76aa2989cc 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 b45b32ccac..15bd93b80d 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 c538f61d7e..0f99daf49e 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 758ec6055d..8726adbb27 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 08080230aa..afd4eb844b 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 e378fa241f..9f0ca0b158 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 1c3775a323..bdbe867b9f 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 4f069b2d8d..a6bf93dba8 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 49da6b8aeb..fd06320b0c 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 c63fe27ec9..874077897c 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 98488f68d1..9d070d8ec3 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 49c2cf5609..4133b745a4 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 000671cf8f..64d97fff88 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 d14c7a2f46..3a558b11eb 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 4c77e7a97c..46618120fb 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 28af4cbfdd..6cc94bd129 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 14c3282e6d..96424e232f 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 8a1951062f..e4546bdb78 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 1414cfadb7..2c855a0436 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 094bd31bcf..f27e86387e 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 5388f82f45..446a472ab4 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 4cac82d2f0..a0f85922ee 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 6b82fc27c0..40bbdbff23 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 06f3e791c3..b283fc7413 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 307f8219cd..f1a3e1a942 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 59e6672a1f..509ed7fb68 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 f03f8a01be..db06b6e09a 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 dcbdd8f2b2..6b42a28db3 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 84c9fe1602..0aca2155b5 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 9dac2c9e1b..5ad75353db 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 38bf7ffcb6..a4ae028e42 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 d835f2a280..4e72932862 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 46d2e1d987..b402ef8896 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 7a92a76607..17a074f102 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 88f58cf8ce..b52a0519f6 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 28d195a3ce..c8367f1b62 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 132b4dc1a5..7838a824bc 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 69eb4f097b..c98517edea 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 f5b28699a5..7a75a2fec3 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 9756266343..8f47fad0f0 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 4e5d15453b..0314773291 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 109da5bc2d..f6f141805d 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 0f17eb67c6..fded01e2e8 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 e1e88aca41..027c07f1b8 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 978b78938b..5e3ff394cf 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 757bf9889b..127e9d17cf 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 9bf0bbf914..247c41b19d 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 d9fec9e72b..ed8fe55ef5 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 bbe4debeaa..686a487791 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 ca9ab3f534..796b406e26 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 3a0b1ea162..c875cfd2e8 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 273f7a0ca8..9ea770954d 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 89d8dde0b2..73cc857617 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 180b91368c..131526bb0d 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 5b6934d965..1abab2a1e7 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 7adbc91d8a..8dc56d1e36 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 a3788f8c72..45ed57974c 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 503db5b004..00e7a61929 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 a1bffdbad6..560718b457 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 067e9fcc19..fddd459a7d 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 390689cce5..a467b6d845 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 3ce2c2579c..d5499222e2 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 3dab562bbb..c5f61ec547 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 9931535721..a89ccf807e 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 a16a3dc18a..ff2b9ee975 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 972a3d6fcf..635d43cdbd 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 9b5863cf2b..94af0ab5c1 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 592dbd6c04..9c11611d03 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 ce10168650..c2acf94f36 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 5262d5e4b3..c7c066b5ed 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 21c3c9e8d9..40a9e118e4 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 91286d1372..695eb62d01 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 a5aaea35a4..062ed094f2 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 9fe57a8258..abbd2a7aa8 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 2aa5f7f115..9a686539da 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 de16c5c580..75a2f73e68 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 6e063c5b52..a355a24864 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 acce4d832c..9bd608384f 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 aced74b7f8..cc16c3a215 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 3dc62bc270..7c12b616c1 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 31740c97c6..c3b80ff588 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 7ea50d359f..2d189d55bc 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 1393936c5a..954811a784 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 49b8cd7cc7..b6622dd25f 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 4b75b3b28f..4bdb9fade4 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 817affa784..219cb6051a 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 52a533d542..d4750b5f5e 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 ab5d3fc99a..d8f59a5edb 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 f04df7750b..7b0d5fea53 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 064d87b50a..c8826af24f 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 9a893c590d..0b677c7378 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 59c8f072fa..f6b2934474 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 da20b5289e..7bee9f087a 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 ed14d87a67..b7be9d068a 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 012fc01a3d..f08e22fb02 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 01bd7dc606..6ecfb8f5d5 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 4eaf9a132c..22a2dc0c5f 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 a7c4f02e78..0ef3eb2091 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 9d964e34cb..0236e9e1ea 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 7fda0b3654..a8bca2e04b 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 0bbce038e6..f2803e9189 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 a754f6431f..45ec3052cd 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 e6201829b0..2236881263 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 5226dba55a..ae197b6f96 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 1809a0d1e5..c008c759c9 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 ac202ab26e..2dad3ace14 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 25a0b38706..f04d3b7e31 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 f13af1a26a..4b12a8cf0a 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 3536d01b42..9b5eb967db 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 eafa78cefd..8b88a036f3 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 2bba5469c7..5aa3ce04fd 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 46db531082..7de0e45894 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 621c9922e5..383f8b18e0 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 f47bb610c6..86990f0341 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 09875f32c8..8150e2c551 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 b4a09e00c2..c55aa5d01a 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 b8235c8842..5beb63f905 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 1e3d7cd19c..1502d62e02 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 7e5d550e17..703b6c0b87 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 26e2413ce9..3b5ad3a833 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 7559b8d905..e989df0fb5 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 0fe2a58143..effae83464 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 746162c7bf..aaf7d042e5 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 6bf3b2c0a6..e79bcad3c1 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 650b13c60c..f4378a4d92 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 baecc44827..acc8eee617 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 25f3153ec4..7f9e1a85c5 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 5ee9e53b56..be2a371238 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 9a92bef794..9e963dd1ce 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 ed32ac7c0e..582959f3ae 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 0e1290fcf2..c716ac3aeb 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 cef9d73b3f..57dc8a7192 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 bba67d4f09..b5a0838eb6 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 fac3900417..8ed39fc2ff 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 503ed7657c..d0c48f5112 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 aff49ae58f..b4f6d3c403 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 ca487e00a2..ed70dada18 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 120604aff2..058562fffb 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 f78d4be7cc..8e9c44431b 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 b8655cc1f4..64373596a2 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 8322a0912d..e832c1e9c0 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 3a7e1bf267..21f3d2554f 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 533d9afb2a..5426d8b7e5 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 4b5bde2262..1eaa64a87c 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 d4daf34464..33b2276a6c 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 66e5aa3547..c931ef1895 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 c4679db4f1..05305319d3 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 20361095f6..e196c028cc 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 ae83302921..56af241837 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 7cf502edd8..3ae96ca3dd 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 31656ee60f..aedc303681 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 fc89784390..d0d7f81008 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 9e6a96e060..e8d0b5b9f7 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 4840653414..973bafedbd 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 04bf4deb00..04dd756a31 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 487b5d33ff..9ecfa3cf4d 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 04e138e0c7..b69aeca861 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 fdba4ede80..3ec74996d5 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 6ca0a1e39e..9d9576c5ea 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 1971f8340d..6f2b270242 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 7eef7ff356..b7bfdfa1bf 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 97a6a687c5..af44926667 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 cccdc1ba6e..753821f654 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 f52de63ca4..978e04449d 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 19c1f42104..b7218cd7de 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 800d6cc1e7..395972ba96 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 63cf1975bb..77765aaf52 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 5c8cdb5d5a..e9696db27b 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 53c6bd015f..4903d3ed15 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 a02f5cda6e..c7ff681f57 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 9b3890f15d..3bec553dd8 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 dad84c3e63..5aec9c0940 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 34b87157f2..afd32375bb 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 c71ee0b465..adbb8922f5 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 b52d2d7e20..ef2ba56cbb 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 14270ee608..0ed7b8a768 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 5ced128940..410a2f62ff 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 5b76dfc848..6389c7fa6e 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 3f98049567..a03b86ac8a 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 7d398dfd70..cae9ed7146 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 592c9f52e8..d1163de356 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 6ceaea63d0..aa37b84a55 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 54a71fd48c..dc9efe278b 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 6a783f6cfc..ba27eec9f5 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 b6b0c84b18..2e6f70dc0a 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 5f830356b7..2119181a5b 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 a10b13a580..d9b072098d 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 4446045198..c2268312e1 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 25f8f6896f..05d5b5883f 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 6c2f182077..bf6b4e6c69 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 ab021f4715..3a4e74a07c 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 d187175cd9..43f60f5d7c 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 Binary files differindex 3f9843fc45..9bbfef5f7f 100644 --- a/ext/zlib/tests/bug55544-win.phpt +++ b/ext/zlib/tests/bug55544-win.phpt diff --git a/ext/zlib/tests/bug55544.phpt b/ext/zlib/tests/bug55544.phpt Binary files differindex e650fe6909..b5041cedc5 100644 --- a/ext/zlib/tests/bug55544.phpt +++ b/ext/zlib/tests/bug55544.phpt diff --git a/ext/zlib/tests/bug61139.phpt b/ext/zlib/tests/bug61139.phpt index ab7c74e9cc..646396c041 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 f3387de09c..1f72fc1c88 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 3a8ee949bc..a5d2735927 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 e559030151..ff09d6568a 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 e3cc8e846b..762aa3c870 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 5257e4db6c..7ace99a8a7 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 fbcb2d95f3..fea4dfec00 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 3058b1d900..e881d77b51 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 927e0406db..b129399dfd 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 5d850e5438..951437b98a 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 7272b4e7dc..f7870e890f 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 6257456298..b3987b9d20 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 5ad5a1cdc4..727a079b61 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 d5c0844006..f1e3c0d2ba 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 c159819d76..f92450d22b 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 2dded2ca1a..3be013facf 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 01958214bc..7fb103b3ec 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 c9b7fcf615..5eff9b6d5d 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 b2a1a056af..49e4ab8f6b 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 80ef741423..4f4e908645 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 2ddb3adb6b..67f2aa438b 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 a1768e8e00..cbb4174f9f 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 2b5a9c61d1..5814b5168f 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 3fe924a282..6505306c45 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 a1cf48ba18..e06c358d80 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 631314818f..16b266db65 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 f3ba9a4fbc..7eef44a702 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 1885a048d6..b2b12276eb 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 91e2a42976..b8b895a92d 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 5606114bc3..4ca2780b41 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 e1414d2504..6fd4d0748d 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 1b66d85fc1..356eb2c845 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 ff0dfe8028..0b4c4d13fc 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 bc9eee4f94..f5968e28ad 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 988e10a366..ffed16d4e9 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 d1a2d296fc..1522750c5b 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 1704771679..0b2053993d 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 2cc1359559..9a835f8df5 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 a463d607f1..c9d60ebcfd 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 81fe035987..e5dcefc9bb 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 56b4fa9ec1..50ad28f36f 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 77e0e33e01..0ba9eb68ea 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 09e38cd33d..2850efa7d6 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 e59a3fb88d..41d5c777a6 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 e7f49f5fd7..1c2e6de562 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 67c0ecf074..1198e56ced 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 acd0829360..063bae63bb 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 13ac183d46..b9d9eb0837 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 d82d7069e3..c46e8b35eb 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 5390cce938..a93de5b054 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 bdea57deff..699b2f4993 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 a4e4fa4958..009cb4d7d2 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 563702e4bd..540a87985a 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 1a96fdb429..749087f6ce 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 5a35164cf1..9c6becb4c7 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 a5e145faa3..c96e2bee29 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 8492862892..829351846b 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 f0e155e899..014243d574 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 5d73cf16c2..cb697f44f0 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 b02a1bffe9..615d3c5d25 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 51a52c9808..7ed77b36b3 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 007a4a5022..7304731021 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 c6508deaa0..e8c6492024 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 8bed54ebaa..093b137c6e 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 b58a09f89e..e67970d332 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 31d08866ba..fa48454db5 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 23c59f8ff3..c2cfca723a 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 ca21637ed1..c5c4eabb46 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 6911aabe69..54d0e37860 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 41c651c50f..6d3f9d6237 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 20af263e5a..eaa9a124db 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 2ace80d21c..07b3917213 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 8476b2923a..815854b21e 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 00c59c7278..ac3f6aa8e6 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 1674f16fb9..cafec91d3d 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 6b41f7a99f..a46ac912c7 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 2be668f188..8eb4e47b6e 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 71ef7163be..3a88b2a9a3 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 6584e2c7be..63e812d4a7 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 f3443b7475..77a5667bda 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 94ea6fd247..73faa33423 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 c96170d497..c3acf6b863 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 af998351bb..1780c3ffd6 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 01b3599136..d06007bd55 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 3ca2ba833c..0684b8d057 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 5a5e6c5190..b64a5f0d50 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 bbba579ec2..bf23affe81 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 6c9a792476..344daa7408 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 9ebe4faa87..2aadfef62a 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 2b8c0f007e..e8404d835e 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 001cf62a38..fb7bcb4e7b 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 a5d97c326d..837f64109d 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 a2bae24dc3..0ed6204b89 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 7dca62a7e8..6ef5b9f950 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 ff3e3029e6..7350cd2046 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 33a6e16a10..87e8eda64a 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 6b8a2ad948..addc026322 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 81258da1d3..3d139ce650 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/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index cdea16f689..7fe6757d68 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 752a9928af..32321b3bfe 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 05887433c3..a81d56fe6c 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 8539e07433..a5dd5e393c 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 72d83b88f6..16f55b9363 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 f17011ca5e..fd3c85580f 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 2ed6bce9d7..439c87e13b 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 24e6609498..3eb2c35241 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 d609e48770..21be3b76a9 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 86cf631110..94e692d01f 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 4c0f5f9909..11caa432d1 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 01efb3bb4e..fc0429c4b0 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 09d3d8f0be..ee34be988b 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 65958ae19c..3241ba352a 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 01a31a6b92..4d7543fdda 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 d36d79c8dc..e08d558e25 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 1606604651..285a72f936 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 f67942f603..a84b365347 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 ebc6bcb120..f3f49aa618 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 94a5f20a1b..7fc5ae142b 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 e7c1038350..c048739281 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 73514955d4..8c10baae80 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 9b65e8861b..851327ead8 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 c2bb346854..19fa8552b8 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 dc113a9720..e080810ae8 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 f18c986c5a..80db509510 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 af3005372b..a7979d6b5e 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 e6068350a8..a68e9ac531 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 |